Changeset: 55d484b2e096 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=55d484b2e096
Modified Files:
sql/server/rel_optimizer.c
sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.stable.out
Branch: Jun2020
Log Message:
Reverting commit 0a084ae8d84f partially, now that the TODO is done
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
@@ -1265,10 +1265,7 @@ exp_rename(mvc *sql, sql_exp *e, sql_rel
sql->errstr[0] = 0;
if (!e && exp_is_atom(ne))
return ne;
- ne = exp_ref(sql, e);
- if (is_outerjoin(t->op)) /* TODO if e is found on the left
side of the left join or the right of the right join the has_no_nil flag can be
kept */
- set_has_nil(ne);
- return ne;
+ return exp_ref(sql ,e);
case e_cmp:
if (e->flag == cmp_or || e->flag == cmp_filter) {
list *l = exps_rename(sql, e->l, f, t);
diff --git
a/sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.stable.out
b/sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.stable.out
---
a/sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.stable.out
+++
b/sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.stable.out
@@ -156,7 +156,7 @@ top N (
| | | | | | | | | | | | table(sys.table8) [ "table8"."t8pkcol" NOT NULL
HASHCOL as "clookup5"."t8pkcol" ] COUNT
| | | | | | | | | | | ) [ "table2"."t2colc115" = "clookup5"."t8pkcol" HASHCOL
],
| | | | | | | | | | | table(sys.table9) [ "table9"."t9pkcol" NOT NULL HASHCOL
, "table9"."t9cola1", "table9"."t9cola91", "table9"."t9cola111" ] COUNT
-| | | | | | | | | | ) [ "table1"."t1pkcol" HASHCOL = "table9"."t9cola111" ],
+| | | | | | | | | | ) [ "table1"."t1pkcol" NOT NULL HASHCOL =
"table9"."t9cola111" ],
| | | | | | | | | | table(sys.table10) [ "table10"."t10pkcol" NOT NULL HASHCOL
, "table10"."t10cola1", "table10"."t10cola91" ] COUNT
| | | | | | | | | ) [ "table9"."t9pkcol" HASHCOL = "table10"."t10pkcol"
HASHCOL ],
| | | | | | | | | table(sys.table11) [ "table11"."t11pkcol" NOT NULL HASHCOL ,
"table11"."t11cola91" ] COUNT
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
