Changeset: 5f173749bb71 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/5f173749bb71
Modified Files:
sql/server/rel_optimizer.c
Branch: Jul2021
Log Message:
Flag changes please
diffs (27 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
@@ -9529,8 +9529,8 @@ rel_basecount(visitor *v, sql_rel *rel)
if (is_groupby(rel->op) && rel->l && !rel->r && list_length(rel->exps)
== 1 && exp_aggr_is_count(rel->exps->h->data)) {
sql_rel *bt = rel->l;
sql_exp *e = rel->exps->h->data;
- if (is_basetable(bt->op) && !e->l) { /* count(*) */
- /* change into select cnt('schema','table') */;
+ if (is_basetable(bt->op) && list_empty(e->l)) { /* count(*) */
+ /* change into select cnt('schema','table') */
sql_table *t = bt->l;
/* I need to get the declared table's frame number to
make this work correctly for those */
if (!isTable(t) || isDeclaredTable(t))
@@ -9543,9 +9543,9 @@ rel_basecount(visitor *v, sql_rel *rel)
ne = exp_propagate(v->sql->sa, ne, e);
exp_setname(v->sql->sa, ne, exp_find_rel_name(e),
exp_name(e));
- return rel_project(v->sql->sa, NULL,
append(sa_list(v->sql->sa), ne));
- }
- return rel;
+ rel = rel_project(v->sql->sa, NULL,
append(sa_list(v->sql->sa), ne));
+ v->changes++;
+ }
}
return rel;
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
