MonetDB: unlock - fixed lookup of counts

[Niels Nes]

Changeset: c5bdbaf8fa16 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c5bdbaf8fa16
Modified Files:
        sql/server/rel_optimizer.c
        sql/server/rel_partition.c
        sql/server/rel_planner.c
Branch: unlock
Log Message:

fixed lookup of counts


diffs (36 lines):

diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c
--- a/sql/server/rel_optimizer.c
+++ b/sql/server/rel_optimizer.c
@@ -8720,7 +8720,7 @@ rel_merge_table_rewrite(mvc *sql, sql_re
 
                                                /* do not include empty 
partitions */
                                                if ((nrel || nt->next) &&
-                                                       pt && isTable(pt) && 
pt->access == TABLE_READONLY && !store_funcs.count_col(sql->session->tr, 
pt->columns.set->h->data, 1)){
+                                                       pt && isTable(pt) && 
pt->access == TABLE_READONLY && !store_funcs.count_col(sql->session->tr, 
pt->columns.set->h->data, 0)){
                                                        continue;
                                                }
 
diff --git a/sql/server/rel_partition.c b/sql/server/rel_partition.c
--- a/sql/server/rel_partition.c
+++ b/sql/server/rel_partition.c
@@ -28,7 +28,7 @@ rel_getcount(mvc *sql, sql_rel *rel)
                sql_table *t = rel->l;
 
                if (t && isTable(t))
-                       return (lng)store_funcs.count_col(sql->session->tr, 
t->columns.set->h->data, 1);
+                       return (lng)store_funcs.count_col(sql->session->tr, 
t->columns.set->h->data, 0);
                if (!t && rel->r) /* dict */
                        return (lng)sql_trans_dist_count(sql->session->tr, 
rel->r);
                return 0;
diff --git a/sql/server/rel_planner.c b/sql/server/rel_planner.c
--- a/sql/server/rel_planner.c
+++ b/sql/server/rel_planner.c
@@ -124,7 +124,7 @@ rel_getcount(mvc *sql, sql_rel *rel)
                sql_table *t = rel->l;
 
                if (t && isTable(t))
-                       return (lng)store_funcs.count_col(sql->session->tr, 
t->columns.set->h->data, 1);
+                       return (lng)store_funcs.count_col(sql->session->tr, 
t->columns.set->h->data, 0);
                if (!t && rel->r) /* dict */
                        return (lng)sql_trans_dist_count(sql->session->tr, 
rel->r);
                return 0;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list