Changeset: a919332d1aa7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a919332d1aa7
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
sql/test/Tests/setoptimizer.stable.err
sql/test/Tests/setoptimizer.stable.out
sql/test/Tests/setoptimizer.stable.out.Windows
Branch: default
Log Message:
Approve output
diffs (144 lines):
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -38338,6 +38338,10 @@ command language.assert(v:sht,term:str):
address MALassertSht;
command language.assert(v:bit,term:str):void
address MALassertBit;
+pattern language.block(v:int,w:any...):int
+address deblockdataflow;
+comment Block on availability of all variables w, and then pass on v
+
pattern language.call(s:bat[:str]):void
address CMDcallBAT;
comment Evaluate a program stored in a BAT.
@@ -39674,6 +39678,12 @@ comment Collect trace of a specific oper
pattern optimizer.trace():str
address OPTwrapper;
+pattern optimizer.volcano(mod:str,fcn:str):str
+address OPTwrapper;
+comment Simulate volcano style execution
+
+pattern optimizer.volcano():str
+address OPTwrapper;
command pcre.imatch(s:str,pat:str):bit
address PCREimatch;
comment Caseless Perl Compatible Regular Expression pattern matching against a
string
diff --git a/clients/Tests/MAL-signatures.stable.out.int128
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -49189,6 +49189,10 @@ command language.assert(v:sht,term:str):
address MALassertSht;
command language.assert(v:bit,term:str):void
address MALassertBit;
+pattern language.block(v:int,w:any...):int
+address deblockdataflow;
+comment Block on availability of all variables w, and then pass on v
+
pattern language.call(s:bat[:str]):void
address CMDcallBAT;
comment Evaluate a program stored in a BAT.
@@ -50533,6 +50537,12 @@ comment Collect trace of a specific oper
pattern optimizer.trace():str
address OPTwrapper;
+pattern optimizer.volcano(mod:str,fcn:str):str
+address OPTwrapper;
+comment Simulate volcano style execution
+
+pattern optimizer.volcano():str
+address OPTwrapper;
command pcre.imatch(s:str,pat:str):bit
address PCREimatch;
comment Caseless Perl Compatible Regular Expression pattern matching against a
string
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
@@ -1251,6 +1251,7 @@ str MALpass(Client cntxt, MalBlkPtr mb,
str MALpipeline(Client c);
str MALreader(Client c);
void MALresourceFairness(lng usec);
+int MALrunningThreads(void);
str MALstartDataflow(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str MANIFOLDevaluate(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str MANIFOLDremapMultiplex(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
p);
@@ -1540,6 +1541,7 @@ int OPTremapImplementation(Client cntxt,
int OPTremoteQueriesImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
int OPTreorderImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
str OPTsetDebugStr(void *ret, str *nme);
+int OPTvolcanoImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
str OPTwrapper(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str PCREilike2(bit *ret, const str *s, const str *pat);
str PCREilike3(bit *ret, const str *s, const str *pat, const str *esc);
@@ -1933,6 +1935,7 @@ str bindRef;
str binddbatRef;
str bindidxRef;
var_t blobsize(size_t nitems);
+str blockRef;
str bpmRef;
str bstreamRef;
int bstream_create_wrap(Bstream *BS, Stream *S, int *bufsize);
@@ -1993,6 +1996,7 @@ int daytime_fromstr(const char *buf, int
int daytime_tostr(str *buf, int *len, const daytime *val);
int daytime_tz_fromstr(const char *buf, int *len, daytime **ret);
str dblRef;
+str deblockdataflow(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
void debugFunction(stream *fd, MalBlkPtr mb, MalStkPtr stk, int flg, int
first, int size);
void debugLifespan(Client cntxt, MalBlkPtr mb, Lifespan span);
str debugOptimizers(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
@@ -2057,6 +2061,7 @@ str generatorRef;
MALfcn getAddress(stream *out, str filename, str modnme, str fcnname, int
silent);
str getArgDefault(MalBlkPtr mb, InstrPtr p, int idx);
ptr getArgReference(MalStkPtr stk, InstrPtr pci, int k);
+lng getBatSpace(BAT *b);
int getBitConstant(MalBlkPtr mb, bit val);
int getBlockBegin(MalBlkPtr mb, int pc);
int getBlockExit(MalBlkPtr mb, int pc);
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-12681/.s.monetdb.34697
+MAPI = (monetdb) /var/tmp/mtest-12887/.s.monetdb.38476
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-12681/.s.monetdb.34697
+MAPI = (monetdb) /var/tmp/mtest-12887/.s.monetdb.38476
QUERY = set optimizer='myfamous_pipe';
ERROR = !optimizer 'myfamous_pipe' unknown
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
@@ -64,9 +64,10 @@ Ready.
% ., ., . # table_name
% name, def, status # name
% clob, clob, clob # type
-% 15, 541, 6 # length
+% 15, 561, 6 # length
[ "minimal_pipe",
"optimizer.inline();optimizer.candidates();optimizer.remap();optimizer.deadcode();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.garbageCollector();",
"stable" ]
[ "default_pipe",
"optimizer.inline();optimizer.candidates();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.garbageCollector();",
"stable" ]
+[ "volcano_pipe",
"optimizer.inline();optimizer.candidates();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.volcano();optimizer.profiler();optimizer.garbageCollector();",
"stable" ]
[ "no_mitosis_pipe",
"optimizer.inline();optimizer.remap();optimizer.candidates();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.aliases();optimizer.pushselect();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.profiler();optimizer.generator();optimizer.garbageCollector();",
"stable" ]
[ "sequential_pipe",
"optimizer.inline();optimizer.candidates();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.aliases();optimizer.pushselect();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.garbageCollector();",
"stable" ]
diff --git a/sql/test/Tests/setoptimizer.stable.out.Windows
b/sql/test/Tests/setoptimizer.stable.out.Windows
--- a/sql/test/Tests/setoptimizer.stable.out.Windows
+++ b/sql/test/Tests/setoptimizer.stable.out.Windows
@@ -64,9 +64,10 @@ Ready.
% ., ., . # table_name
% name, def, status # name
% clob, clob, clob # type
-% 15, 541, 6 # length
+% 15, 561, 6 # length
[ "minimal_pipe",
"optimizer.inline();optimizer.candidates();optimizer.remap();optimizer.deadcode();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.garbageCollector();",
"stable" ]
[ "default_pipe",
"optimizer.inline();optimizer.candidates();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.garbageCollector();",
"stable" ]
+[ "volcano_pipe",
"optimizer.inline();optimizer.candidates();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.volcano();optimizer.profiler();optimizer.garbageCollector();",
"stable" ]
[ "no_mitosis_pipe",
"optimizer.inline();optimizer.remap();optimizer.candidates();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.aliases();optimizer.pushselect();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.profiler();optimizer.generator();optimizer.garbageCollector();",
"stable" ]
[ "sequential_pipe",
"optimizer.inline();optimizer.candidates();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.aliases();optimizer.pushselect();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.garbageCollector();",
"stable" ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
