Changeset: 6b7b9ede06dd for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6b7b9ede06dd
Modified Files:
Branch: default
Log Message:
merge with Apr2012 branch.
diffs (65 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -5302,7 +5302,7 @@ str ZORDsql_slice_int(int *r, int *xb, i
void _initTrace(void);
str activateCounter(str name);
str addOptimizerPipe(Client cntxt, MalBlkPtr mb, str name);
-str addPipeDefinition(str name, str pipe);
+str addPipeDefinition(Client cntxt, str name, str pipe);
str addRegWrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pc);
DCYcatalog *addRegist(str sch, str tab, str col, int acc, int part, int f_bun,
int l_bun);
void addtoMalBlkHistory(MalBlkPtr mb, str marker);
@@ -5414,6 +5414,7 @@ int color_tostr(char **colorStr, int *le
str columnBindRef;
str columnRef;
str commitRef;
+str compileOptimizer(Client cntxt, str name);
str compileString(Symbol *fcn, Client c, str s);
str compressRef;
str connectRef;
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
--- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
+++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
@@ -77,8 +77,8 @@ end s2_1;
% . # table_name
% single_value # name
% varchar # type
-% 4 # length
-[ "user" ]
+% 6 # length
+[ "user_1" ]
#select def from optimizers() where name = optimizer;
% . # table_name
% def # name
diff --git a/sql/test/Tests/setoptimizer.stable.out
b/sql/test/Tests/setoptimizer.stable.out
--- a/sql/test/Tests/setoptimizer.stable.out
+++ b/sql/test/Tests/setoptimizer.stable.out
@@ -52,14 +52,14 @@ Ready.
% . # table_name
% single_value # name
% varchar # type
-% 4 # length
-[ "user" ]
+% 6 # length
+[ "user_1" ]
#select optimizer;
% . # table_name
% single_value # name
% varchar # type
-% 4 # length
-[ "user" ]
+% 6 # length
+[ "user_1" ]
#select * from optimizers();
% ., ., . # table_name
% name, def, status # name
@@ -76,7 +76,7 @@ Ready.
[ "datacyclotron_pipe",
"optimizer.inline();optimizer.remap();optimizer.evaluate();optimizer.costModel();optimizer.coercions();optimizer.emptySet();optimizer.aliases();optimizer.datacyclotron();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.dataflow();optimizer.history();optimizer.multiplex();optimizer.garbageCollector();",
"experimental" ]
[ "dictionary_pipe",
"optimizer.inline();optimizer.remap();optimizer.dictionary();optimizer.evaluate();optimizer.costModel();optimizer.coercions();optimizer.emptySet();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.constants();optimizer.commonTerms();optimizer.joinPath();optimizer.deadcode();optimizer.reduce();optimizer.dataflow();optimizer.history();optimizer.multiplex();optimizer.garbageCollector();",
"experimental" ]
[ "compression_pipe",
"optimizer.inline();optimizer.remap();optimizer.evaluate();optimizer.costModel();optimizer.coercions();optimizer.emptySet();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.constants();optimizer.commonTerms();optimizer.joinPath();optimizer.deadcode();optimizer.reduce();optimizer.dataflow();optimizer.compression();optimizer.dataflow();optimizer.history();optimizer.multiplex();optimizer.garbageCollector();",
"experimental" ]
-[ "user", "myfamous_pipe", "experimental" ]
+[ "user_1", "myfamous_pipe", "experimental" ]
# 02:57:35 >
# 02:57:35 > "Done."
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
