Changeset: feeddd969904 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=feeddd969904
Modified Files:
monetdb5/optimizer/opt_mitosis.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
sql/test/Tests/setoptimizer.stable.err
Branch: default
Log Message:
Drop non-used names from the symbol table.
diffs (97 lines):
diff --git a/monetdb5/optimizer/opt_mitosis.c b/monetdb5/optimizer/opt_mitosis.c
--- a/monetdb5/optimizer/opt_mitosis.c
+++ b/monetdb5/optimizer/opt_mitosis.c
@@ -81,9 +81,7 @@ OPTmitosisImplementation(Client cntxt, M
/* mitosis/mergetable bailout conditions */
/* Mergetable cannot handle order related batcalc ops */
- if ((getModuleId(p) == batcalcRef || getModuleId(p) == sqlRef)
&&
- (getFunctionId(p) == rankRef || getFunctionId(p) ==
rank_grpRef ||
- getFunctionId(p) == mark_grpRef || getFunctionId(p) ==
dense_rank_grpRef))
+ if (getModuleId(p) == batcalcRef || getModuleId(p) == sqlRef)
return 0;
if (p->argc > 2 && getModuleId(p) == aggrRef &&
diff --git a/monetdb5/optimizer/opt_prelude.c b/monetdb5/optimizer/opt_prelude.c
--- a/monetdb5/optimizer/opt_prelude.c
+++ b/monetdb5/optimizer/opt_prelude.c
@@ -133,10 +133,8 @@ str malRef;
str batmalRef;
str mapiRef;
str markRef;
-str mark_grpRef;
str mtimeRef;
str multicolumnRef;
-str dense_rank_grpRef;
str matRef;
str max_no_nilRef;
str maxRef;
@@ -181,8 +179,6 @@ str projectRef;
str putRef;
str querylogRef;
str queryRef;
-str rankRef;
-str rank_grpRef;
str rapiRef;
str reconnectRef;
str recycleRef;
@@ -384,10 +380,8 @@ void optimizerInit(void)
batmalRef = putName("batmal", 6);
mapiRef = putName("mapi", 4);
markRef = putName("mark", 4);
- mark_grpRef = putName("mark_grp", 8);
mtimeRef = putName("mtime", 5);
multicolumnRef = putName("multicolumn", 11);
- dense_rank_grpRef = putName("dense_rank_grp", 14);
matRef = putName("mat", 3);
max_no_nilRef = putName("max_no_nil", 10);
maxRef = putName("max", 3);
@@ -431,8 +425,6 @@ void optimizerInit(void)
putRef = putName("put",3);
querylogRef = putName("querylog",8);
queryRef = putName("query",5);
- rankRef = putName("rank", 4);
- rank_grpRef = putName("rank_grp", 8);
rapiRef = putName("batrapi", 7);
reconnectRef = putName("reconnect",9);
recycleRef = putName("recycle",7);
diff --git a/monetdb5/optimizer/opt_prelude.h b/monetdb5/optimizer/opt_prelude.h
--- a/monetdb5/optimizer/opt_prelude.h
+++ b/monetdb5/optimizer/opt_prelude.h
@@ -131,9 +131,7 @@ opt_export str malRef;
opt_export str batmalRef;
opt_export str mapiRef;
opt_export str markRef;
-opt_export str mark_grpRef;
opt_export str mtimeRef;
-opt_export str dense_rank_grpRef;
opt_export str matRef;
opt_export str max_no_nilRef;
opt_export str maxRef;
@@ -178,8 +176,6 @@ opt_export str projectRef;
opt_export str putRef;
opt_export str querylogRef;
opt_export str queryRef;
-opt_export str rankRef;
-opt_export str rank_grpRef;
opt_export str rapiRef;
opt_export str reconnectRef;
opt_export str recycleRef;
diff --git a/sql/test/Tests/setoptimizer.stable.err
b/sql/test/Tests/setoptimizer.stable.err
--- a/sql/test/Tests/setoptimizer.stable.err
+++ b/sql/test/Tests/setoptimizer.stable.err
@@ -79,11 +79,11 @@ stderr of test 'setoptimizer` in directo
# 12:49:31 > mclient -lsql -i --host=eir --port=36907
# 12:49:31 >
-MAPI = (monetdb) /var/tmp/mtest-22321/.s.monetdb.32284
-QUERY = set optimizer=' optimizer.inline(); optimizer.remap();
optimizer.evaluate(); optimizer.costModel(); optimizer.coercions();
optimizer.emptySet(); optimizer.aliases(); optimizer.mergetable();
optimizer.deadcode(); optimizer.commonTerms(); optimizer.joinPath();
optimizer.reorder(); optimizer.deadcode(); optimizer.reduce();
optimizer.querylog(); optimizer.multiplex(); optimizer.accumulators();
optimizer.garbageCollector();';
+MAPI = (monetdb) /var/tmp/mtest-19606/.s.monetdb.36050
+QUERY = set optimizer=' optimizer.inline(); optimizer.remap();
optimizer.evaluate(); optimizer.costModel(); optimizer.coercions();
optimizer.emptySet(); optimizer.aliases(); optimizer.mergetable();
optimizer.deadcode(); optimizer.commonTerms(); optimizer.joinPath();
optimizer.reorder(); optimizer.deadcode(); optimizer.reduce();
optimizer.querylog(); optimizer.multiplex(); optimizer.garbageCollector();';
ERROR = !TypeException:user.main[6]:'optimizer.emptySet' undefined in:
optimizer.emptySet();
!Semantic errors detected
-MAPI = (monetdb) /var/tmp/mtest-22321/.s.monetdb.32284
+MAPI = (monetdb) /var/tmp/mtest-19606/.s.monetdb.36050
QUERY = set optimizer='myfamous_pipe';
ERROR = !optimizer 'myfamous_pipe' unknown
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
