Changeset: 1a1b5fbe68af for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/1a1b5fbe68af
Modified Files:
sql/server/rel_optimize_proj.c
sql/server/rel_optimize_sel.c
sql/server/sql_mvc.c
sql/test/scoping/Tests/scoping02.test
Branch: sqloptimizer
Log Message:
Small fixes
diffs (47 lines):
diff --git a/sql/server/rel_optimize_proj.c b/sql/server/rel_optimize_proj.c
--- a/sql/server/rel_optimize_proj.c
+++ b/sql/server/rel_optimize_proj.c
@@ -3058,7 +3058,7 @@ static sql_rel *
rel_distinct_project2groupby(visitor *v, global_props *gp, sql_rel *rel)
{
(void) gp;
- return rel_visitor_topdown(v, rel, &rel_distinct_project2groupby_);
+ return rel_visitor_bottomup(v, rel, &rel_distinct_project2groupby_);
}
run_optimizer
diff --git a/sql/server/rel_optimize_sel.c b/sql/server/rel_optimize_sel.c
--- a/sql/server/rel_optimize_sel.c
+++ b/sql/server/rel_optimize_sel.c
@@ -2438,7 +2438,7 @@ static sql_rel *
rel_join_order(visitor *v, global_props *gp, sql_rel *rel)
{
(void) gp;
- return rel_visitor_topdown(v, rel, &rel_join_order_);
+ return rel_join_order_(v, rel);
}
run_optimizer
diff --git a/sql/server/sql_mvc.c b/sql/server/sql_mvc.c
--- a/sql/server/sql_mvc.c
+++ b/sql/server/sql_mvc.c
@@ -768,6 +768,7 @@ mvc_create(sql_store *store, sql_allocat
m->sizeframes = MAXPARAMS;
m->frames = SA_NEW_ARRAY(pa, sql_frame*, m->sizeframes);
m->topframes = 0;
+ m->sql_optimizer = INT_MAX;
m->frame = 0;
m->use_views = 0;
diff --git a/sql/test/scoping/Tests/scoping02.test
b/sql/test/scoping/Tests/scoping02.test
--- a/sql/test/scoping/Tests/scoping02.test
+++ b/sql/test/scoping/Tests/scoping02.test
@@ -108,7 +108,7 @@ statement ok
DROP TABLE "sys"
query TTTT rowsort
-SELECT * from sys.var() where "name" not in ('debug', 'cache', 'last_id',
'current_timezone')
+SELECT * from sys.var() where "name" not in ('debug', 'cache', 'last_id',
'current_timezone', 'sql_optimizer')
----
sys
current_role
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
