MonetDB: default - Approve output

[Martin Kersten]

Changeset: f0d5d67e6f20 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f0d5d67e6f20
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
sql/backends/monet5/sql_gencode.c
Branch: default
Log Message:

Approve output


diffs (172 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
@@ -7921,7 +7921,6 @@ Ready.
 [ "mdb",   "getStackFrame","pattern mdb.getStackFrame() 
(X_0:bat[:str],X_1:bat[:str]) ",   "MDBgetStackFrame;","Collect variable 
binding of current (n-th) stack frame."   ]
 [ "mdb",   "getStackFrame","pattern mdb.getStackFrame(i:int) 
(X_0:bat[:str],X_1:bat[:str]) ",  "MDBgetStackFrameN;",   ""  ]
 [ "mdb",   "getStackTrace","pattern mdb.getStackTrace() 
(X_0:bat[:int],X_1:bat[:str]) ",   "MDBStkTrace;", ""  ]
-[ "mdb",   "grab", "pattern mdb.grab():void ", "mdbGrab;", "Call 
debugger for a suspended process."]
 [ "mdb",   "inspect",  "pattern mdb.inspect(mod:str,fcn:str):void ",   
"MDBinspect;",  "Run the debugger on a specific function"   ]
 [ "mdb",   "list", "pattern mdb.list(M:str,F:str):void ",  "MDBlist3;",
"Dump the routine M.F on standard out." ]
 [ "mdb",   "list", "pattern mdb.list():void ", "MDBlist;", "Dump 
the current routine on standard out." ]
@@ -7932,14 +7931,11 @@ Ready.
 [ "mdb",   "setDebug", "command mdb.setDebug(flg:str):int ",   
"MDBsetDebugStr;",  "Set the kernel debugging bit-set and return its 
previous value.\nThe recognized options are: threads, memory, properties,\nio, 
transactions, modules, algorithms, estimates."  ]
 [ "mdb",   "setTrace", "pattern mdb.setTrace(b:bit):void ",
"MDBsetTrace;", "Turn on/off tracing of current routine"]
 [ "mdb",   "setTrace", "pattern mdb.setTrace(b:str):void ",
"MDBsetVarTrace;",  "Turn on/off tracing of a variable "]
-[ "mdb",   "setTrap",  "pattern 
mdb.setTrap(mod:str,fcn:str,b:bit):void ", "MDBtrapFunction;", "Suspend 
upon a call to the MAL function."  ]
-[ "mdb",   "setTrap",  "pattern mdb.setTrap(idx:int):void ",   
"mdbTrapClient;",   "Call debugger for a specific process." ]
 [ "mdb",   "start","pattern mdb.start():void ","MDBstart;",
"Start interactive debugger"]
 [ "mdb",   "start","pattern mdb.start(clientid:int):void ",
"MDBstart;","Start interactive debugger on a client"]
 [ "mdb",   "start","pattern mdb.start(mod:str,fcn:str):void ", 
"MDBstartFactory;", "Start interactive debugger on a running factory"   
]
 [ "mdb",   "stop", "pattern mdb.stop():void ", "MDBstop;", "Stop 
the interactive debugger" ]
 [ "mdb",   "traceOptimizer",   "command 
mdb.traceOptimizer(flg:str):void ","OPTsetDebugStr;",  "Otherwise it is 
considered a request to trace the optimizers,\nwhich requires a comma separated 
list or pipeline name."]
-[ "mdb",   "trap", "pattern mdb.trap():void ", "mdbTrap;", "A 
suspended process for debugging."]
 [ "mdb",   "var",  "pattern mdb.var(M:str,F:str):void ",   "MDBvar3;", 
"Dump the symboltable of routine M.F on standard out."  ]
 [ "mdb",   "var",  "pattern mdb.var():void ",  "MDBvar;",  "Dump 
the symboltable of current routine on standard out."  ]
 [ "mkey",  "bulk_rotate_xor_hash", "command 
mkey.bulk_rotate_xor_hash(h:bat[:lng],nbits:int,b:bat[:any_1]):bat[:lng] ",
"MKEYbulk_rotate_xor_hash;","pre:  h and b should be synced on head\n   
  post: [:xor=]([:rotate=](h, nbits), [hash](b))"   ]
@@ -8191,9 +8187,6 @@ Ready.
 [ "optimizer", "reorder",  "pattern optimizer.reorder(mod:str,fcn:str):str 
",  "OPTwrapper;",  "Reorder by dataflow dependencies"  ]
 [ "optimizer", "selcrack", "pattern optimizer.selcrack():str ",
"OPTwrapper;",  ""  ]
 [ "optimizer", "selcrack", "pattern 
optimizer.selcrack(mod:str,fcn:str):str ", "OPTwrapper;",  "Selection 
cracking"]
-[ "optimizer", "showFlowGraph","pattern 
optimizer.showFlowGraph(M:str,F:str,s:str):void ", "QOTshowFlowGraph;",
"Dump the data flow of the function \n\tM.F in a format recognizable by the 
\n\tcommand 'dot' on the file s"]
-[ "optimizer", "showPlan", "pattern optimizer.showPlan():void ",   
"QOTshowPlan;", "Illustrate the plan derived so far"]
-[ "optimizer", "showPlan", "pattern 
optimizer.showPlan(M:str,F:str,s:str):void ",  "QOTshowPlan;", ""  ]
 [ "optimizer", "sql_append",   "pattern optimizer.sql_append():str ",  
"OPTsql_append;",   "Avoid extra BAT copy with sql.append() whenever 
possible." ]
 [ "optimizer", "sql_appe

MonetDB: default - Approve output

[Martin Kersten]

Changeset: 5f5b0b43a641 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5f5b0b43a641
Modified Files:
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/optimizer/Tests/GCexample01.stable.out
sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out
sql/backends/monet5/UDF/cudf/Tests/udf-reverse.stable.out
sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out

sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out

sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out
sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out
sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out
sql/test/Tests/setoptimizer.stable.out
sql/test/Tests/setoptimizer.stable.out.Windows
sql/test/mapi/Tests/sql_int128.stable.out
sql/test/mergetables/Tests/mergequery.stable.out
Branch: default
Log Message:

Approve output


diffs (truncated from 1471 to 300 lines):

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
@@ -55,8 +55,8 @@ Ready.
 % .L1 # table_name
 % def # name
 % clob # type
-% 579 # length
-[ 
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.jit();optimizer.garbageCollector();"
]
+% 544 # length
+[ 
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.garbageCollector();"
   ]
 #explain copy into ttt from '/tmp/xyz';
 % .explain # table_name
 % mal # name
@@ -65,13 +65,12 @@ Ready.
 function user.s8_1():void;
 X_0:void := querylog.define("explain copy into ttt from 
\\'/tmp/xyz\\';","default_pipe",21:int);
 X_3 := sql.mvc();
-(X_13:bat[:int],X_14:bat[:int],X_15:bat[:int]) := 
sql.copy_from(nil:ptr,"|","\\n",nil:str,"null","/tmp/xyz",-1:lng,0:lng,0:int,0:int,nil:str);
-# querylog.define("explain copy into ttt from \\'/tmp/xyz\\';","default_pipe")
-X_16 := sql.append(X_3,"sys","ttt","a",X_13);
-X_20 := sql.append(X_16,"sys","ttt","b",X_14);
-X_22 := sql.append(X_20,"sys","ttt","c",X_15);
-X_24 := aggr.count(X_15);
-sql.affectedRows(X_22,X_24);
+(X_24:bat[:int],X_25:bat[:int],X_26:bat[:int]) := 
sql.copy_from(nil:ptr,"|","\\n",nil:str,"null","/tmp/xyz",-1:lng,0:lng,0:int,0:int,nil:str);
+X_28 := sql.append(X_3,"sys","ttt","a",X_24);
+X_33 := sql.append(X_28,"sys","ttt","b",X_25);
+X_36 := sql.append(X_33,"sys","ttt","c",X_26);
+X_38 := aggr.count(X_26);
+sql.affectedRows(X_36,X_38);
 end user.s8_1;
 #inline   actions= 0 time=1 usec 
 #candidates   actions= 1 time=14 usec 
@@ -115,8 +114,8 @@ end user.s8_1;
 % .L1 # table_name
 % def # name
 % clob # type
-% 602 # length
-[ 
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.jit();optimizer.sql_append();optimizer.garbageCollector();"
 ]
+% 567 # length
+[ 
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode()

MonetDB: default - Approve output

[Martin Kersten]

Changeset: d4af41565570 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d4af41565570
Modified Files:
monetdb5/optimizer/Tests/tst4000.stable.out
Branch: default
Log Message:

Approve output


diffs (12 lines):

diff --git a/monetdb5/optimizer/Tests/tst4000.stable.out 
b/monetdb5/optimizer/Tests/tst4000.stable.out
--- a/monetdb5/optimizer/Tests/tst4000.stable.out
+++ b/monetdb5/optimizer/Tests/tst4000.stable.out
@@ -29,7 +29,7 @@ function user.foo():void;   
 b:bat[:int] := bat.new(:int);  #[1] (0) CMDBATnew 1 <- 2 
 c:bat[:int] := bat.new(:int);  #[2] (0) CMDBATnew 3 <- 2 
 # identical until insert takes place 
-d:bat[:oid] := 
algebra.subselect(b:bat[:int],0:int,100:int,true:bit,true:bit,false:bit);   
#[4] (0) ALGsubselect1 5 <- 1 6 7 8 9 10 
+d:bat[:oid] := 
algebra.select(b:bat[:int],0:int,100:int,true:bit,true:bit,false:bit);  
#[4] (0) ALGselect1 5 <- 1 6 7 8 9 10 
 # mapped onto one instruction 
 l:int := calc.+(24:int,27:int);#[6] (0) CMDvarADDsignal 17 <- 
14 16 
 # mapped to l 
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - approve output

[Niels Nes]

Changeset: 0c7dd33365ba for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0c7dd33365ba
Modified Files:
clients/Tests/exports.stable.out
Branch: default
Log Message:

approve output


diffs (21 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
@@ -268,7 +268,7 @@ gdk_return GDKreleasemmap(void *ptr, siz
 gdk_return GDKreleasesem(int sem_id, str *msg);
 void GDKreset(int status, int exit);
 void GDKsetenv(str name, str value);
-void GDKsetmemorylimit(lng nbytes);
+void GDKsetmallocsuccesscount(lng count);
 ssize_t GDKstrFromStr(unsigned char *dst, const unsigned char *src, ssize_t 
len);
 str GDKstrdup(const char *s) __attribute__((__warn_unused_result__));
 str GDKstrndup(const char *s, size_t n) 
__attribute__((__warn_unused_result__));
@@ -1206,7 +1206,7 @@ str IOimport(void *ret, bat *bid, str *f
 str IOprint_val(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
 str IOprintf(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
 str IOprintfStream(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str IOsetmemorylimit(void *res, lng *nbytes);
+str IOsetmallocsuccesscount(void *res, lng *nbytes);
 str IOtable(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
 str ITRbunIterator(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
 str ITRbunNext(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approve output

[Martin Kersten]

Changeset: b297a9fcaa44 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b297a9fcaa44
Modified Files:
monetdb5/optimizer/Tests/GCexample01.stable.out
monetdb5/optimizer/Tests/tst4006.stable.out
Branch: default
Log Message:

Approve output


diffs (102 lines):

diff --git a/monetdb5/optimizer/Tests/GCexample01.stable.out 
b/monetdb5/optimizer/Tests/GCexample01.stable.out
--- a/monetdb5/optimizer/Tests/GCexample01.stable.out
+++ b/monetdb5/optimizer/Tests/GCexample01.stable.out
@@ -37,20 +37,17 @@ function user.qry():void;   
 barrier (x:oid, z:int) := iterator.new(b:bat[:int]);   #[5] (0) ITRbunIterator 
7 8 <- 1 
 io.print(x:oid);   #[6] (0) IOprint_val 9 <- 7 
 exit (x:oid, z:int);   #[7] (0)  7 8 
-b:bat[:int] := nil:bat[:int];  #[8] (0)  1 <- 16 
-barrier (x:oid, z:int) := iterator.new(c:bat[:int]);   #[9] (0) ITRbunIterator 
7 8 <- 3 
-io.print(x:oid);   #[10] (0) IOprint_val 10 <- 7 
-redo (x:oid, z:int) := iterator.next(c:bat[:int]); #[11] (0) ITRbunNext 7 
8 <- 3 
-exit (x:oid, z:int);   #[12] (0)  7 8 
-c:bat[:int] := nil:bat[:int];  #[13] (0)  3 <- 18 
+barrier (x:oid, z:int) := iterator.new(c:bat[:int]);   #[8] (0) ITRbunIterator 
7 8 <- 3 
+io.print(x:oid);   #[9] (0) IOprint_val 10 <- 7 
+redo (x:oid, z:int) := iterator.next(c:bat[:int]); #[10] (0) ITRbunNext 7 
8 <- 3 
+exit (x:oid, z:int);   #[11] (0)  7 8 
 # do not close d, it may be reused 
-barrier go:bit := true:bit;#[15] (0)  12 <- 13 
-io.print(d:bat[:int]); #[16] (0) IOprint_val 14 <- 4 
-redo go:bit := true:bit;   #[17] (0)  12 <- 13 
-exit go:bit;   #[18] (0)  12 
-d:bat[:int] := nil:bat[:int];  #[19] (0)  4 <- 20 
-end user.qry;  #[20] (0)  
-#garbagecollector actions= 4 time=31 usec 
+barrier go:bit := true:bit;#[13] (0)  12 <- 13 
+io.print(d:bat[:int]); #[14] (0) IOprint_val 14 <- 4 
+redo go:bit := true:bit;   #[15] (0)  12 <- 13 
+exit go:bit;   #[16] (0)  12 
+end user.qry;  #[17] (0)  
+#garbagecollector actions= 1 time=21 usec 
 function user.qry():void;  #[0] (0)  0 
 b:bat[:int] := bat.new(:int);  #[1] (0) CMDBATnew 1 <- 2 
 c:bat[:int] := bat.new(:int);  #[2] (0) CMDBATnew 3 <- 2 
@@ -59,20 +56,17 @@ function user.qry():void;   
 barrier (x:oid, z:int) := iterator.new(b:bat[:int]);   #[5] (0) ITRbunIterator 
7 8 <- 1 
 io.print(x:oid);   #[6] (0) IOprint_val 9 <- 7 
 exit (x:oid, z:int);   #[7] (0)  7 8 
-b:bat[:int] := nil:bat[:int];  #[8] (0)  1 <- 16 
-barrier (x:oid, z:int) := iterator.new(c:bat[:int]);   #[9] (0) ITRbunIterator 
7 8 <- 3 
-io.print(x:oid);   #[10] (0) IOprint_val 10 <- 7 
-redo (x:oid, z:int) := iterator.next(c:bat[:int]); #[11] (0) ITRbunNext 7 
8 <- 3 
-exit (x:oid, z:int);   #[12] (0)  7 8 
-c:bat[:int] := nil:bat[:int];  #[13] (0)  3 <- 18 
+barrier (x:oid, z:int) := iterator.new(c:bat[:int]);   #[8] (0) ITRbunIterator 
7 8 <- 3 
+io.print(x:oid);   #[9] (0) IOprint_val 10 <- 7 
+redo (x:oid, z:int) := iterator.next(c:bat[:int]); #[10] (0) ITRbunNext 7 
8 <- 3 
+exit (x:oid, z:int);   #[11] (0)  7 8 
 # do not close d, it may be reused  
-barrier go:bit := true:bit;#[15] (0)  12 <- 13 
-io.print(d:bat[:int]); #[16] (0) IOprint_val 14 <- 4 
-redo go:bit := true:bit;   #[17] (0)  12 <- 13 
-exit go:bit;   #[18] (0)  12 
-d:bat[:int] := nil:bat[:int];  #[19] (0)  4 <- 20 
-end user.qry;  #[20] (0)  
-#garbagecollector actions= 4 time=31 usec 
+barrier go:bit := true:bit;#[13] (0)  12 <- 13 
+io.print(d:bat[:int]); #[14] (0) IOprint_val 14 <- 4 
+redo go:bit := true:bit;   #[15] (0)  12 <- 13 
+exit go:bit;   #[16] (0)  12 
+end user.qry;  #[17] (0)  
+#garbagecollector actions= 1 time=21 usec 
 
 # 23:17:49 >  
 # 23:17:49 >  Done.
diff --git a/monetdb5/optimizer/Tests/tst4006.stable.out 
b/monetdb5/optimizer/Tests/tst4006.stable.out
--- a/monetdb5/optimizer/Tests/tst4006.stable.out
+++ b/monetdb5/optimizer/Tests/tst4006.stable.out
@@ -34,12 +34,10 @@ barrier V12:bit := true:bit;
 V13:any := algebra.union(x:bat[:int], z:bat[:int]);   

MonetDB: default - Approve output

[Martin Kersten]

Changeset: 8ed17956f2f4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8ed17956f2f4
Modified Files:
sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out
Branch: default
Log Message:

Approve output


diffs (37 lines):

diff --git 
a/sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out 
b/sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out
--- a/sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out
+++ b/sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out
@@ -38,9 +38,7 @@ Ready.
 % 112 # length
 function user.s4_1():void;
 X_2:void := querylog.define("explain select count(*) from tmp where i = 
20160222;", "default_pipe", 12:int);
-X_12 := bat.new(nil:int);
-C_14 := algebra.thetaselect(X_12, 20160222:int, "==");
-X_16 := algebra.projection(C_14, X_12);
+X_16 := bat.new(nil:int);
 X_17 := aggr.count(X_16);
 sql.resultSet("sys.L4", "L3", "bigint", 64:int, 0:int, 7:int, X_17);
 end user.s4_1;
@@ -53,9 +51,7 @@ end user.s4_1;
 % 118 # length
 function user.s6_1():void;
 X_2:void := querylog.define("explain select count(*) from tmp where i = 
\\'20160222\\';", "default_pipe", 13:int);
-X_12 := bat.new(nil:int);
-C_16 := algebra.thetaselect(X_12, 20160222:int, "==");
-X_18 := algebra.projection(C_16, X_12);
+X_18 := bat.new(nil:int);
 X_19 := aggr.count(X_18);
 sql.resultSet("sys.L4", "L3", "bigint", 64:int, 0:int, 7:int, X_19);
 end user.s6_1;
@@ -68,10 +64,7 @@ end user.s6_1;
 % 113 # length
 function user.s8_1():void;
 X_2:void := querylog.define("explain select count(*) from tmp where i = 
201602221;", "default_pipe", 13:int);
-X_12 := bat.new(nil:int);
-X_13:bat[:int] := batcalc.int(0:int, X_12, 9:int, 0:int);
-C_18 := algebra.thetaselect(X_13, 201602221:int, "==");
-X_20 := algebra.projection(C_18, X_12);
+X_20 := bat.new(nil:int);
 X_21 := aggr.count(X_20);
 sql.resultSet("sys.L4", "L3", "bigint", 64:int, 0:int, 7:int, X_21);
 end user.s8_1;
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approve output

[Martin Kersten]

Changeset: 73f3c2ad21cd for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=73f3c2ad21cd
Modified Files:
monetdb5/optimizer/Tests/dataflow.stable.out
sql/test/remote/Tests/partition_elim.stable.out
Branch: default
Log Message:

Approve output


diffs (271 lines):

diff --git a/monetdb5/optimizer/Tests/dataflow.stable.out 
b/monetdb5/optimizer/Tests/dataflow.stable.out
--- a/monetdb5/optimizer/Tests/dataflow.stable.out
+++ b/monetdb5/optimizer/Tests/dataflow.stable.out
@@ -40,17 +40,18 @@ barrier X_27:bit := language.dataflow();
 t6:bat[:oid] := algebra.select(s:bat[:int], l:int, h:int, true:bit, 
true:bit, false:bit);  #[13] (0) ALGselect1 19 <- 1 5 6 12 12 14 
 t7:bat[:oid] := algebra.select(s:bat[:int], l:int, h:int, true:bit, 
true:bit, false:bit);  #[14] (0) ALGselect1 20 <- 1 5 6 12 12 14 
 t8:bat[:oid] := algebra.select(s:bat[:int], l:int, h:int, true:bit, 
true:bit, false:bit);  #[15] (0) ALGselect1 21 <- 1 5 6 12 12 14 
-exit X_27:bit; #[16] (0)  27 
-z:bat[:oid] := mat.pack(t1:bat[:oid], t2:bat[:oid], t3:bat[:oid], 
t4:bat[:oid], t5:bat[:oid], t6:bat[:oid], t7:bat[:oid], t8:bat[:oid]);   #[17] 
(0) MATpack 9 <- 11 15 16 17 18 19 20 21 
-mdb.var(); #[18] (0) MDBvar 22 
-c:lng := aggr.count(z:bat[:oid]);  #[19] (0) ALGcount_bat 23 <- 9 
-io.print(c:lng);   #[20] (0) IOprint_val 24 <- 23 
-io.print("done":str);  #[21] (0) IOprint_val 25 <- 26 
-end user.tst;  #[22] (0)  
-#dataflow actions= 1 time=19 usec 
-#garbagecollector actions= 1 time=19 usec 
-#Stack 'tst' size=40 top=32
-#[ 1] s (2,2,15) =  :bat[:int] rows=10   
+language.pass(s:bat[:int]);#[16] (0) MALpass 29 <- 1 
+exit X_27:bit; #[17] (0)  27 
+z:bat[:oid] := mat.pack(t1:bat[:oid], t2:bat[:oid], t3:bat[:oid], 
t4:bat[:oid], t5:bat[:oid], t6:bat[:oid], t7:bat[:oid], t8:bat[:oid]);   #[18] 
(0) MATpack 9 <- 11 15 16 17 18 19 20 21 
+mdb.var(); #[19] (0) MDBvar 22 
+c:lng := aggr.count(z:bat[:oid]);  #[20] (0) ALGcount_bat 23 <- 9 
+io.print(c:lng);   #[21] (0) IOprint_val 24 <- 23 
+io.print("done":str);  #[22] (0) IOprint_val 25 <- 26 
+end user.tst;  #[23] (0)  
+#dataflow actions= 1 time=22 usec 
+#garbagecollector actions= 1 time=18 usec 
+#Stack 'tst' size=40 top=33
+#[ 1] s (2,2,16) =  :bat[:int] rows=10   
 #[ 2]   X_2 (2,2,2) = 0@0 :oid  constant  
 #[ 3]   X_3 (2,2,2) = 10 :lng  constant  
 #[ 4]   X_4 (2,2,2) = 10 :int  constant  
diff --git a/sql/test/remote/Tests/partition_elim.stable.out 
b/sql/test/remote/Tests/partition_elim.stable.out
--- a/sql/test/remote/Tests/partition_elim.stable.out
+++ b/sql/test/remote/Tests/partition_elim.stable.out
@@ -137,7 +137,7 @@ Ready.
 % 117 # length
 function user.main():void;
 X_5:void := querylog.define("explain select x,y from test where x between 
4.0 and 6.0;", "default_pipe", 49:int);
-barrier X_149 := language.dataflow();
+barrier X_143 := language.dataflow();
 X_40:bat[:dbl] := bat.new(nil:dbl);
 X_8 := sql.mvc();
 X_119:bat[:dbl] := sql.bind(X_8, "sys", "test2", "x", 0:int, 0:int, 2:int);
@@ -160,29 +160,18 @@ barrier X_149 := language.dataflow();
 X_129 := algebra.projection(C_125, X_122);
 X_121:bat[:dbl] := sql.bind(X_8, "sys", "test2", "y", 0:int, 0:int, 2:int);
 X_128 := algebra.projection(C_124, X_121);
-language.pass(X_119);
-language.pass(X_120);
-language.pass(C_36);
-language.pass(X_30);
-language.pass(C_125);
-language.pass(C_124);
-exit X_149;
 X_42 := bat.append(X_40, X_25, true);
 X_43 := bat.append(X_42, X_37, true);
-barrier X_152 := language.dataflow();
 X_44:bat[:dbl] := bat.new(nil:dbl);
 X_140 := mat.packIncrement(X_128, 2:int);
 X_26 := mat.packIncrement(X_140, X_129);
-exit X_152;
 X_45 := bat.append(X_44, X_26, true);
 X_46 := bat.append(X_45, X_38, true);
-barrier X_155 := language.dataflow();
 X_48 := bat.new(nil:str);
 X_54 := bat.new(nil:int);
 X_52 := bat.new(nil:int);
 X_51 := bat.new(nil:str);
 X_50 := bat.new(nil:str);
-exit X_155;
 X_55 := bat.append(X_48, ".test");
 X_57 := bat.append(X_50, "x");
 X_59 := bat.append(X_51, "double");
@@ -193,6 +182,13 @@ exit X_155;
 X_68 := bat.append(X_59, "double");
 X_69 := bat.append(X_61, 53:int);
 X_70 := bat.append(X_63, 0:int);
+language.pass(X_119);
+language.pass(X_120);
+language.pass(C_36);
+language.pass(X_30);
+language.pass(C_125);
+language.pass(C_124);
+exit X_143;
 sql.resultSet(X_65, X_66, X_68, X_69, X_70, X_43, X_46);
 end user.main;
 #inline   actions= 0 time=3 usec 
@@ -226,7 +222,7 @@

MonetDB: default - Approve output.

[Sjoerd Mullender]

Changeset: 8d69836baeb6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8d69836baeb6
Modified Files:
sql/test/quantiles/Tests/quantiles.stable.out
Branch: default
Log Message:

Approve output.


diffs (14 lines):

diff --git a/sql/test/quantiles/Tests/quantiles.stable.out 
b/sql/test/quantiles/Tests/quantiles.stable.out
--- a/sql/test/quantiles/Tests/quantiles.stable.out
+++ b/sql/test/quantiles/Tests/quantiles.stable.out
@@ -173,8 +173,8 @@ Ready.
 % decimal, decimal,decimal # type
 % 20,  20, 20 # length
 [ 4424.440,36960.680,  80045.910   ]
-[ 3885.880,37144.200,  79010.100   ]
-[ 4171.320,35937.880,  78572.760   ]
+[ 3889.960,37144.200,  79010.100   ]
+[ 4204.470,35937.880,  78572.760   ]
 #select quantile(l_extendedprice,1) from lit group by l_returnflag;
 % sys.L3 # table_name
 % L2 # name
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approve output

[Martin Kersten]

Changeset: 72de238f68da for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=72de238f68da
Modified Files:
clients/Tests/exports.stable.out
Branch: default
Log Message:

Approve output


diffs (11 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
@@ -2402,6 +2402,7 @@ str putNameLen(const char *nme, size_t l
 str putRef;
 str pyapiRef;
 str pyapimapRef;
+int qtop;
 str queryRef;
 str querylogRef;
 str raiseRef;
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - approve output

[Niels Nes]

Changeset: 737c03680baa for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=737c03680baa
Modified Files:

sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out
Branch: default
Log Message:

approve output


diffs (15 lines):

diff --git 
a/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out 
b/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out
--- 
a/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out
+++ 
b/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out
@@ -528,6 +528,11 @@ stdout of test 'check_ForeignKey_referen
 % id,  table_id,   column_id,  expression, type # name
 % int, int,int,varchar,tinyint # type
 % 1,   1,  1,  0,  1 # length
+#SELECT * FROM sys.table_partitions WHERE "type" NOT IN (5,6,9,10);-- 5=By 
Column Range (1+4), 6=By Expression Range (2+4), 9=By Column Value (1+8), 10=By 
Expression Value (2+8), see sql_catalog.h #define PARTITION_*
+% sys.table_partitions,sys.table_partitions,   sys.table_partitions,   
sys.table_partitions,   sys.table_partitions # table_name
+% id,  table_id,   column_id,  expression, type # name
+% int, int,int,varchar,tinyint # type
+% 1,   1,  1,  0,  1 # length
 #SELECT * FROM sys.range_partitions WHERE "table_id" NOT IN (SELECT id FROM 
sys._tables);
 % sys.range_partitions,sys.range_partitions,   sys.range_partitions,   
sys.range_partitions,   sys.range_partitions # table_name
 % table_id,partition_id,   minimum,maximum,with_nulls # 
name
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approve output.

[Pedro Ferreira]

Changeset: a39bf56884af for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a39bf56884af
Modified Files:
monetdb5/modules/mal/Tests/inspect05.stable.out
monetdb5/modules/mal/Tests/inspect05.stable.out.int128
Branch: default
Log Message:

Approve output.


diffs (274 lines):

diff --git a/monetdb5/modules/mal/Tests/inspect05.stable.out 
b/monetdb5/modules/mal/Tests/inspect05.stable.out
--- a/monetdb5/modules/mal/Tests/inspect05.stable.out
+++ b/monetdb5/modules/mal/Tests/inspect05.stable.out
@@ -35,68 +35,69 @@ stdout of test 'inspect05` in directory 
 [ 4@0, "append",   "command",  "bat",  "(i:bat[:any_1], u:bat[:any_1], 
s:bat[:oid]):bat[:any_1] ", "BKCappend_cand_wrap;"  ]
 [ 5@0, "append",   "command",  "bat",  "(i:bat[:any_1], u:bat[:any_1], 
force:bit):bat[:any_1] ",   "BKCappend_force_wrap;" ]
 [ 6@0, "attach",   "command",  "bat",  "(i:bat[:any_1], 
u:bat[:any_1]):bat[:any_1] ",  "BKCappend_wrap;"   ]
-[ 7@0, "delete",   "command",  "bat",  "(sz:lng):bat[:oid] ",  
"BKCdensebat;"  ]
-[ 8@0, "delete",   "command",  "bat",  "(b:bat[:any_1]):bat[:any_1] ", 
"BKCdelete_all;"]
-[ 9@0, "delete",   "command",  "bat",  "(b:bat[:any_1], 
d:bat[:oid]):bat[:any_1] ","BKCdelete_multi;"  ]
-[ 10@0,"densebat", "command",  "bat",  "(b:bat[:any_1], 
h:oid):bat[:any_1] ",  "BKCdelete;"]
-[ 11@0,"getAccess","pattern",  "bat",  
"(bv:bat[:any_1]):bat[:oid] ",  "OIDXgetorderidx;"  ]
-[ 12@0,"getCapacity",  "command",  "bat",  "(b:bat[:any_1]):str ", 
"BKCgetBBPname;"]
-[ 13@0,"getColumnType","command",  "bat",  
"(b:bat[:any_1]):oid ", "BKCgetSequenceBase;"   ]
-[ 14@0,"getName",  "command",  "bat",  "(b:bat[:any_1]):str ", 
"BKCgetAccess;" ]
-[ 15@0,"getRole",  "command",  "bat",  "(bid:bat[:any_1]):str 
",   "BKCgetRole;"   ]
-[ 16@0,"getSequenceBase",  "command",  "bat",  
"(b:bat[:any_1]):str ", "BKCgetColumnType;" ]
-[ 17@0,"getSize",  "command",  "bat",  "(b:bat[:any_1]):lng ", 
"BKCgetCapacity;"   ]
-[ 18@0,"getorderidx",  "command",  "bat",  "(b:bat[:any_1]):lng ", 
"BKCgetSize;"   ]
-[ 19@0,"hasorderidx",  "pattern",  "bat",  "(bv:bat[:any_1]):bit 
","OIDXhasorderidx;"  ]
-[ 20@0,"imprints", "command",  "bat",  "(b:bat[:dbl]):lng ",   
"CMDBATimprintsize;"]
-[ 21@0,"imprints", "command",  "bat",  "(b:bat[:flt]):lng ",   
"CMDBATimprintsize;"]
-[ 22@0,"imprints", "command",  "bat",  "(b:bat[:lng]):lng ",   
"CMDBATimprintsize;"]
-[ 23@0,"imprints", "command",  "bat",  "(b:bat[:int]):lng ",   
"CMDBATimprintsize;"]
-[ 24@0,"imprints", "command",  "bat",  "(b:bat[:sht]):lng ",   
"CMDBATimprintsize;"]
-[ 25@0,"imprints", "command",  "bat",  "(b:bat[:bte]):lng ",   
"CMDBATimprintsize;"]
-[ 26@0,"imprintsize",  "command",  "bat",  "(b:bat[:dbl]):void ",  
"CMDBATimprints;"   ]
-[ 27@0,"imprintsize",  "command",  "bat",  "(b:bat[:flt]):void ",  
"CMDBATimprints;"   ]
-[ 28@0,"imprintsize",  "command",  "bat",  "(b:bat[:lng]):void ",  
"CMDBATimprints;"   ]
-[ 29@0,"imprintsize",  "command",  "bat",  "(b:bat[:int]):void ",  
"CMDBATimprints;"   ]
-[ 30@0,"imprintsize",  "command",  "bat",  "(b:bat[:sht]):void ",  
"CMDBATimprints;"   ]
-[ 31@0,"imprintsize",  "command",  "bat",  "(b:bat[:bte]):void ",  
"CMDBATimprints;"   ]
-[ 32@0,"info", "command",  "bat",  "(a:bat[:oid], 
b:bat[:oid]):bat[:oid] ","BKCintersectcand;" ]
-[ 33@0,"intersectcand","command",  "bat",  
"(b1:bat[:any_1], b2:bat[:any_2]):bit ","BKCisSynced;"  ]
-[ 34@0,"isPersistent", "command",  "bat",  "(b:bat[:any_1]):bit ", 
"BKCisPersistent;"  ]
-[ 35@0,"isSorted", "command",  "bat",  "(b:bat[:any_1]):bit ", 
"BKCisTransient;"   ]
-[ 36@0,"isSortedReverse",  "command",  "bat",  
"(b:bat[:any_1]):bit ", "BKCisSortedReverse;"   ]
-[ 37@0,"isSynced", "command",  "bat",  "(b:bat[:any_1]):bit ", 
"BKCisSorted;"  ]
-[ 38@0,"isTransient",  "command",  "bat",  "(b:bat[:any_1]):bit ", 
"BKCgetKey;"]
-[ 39@0,"isaKey",   "command",  "bat",  "(b:bat[:any_1]) 
(X_0:bat[:str], X_1:bat[:str]) ",  "BKCinfo;"  ]
-[ 40@0,"mergecand","command",  "bat",  "(a:bat[:oid], 
b:bat[:oid]):bat[:oid] ","BKCmergecand;" ]
-[ 41@0,"mirror",   "command",  "bat",  
"(b:bat[:any_2]):bat[:oid] ",   "BKCmirror;"]
-[ 42@0,"new",  "pattern",  "bat",  "(tt:any_1, 
size:lng):bat[:any_1] ","CMDBATnew;"]
-[ 43@0,"new",  "pattern",  "bat",  "(tt:any_1

MonetDB: default - Approve output.

[Pedro Ferreira]

Changeset: b20393b055a2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b20393b055a2
Modified Files:
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
Branch: default
Log Message:

Approve output.


diffs (25 lines):

diff --git a/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out 
b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
--- a/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
+++ b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
@@ -34,16 +34,14 @@ project (
 | project (
 | | group by (
 | | | table(sys.dbg) [ "dbg"."a", "dbg"."b" ] COUNT 
-| | ) [ "dbg"."a" as "d" ] [ "dbg"."d", sys.sum no nil ("dbg"."b") as 
"L3"."L3", "L3"."L3" as "L5"."L5" ]
-| ) [ "dbg"."d", "L3"."L3", sys.sql_mul(sys.sql_div("L5"."L5", tinyint "2"), 
tinyint "2") as "L6"."f" ]
-) [ "dbg"."d", "L3"."L3", "L6"."f" ]
+| | ) [ "dbg"."a" as "d" ] [ "dbg"."d", sys.sum no nil ("dbg"."b") as 
"L1"."L1", "L1"."L1" as "L2"."L2" ]
+| ) [ "dbg"."d", "L1"."L1", sys.sql_mul(sys.sql_div("L2"."L2", tinyint "2"), 
tinyint "2") as "L3"."f" ]
+) [ "dbg"."d", "L1"."L1", "L3"."f" ]
 #set optimizer = 'sequential_pipe';
 #set optimizer = 'default_pipe';
 #SELECT a as d, SUM(b), (2 * (SUM(b) / (SELECT 2))) as f FROM dbg GROUP BY d;
-% sys.dbg,  sys.,   sys. # table_name
-# sys.dbg,  sys.L3, sys.L6 # table_name
-% d,L,  f # name
-# d,L3, f # name
+% sys.dbg, sys.L1, sys.L3 # table_name
+% d,   L1, f # name
 % int,  bigint, bigint # type
 % 2,2,  2 # length
 [ 10,   10, 10  ]
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approve output.

[Pedro Ferreira]

Changeset: a6e276f97268 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a6e276f97268
Modified Files:
sql/test/sys-schema/Tests/systemfunctions.stable.out
sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
Branch: default
Log Message:

Approve output.


diffs (46 lines):

diff --git a/sql/test/sys-schema/Tests/systemfunctions.stable.out 
b/sql/test/sys-schema/Tests/systemfunctions.stable.out
--- a/sql/test/sys-schema/Tests/systemfunctions.stable.out
+++ b/sql/test/sys-schema/Tests/systemfunctions.stable.out
@@ -25,7 +25,7 @@ stdout of test 'systemfunctions` in dire
 #   and f.id = a.func_id
 #   and f.system
 # order by s.name, f.name, f.id, a.number;
-% sys.L2,  sys.L4, sys.L6, sys.L10,sys.L12 # table_name
+% sys.L1,  sys.L2, sys.L3, sys.L4, sys.L5 # table_name
 % schema,  function,   argno,  argtype,definition # name
 % varchar, varchar,int,varchar,varchar # type
 % 8,   24, 2,  14, 705 # length
@@ -517,6 +517,10 @@ stdout of test 'systemfunctions` in dire
 [ "sys",   "decade",   1,  "timestamptz",  ""  ]
 [ "sys",   "degrees",  0,  "double",   "create function 
degrees(r double)\nreturns double\n return r*180/pi();"]
 [ "sys",   "degrees",  1,  "double",   ""  ]
+[ "sys",   "deltas",   0,  "bigint",   "create function 
sys.deltas (\"schema\" string, \"table\" string, \"column\" string)\n returns 
table (\"values\" bigint)\n external name \"sql\".\"deltas\";"   ]
+[ "sys",   "deltas",   1,  "clob", ""  ]
+[ "sys",   "deltas",   2,  "clob", ""  ]
+[ "sys",   "deltas",   3,  "clob", ""  ]
 [ "sys",   "dense_rank",   0,  "int",  "dense_rank"]
 [ "sys",   "dense_rank",   1,  "any",  ""  ]
 [ "sys",   "dense_rank",   2,  "boolean",  ""  ]
diff --git a/sql/test/sys-schema/Tests/systemfunctions.stable.out.int128 
b/sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
--- a/sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
+++ b/sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
@@ -25,7 +25,7 @@ stdout of test 'systemfunctions` in dire
 #   and f.id = a.func_id
 #   and f.system
 # order by s.name, f.name, f.id, a.number;
-% sys.L2,  sys.L4, sys.L6, sys.L10,sys.L12 # table_name
+% sys.L1,  sys.L2, sys.L3, sys.L4, sys.L5 # table_name
 % schema,  function,   argno,  argtype,definition # name
 % varchar, varchar,int,varchar,varchar # type
 % 8,   24, 2,  14, 705 # length
@@ -553,6 +553,10 @@ stdout of test 'systemfunctions` in dire
 [ "sys",   "decade",   1,  "timestamptz",  ""  ]
 [ "sys",   "degrees",  0,  "double",   "create function 
degrees(r double)\nreturns double\n return r*180/pi();"]
 [ "sys",   "degrees",  1,  "double",   ""  ]
+[ "sys",   "deltas",   0,  "bigint",   "create function 
sys.deltas (\"schema\" string, \"table\" string, \"column\" string)\n returns 
table (\"values\" bigint)\n external name \"sql\".\"deltas\";"   ]
+[ "sys",   "deltas",   1,  "clob", ""  ]
+[ "sys",   "deltas",   2,  "clob", ""  ]
+[ "sys",   "deltas",   3,  "clob", ""  ]
 [ "sys",   "dense_rank",   0,  "int",  "dense_rank"]
 [ "sys",   "dense_rank",   1,  "any",  ""  ]
 [ "sys",   "dense_rank",   2,  "boolean",  ""  ]
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approve output.

[Pedro Ferreira]

Changeset: 2df3d7626e88 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2df3d7626e88
Modified Files:
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out

sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.out
sql/test/BugTracker-2019/Tests/view-too-few-rows.Bug-6736.stable.out
sql/test/BugTracker/Tests/groupby_with_alias.SF-1520575.stable.out
Branch: default
Log Message:

Approve output.


diffs (147 lines):

diff --git a/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out 
b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
--- a/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
+++ b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
@@ -29,19 +29,19 @@ stdout of test 'crash_on_alias.Bug-2798`
 % .plan # table_name
 % rel # name
 % clob # type
-% 105 # length
+% 109 # length
 project (
 | project (
 | | group by (
 | | | table(sys.dbg) [ "dbg"."a", "dbg"."b" ] COUNT 
-| | ) [ "dbg"."a" as "d" ] [ "dbg"."d", sys.sum no nil ("dbg"."b") as 
"L1"."L1", "L1"."L1" as "L2"."L2" ]
-| ) [ "dbg"."d", "L1"."L1", sys.sql_mul(sys.sql_div("L2"."L2", tinyint "2"), 
tinyint "2") as "L3"."f" ]
-) [ "dbg"."d", "L1"."L1", "L3"."f" ]
+| | ) [ "dbg"."a" as "d" ] [ "d", sys.sum no nil ("dbg"."b") as "L2"."L2", 
"L2"."L2" as "L3"."L3" ]
+| ) [ "d" as "L1"."d", "L2"."L2", sys.sql_mul(sys.sql_div("L3"."L3", tinyint 
"2"), tinyint "2") as "L4"."f" ]
+) [ "L1"."d", "L2"."L2", "L4"."f" ]
 #set optimizer = 'sequential_pipe';
 #set optimizer = 'default_pipe';
 #SELECT a as d, SUM(b), (2 * (SUM(b) / (SELECT 2))) as f FROM dbg GROUP BY d;
-% sys.dbg, sys.L1, sys.L3 # table_name
-% d,   L1, f # name
+% sys.L1,  sys.L2, sys.L4 # table_name
+% d,   L2, f # name
 % int,  bigint, bigint # type
 % 2,2,  2 # length
 [ 10,   10, 10  ]
diff --git 
a/sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.out
 
b/sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.out
--- 
a/sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.out
+++ 
b/sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.out
@@ -138,21 +138,21 @@ stdout of test 'column_alias_in_where_cl
 % char,int,varchar # type
 % 1,   1,  0 # length
 #SELECT a AS "A", b AS "B", c AS "C" FROM t_alias ORDER BY "C", "A", "B";
-% sys.L2,  sys.L4, sys.L6 # table_name
+% sys.L1,  sys.L2, sys.L3 # table_name
 % A,   B,  C # name
 % int, int,varchar # type
 % 2,   2,  4 # length
 [ 11,  2,  "elf"   ]
 [ 1,   10, "tien"  ]
 #SELECT a*b AS "A*B", c AS "C" FROM t_alias GROUP BY "C", "A*B";
-% sys.L2,  sys.t_alias # table_name
+% sys.L1,  sys.L2 # table_name
 % A*B, C # name
 % bigint,  varchar # type
 % 2,   4 # length
 [ 10,  "tien"  ]
 [ 22,  "elf"   ]
 #SELECT a*b*b AS "A*B", c AS "C" FROM t_alias GROUP BY "C", "A*B" HAVING "A*B" 
IS NOT NULL ORDER BY -"A*B";
-% sys.L2,  sys.t_alias # table_name
+% sys.L1,  sys.L2 # table_name
 % A*B, C # name
 % bigint,  varchar # type
 % 3,   4 # length
diff --git 
a/sql/test/BugTracker-2019/Tests/view-too-few-rows.Bug-6736.stable.out 
b/sql/test/BugTracker-2019/Tests/view-too-few-rows.Bug-6736.stable.out
--- a/sql/test/BugTracker-2019/Tests/view-too-few-rows.Bug-6736.stable.out
+++ b/sql/test/BugTracker-2019/Tests/view-too-few-rows.Bug-6736.stable.out
@@ -57,11 +57,9 @@ stdout of test 'view-too-few-rows.Bug-67
 # loading sql script: 99_system.sql
 # MonetDB/SQL module loaded
 
-Ready.
-
-# 11:46:36 >  
-# 11:46:36 >  "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-25842" "--port=36855"
-# 11:46:36 >  
+# 09:25:08 >  
+# 09:25:08 >  "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-20368" "--port=37000"
+# 09:25:08 >  
 
 #start transaction;
 #CREATE SCHEMA "dw_hospital";
@@ -298,7 +296,7 @@ Ready.
 #where "facts_costi"."periodo_id" = "dim_periodi"."id"
 #and "facts_costi"."classe_movimento_id" = "classi"."id"
 #and "classi"."id" = "bri_classi_gruppi_movimenti"."classe_movimento_id"
-% .L72,.L74,   .L77 # table_name
+% .L37,.L40,   .L42 # table_name
 % c0,  c1, m0 # name
 % int, varchar,bigint # type
 % 4,   4,  1 # length
diff --git a/sql/test/BugTracker/Tests/groupby_with_alias.SF-1520575.stable.out 
b/sql/test/BugTracker/Tests/groupby_with_alias.SF-1520575.stable.out
--- a/sql/test/BugTracker/Tests/groupby_with_alias.SF-1520575.stable.out
+++ b/sql/test/BugTracker/Tests/groupby_with_alias.SF-1520575.stable.out
@@ -1,36 +1,37 @@
 stdout of test 'groupby_with_alias.SF-1520575` in directory 
'sql/test/BugTracker` itself:
 
 
-# 14:11:48 >  
-# 14:11:48 >  Mtimeout -timeout 180  mserver5 
"--config=/ufs/niels/scratch/monetdb/Linux-x86_64/etc/monetdb5.conf" --debug=10 
--set 
"monet_mod_path=/ufs/niels/scratch/monetdb/Linux-x86_64/lib

MonetDB: default - Approve output.

[Pedro Ferreira]

Changeset: cf69fc978781 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cf69fc978781
Modified Files:
sql/jdbc/tests/Tests/Bug_LargeQueries_6571_6693.stable.out
Branch: default
Log Message:

Approve output.


diffs (14 lines):

diff --git a/sql/jdbc/tests/Tests/Bug_LargeQueries_6571_6693.stable.out 
b/sql/jdbc/tests/Tests/Bug_LargeQueries_6571_6693.stable.out
--- a/sql/jdbc/tests/Tests/Bug_LargeQueries_6571_6693.stable.out
+++ b/sql/jdbc/tests/Tests/Bug_LargeQueries_6571_6693.stable.out
@@ -18,7 +18,9 @@ stdout of test 'Bug_LargeQueries_6571_66
 # MonetDB/GIS module loaded
 # MonetDB/SQL module loaded
 
-Ready.
+# 09:56:55 >  
+# 09:56:55 >  "./Bug_LargeQueries_6571_6693.SQL.sh" 
"Bug_LargeQueries_6571_6693"
+# 09:56:55 >  
 
 # 18:48:54 >  
 # 18:48:54 >  "./Bug_LargeQueries_6571_6693.SQL.sh" 
"Bug_LargeQueries_6571_6693"
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approve output

[Pedro Ferreira]

Changeset: 8bf6f20889e1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8bf6f20889e1
Modified Files:

sql/test/BugTracker-2018/Tests/sqlitelogictest-having-not-null-not-in.Bug-6557.stable.out
Branch: default
Log Message:

Approve output


diffs (40 lines):

diff --git 
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-having-not-null-not-in.Bug-6557.stable.out
 
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-having-not-null-not-in.Bug-6557.stable.out
--- 
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-having-not-null-not-in.Bug-6557.stable.out
+++ 
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-having-not-null-not-in.Bug-6557.stable.out
@@ -40,27 +40,23 @@ stdout of test 'sqlitelogictest-having-n
 [ 0,   79, 26  ]
 [ 81,  24, 43  ]
 #SELECT CAST(SUM(col0) AS BIGINT) FROM tab0 WHERE + + col0 BETWEEN NULL AND + 
col2;
-% sys.L4 # table_name
-% L4 # name
+% sys.L3 # table_name
+% L3 # name
 % bigint # type
 % 1 # length
 [ NULL ]
 #SELECT CAST(SUM(col0) AS BIGINT) FROM tab0 WHERE + + col0 NOT BETWEEN NULL 
AND + col2;
-% sys.L4 # table_name
-% L4 # name
+% sys.L3 # table_name
+% L3 # name
 % bigint # type
 % 1 # length
-[ NULL ]
-#debug SELECT CAST(SUM(col0) AS BIGINT) FROM tab0 WHERE + + col0 NOT BETWEEN 
NULL AND + col2;
-mdb>#X_2=0@0:void := querylog.define("debug select cast(sum(col0) as bigint) 
from tab0 where + + col0 not between null and + col2;", "default_pipe", 24:int);
-mdb>#barrier X_137=false := language.dataflow();
-mdb>#X_5=0 := sql.mvc();
-mdb>#X_92=nil:bat[:int] := sql.bind(X_5=0, "sys", "tab0", "col0", 0:int, 
0:int, 3:int);
-% sys.L4 # table_name
-% L4 # name
+[ 126  ]
+#finish
+% sys.L3 # table_name
+% L3 # name
 % bigint # type
 % 1 # length
-[ NULL ]
+[ 126  ]
 mdb>#EOD
 #DROP TABLE tab0;
 
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approve output

[Martin van Dinther]

Changeset: e81b2c371bae for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e81b2c371bae
Modified Files:
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
Branch: default
Log Message:

Approve output


diffs (40 lines):

diff --git a/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out 
b/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
--- a/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
+++ b/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
@@ -94,12 +94,12 @@ Operation successful
 | X_4 := sql.mvc();
 |
 | X_18:bat[:sht] := sql.bind(X_4, "sys", "_tables", "type", 0:int);
 |
 | C_5:bat[:oid] := sql.tid(X_4, "sys", "_tables"); 
 |
-| C_89 := algebra.thetaselect(X_18, C_5, 2:sht, "!="); 
 |
+| C_90 := algebra.thetaselect(X_18, C_5, 2:sht, "!="); 
 |
 | (C_21:bat[:oid], X_22:bat[:sht]) := sql.bind(X_4, "sys", "_tables", 
"type", 2:int);   |
-| C_90 := algebra.thetaselect(X_22, nil:bat[:oid], 2:sht, "!=");   
 |
+| C_91 := algebra.thetaselect(X_22, nil:bat[:oid], 2:sht, "!=");   
 |
 | X_20:bat[:sht] := sql.bind(X_4, "sys", "_tables", "type", 1:int);
 |
-| C_92 := algebra.thetaselect(X_20, C_5, 2:sht, "!="); 
 |
-| C_27 := sql.subdelta(C_89, C_5, C_21, C_90, C_92);   
 |
+| C_93 := algebra.thetaselect(X_20, C_5, 2:sht, "!="); 
 |
+| C_27 := sql.subdelta(C_90, C_5, C_21, C_91, C_93);   
 |
 | X_8:bat[:str] := sql.bind(X_4, "sys", "_tables", "name", 0:int); 
 |
 | (C_13:bat[:oid], X_14:bat[:str]) := sql.bind(X_4, "sys", "_tables", 
"name", 2:int);   |
 | X_11:bat[:str] := sql.bind(X_4, "sys", "_tables", "name", 1:int);
 |
diff --git a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out 
b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
--- a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
+++ b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
@@ -52,12 +52,12 @@ Operation successful
 | X_4 := sql.mvc();
 |
 | X_18:bat[:sht] := sql.bind(X_4, "sys", "_tables", "type", 0:int);
 |
 | C_5:bat[:oid] := sql.tid(X_4, "sys", "_tables"); 
 |
-| C_84 := algebra.thetaselect(X_18, C_5, 2:sht, "!="); 
 |
+| C_85 := algebra.thetaselect(X_18, C_5, 2:sht, "!="); 
 |
 | (C_21:bat[:oid], X_22:bat[:sht]) := sql.bind(X_4, "sys", "_tables", 
"type", 2:int);   |
-| C_85 := algebra.thetaselect(X_22, nil:bat[:oid], 2:sht, "!=");   
 |
+| C_86 := algebra.thetaselect(X_22, nil:bat[:oid], 2:sht, "!=");   
 |
 | X_20:bat[:sht] := sql.bind(X_4, "sys", "_tables", "type", 1:int);
 |
-| C_87 := algebra.thetaselect(X_20, C_5, 2:sht, "!="); 
 |
-| C_27 := sql.subdelta(C_84, C_5, C_21, C_85, C_87);   
 |
+| C_88 := algebra.thetaselect(X_20, C_5, 2:sht, "!="); 
 |
+| C_27 := sql.subdelta(C_85, C_5, C_21, C_86, C_88);   
 |
 | X_8:bat[:int] := sql.bind(X_4, "sys", "_tables", "id", 0:int);   
 |
 | (C_13:bat[:oid], X_14:bat[:int]) := sql.bind(X_4, "sys", "_tables", 
"id", 2:int); |
 | X_11:bat[:int] := sql.bind(X_4, "sys", "_tables", "id", 1:int);  
 |
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approve output

[Martin Kersten]

Changeset: 1f86f9524289 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1f86f9524289
Modified Files:
monetdb5/mal/Tests/tst019.stable.err
monetdb5/mal/Tests/tst036.stable.err
monetdb5/mal/Tests/tst054.stable.err
monetdb5/mal/Tests/tst058.stable.err
monetdb5/mal/Tests/tst070.stable.err
monetdb5/mal/Tests/tst804.stable.err
Branch: default
Log Message:

Approve output


diffs (67 lines):

diff --git a/monetdb5/mal/Tests/tst019.stable.err 
b/monetdb5/mal/Tests/tst019.stable.err
--- a/monetdb5/mal/Tests/tst019.stable.err
+++ b/monetdb5/mal/Tests/tst019.stable.err
@@ -79,7 +79,6 @@ ERROR = !TypeException:user.welcome[3]:t
 !TypeException:user.welcome0[3]:Multiple assignment mismatch
 !MALException:user.welcome3[2]:invalid return target!
 !TypeException:user.welcome4[2]:Multiple assignment mismatch
-!TypeException:user.main[5]:'user.welcome2' undefined in: (x:any, 
y:str) := user.welcome2(1:int);
 
 # 13:48:26 >  
 # 13:48:26 >  "Done."
diff --git a/monetdb5/mal/Tests/tst036.stable.err 
b/monetdb5/mal/Tests/tst036.stable.err
--- a/monetdb5/mal/Tests/tst036.stable.err
+++ b/monetdb5/mal/Tests/tst036.stable.err
@@ -83,8 +83,6 @@ QUERY = # test for proper use of list as
 (l2,l3):= 3;
 (l4,l5) := (4,5,6);
 ERROR = !TypeException:user.main[6]:Multiple assignment mismatch
-!TypeException:user.main[7]:Multiple assignment mismatch
-!TypeException:user.main[8]:Multiple assignment mismatch
 
 # 17:28:20 >  
 # 17:28:20 >  Done.
diff --git a/monetdb5/mal/Tests/tst054.stable.err 
b/monetdb5/mal/Tests/tst054.stable.err
--- a/monetdb5/mal/Tests/tst054.stable.err
+++ b/monetdb5/mal/Tests/tst054.stable.err
@@ -79,7 +79,6 @@ QUERY = function z()( :int,:int,:int,:in
 ERROR = !SyntaxException:parseError:return 
(1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,0);
 !SyntaxException:parseError:^ expected
 !MALException:user.z[2]:invalid return target!
-!TypeException:user.main[1]:'user.z' undefined in: user.z();
 
 # 11:11:08 >  
 # 11:11:08 >  Done.
diff --git a/monetdb5/mal/Tests/tst058.stable.err 
b/monetdb5/mal/Tests/tst058.stable.err
--- a/monetdb5/mal/Tests/tst058.stable.err
+++ b/monetdb5/mal/Tests/tst058.stable.err
@@ -83,7 +83,6 @@ ERROR = !SyntaxException:parseError:-- s
 !SyntaxException:parseError:  ^';' expected
 !SyntaxException:parseError:j:= 1 + + 1;
 !SyntaxException:parseError:^ expected
-!TypeException:user.main[3]:'calc.+' undefined in: j:any := 
calc.+(1:int);
 
 # 20:18:21 >  
 # 20:18:21 >  Done.
diff --git a/monetdb5/mal/Tests/tst070.stable.err 
b/monetdb5/mal/Tests/tst070.stable.err
--- a/monetdb5/mal/Tests/tst070.stable.err
+++ b/monetdb5/mal/Tests/tst070.stable.err
@@ -38,7 +38,6 @@ QUERY = # parsing operations with multi-
 (initial:str,surname:str):= user.getName();
 end foo;
 ERROR = !TypeException:user.foo[1]:'user.point' undefined in: (x:any, 
y:any) := user.point(1:int);
-!TypeException:user.foo[2]:'user.getName' undefined in: 
(initial:str, surname:str) := user.getName();
 
 
 # 13:02:34 >  
diff --git a/monetdb5/mal/Tests/tst804.stable.err 
b/monetdb5/mal/Tests/tst804.stable.err
--- a/monetdb5/mal/Tests/tst804.stable.err
+++ b/monetdb5/mal/Tests/tst804.stable.err
@@ -45,7 +45,6 @@ ERROR = !SyntaxException:parseError:func
 !SyntaxException:parseError:end message;
 !SyntaxException:parseError:   ^non matching end label
 !TypeException:user.foo[1]:'wrong.message' undefined in: 
wrong.message();
-!TypeException:user.foo[2]:'wrongTo.message' undefined in: 
wrongTo.message();
 
 # 15:26:53 >  
 # 15:26:53 >  "Done."
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approve output

[Martin Kersten]

Changeset: 89072f6557fa for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=89072f6557fa
Modified Files:
monetdb5/optimizer/Tests/GCexample01.stable.out
monetdb5/optimizer/Tests/dataflow.stable.out
sql/storage/bat/bat_storage.c
Branch: default
Log Message:

Approve output


diffs (199 lines):

diff --git a/monetdb5/optimizer/Tests/GCexample01.stable.out 
b/monetdb5/optimizer/Tests/GCexample01.stable.out
--- a/monetdb5/optimizer/Tests/GCexample01.stable.out
+++ b/monetdb5/optimizer/Tests/GCexample01.stable.out
@@ -29,44 +29,44 @@ Ready.
 # 06:41:05 >  "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-8837" "--port=33343"
 # 06:41:05 >  
 
-function user.qry():void;  #[0] (0)  0  type check needed 
-b:bat[:int] := bat.new(:int);  #[1] (0) CMDBATnew 1 <- 2  type 
check needed 
-c:bat[:int] := bat.new(:int);  #[2] (0) CMDBATnew 3 <- 2  type 
check needed 
-d:bat[:int] := bat.new(:int);  #[3] (0) CMDBATnew 4 <- 2  type 
check needed 
-bat.append(b:bat[:int], 1:int);#[4] (0) BKCappend_val_wrap 5 
<- 1 6  type check needed 
-barrier (x:oid, z:int) := iterator.new(b:bat[:int]);   #[5] (0) ITRbunIterator 
7 8 <- 1  type check needed 
-io.print(x:oid);   #[6] (0) IOprint_val 9 <- 7  
type check needed 
-exit (x:oid, z:int);   #[7] (0)  7 8  type check 
needed 
-barrier (x:oid, z:int) := iterator.new(c:bat[:int]);   #[8] (0) ITRbunIterator 
7 8 <- 3  type check needed 
-io.print(x:oid);   #[9] (0) IOprint_val 10 <- 7  
type check needed 
-redo (x:oid, z:int) := iterator.next(c:bat[:int]); #[10] (0) ITRbunNext 7 
8 <- 3  type check needed 
-exit (x:oid, z:int);   #[11] (0)  7 8  type check 
needed 
+function user.qry():void;  #[0] (0)  0 
+b:bat[:int] := bat.new(:int);  #[1] (0) CMDBATnew 1 <- 2 
+c:bat[:int] := bat.new(:int);  #[2] (0) CMDBATnew 3 <- 2 
+d:bat[:int] := bat.new(:int);  #[3] (0) CMDBATnew 4 <- 2 
+bat.append(b:bat[:int], 1:int);#[4] (0) BKCappend_val_wrap 5 
<- 1 6 
+barrier (x:oid, z:int) := iterator.new(b:bat[:int]);   #[5] (0) ITRbunIterator 
7 8 <- 1 
+io.print(x:oid);   #[6] (0) IOprint_val 9 <- 7 
+exit (x:oid, z:int);   #[7] (0)  7 8 
+barrier (x:oid, z:int) := iterator.new(c:bat[:int]);   #[8] (0) ITRbunIterator 
7 8 <- 3 
+io.print(x:oid);   #[9] (0) IOprint_val 10 <- 7 
+redo (x:oid, z:int) := iterator.next(c:bat[:int]); #[10] (0) ITRbunNext 7 
8 <- 3 
+exit (x:oid, z:int);   #[11] (0)  7 8 
 # do not close d, it may be reused 
-barrier go:bit := true:bit;#[13] (0)  12 <- 13  type check 
needed 
-io.print(d:bat[:int]); #[14] (0) IOprint_val 14 <- 4  
type check needed 
-redo go:bit := true:bit;   #[15] (0)  12 <- 13  type check 
needed 
-exit go:bit;   #[16] (0)  12  type check 
needed 
-end user.qry;  #[17] (0)   type check needed 
-#garbagecollector actions= 0 time=12 usec 
-function user.qry():void;  #[0] (0)  0  type check needed 
-b:bat[:int] := bat.new(:int);  #[1] (0) CMDBATnew 1 <- 2  type 
check needed 
-c:bat[:int] := bat.new(:int);  #[2] (0) CMDBATnew 3 <- 2  type 
check needed 
-d:bat[:int] := bat.new(:int);  #[3] (0) CMDBATnew 4 <- 2  type 
check needed 
-bat.append(b:bat[:int], 1:int);#[4] (0) BKCappend_val_wrap 5 
<- 1 6  type check needed 
-barrier (x:oid, z:int) := iterator.new(b:bat[:int]);   #[5] (0) ITRbunIterator 
7 8 <- 1  type check needed 
-io.print(x:oid);   #[6] (0) IOprint_val 9 <- 7  
type check needed 
-exit (x:oid, z:int);   #[7] (0)  7 8  type check 
needed 
-barrier (x:oid, z:int) := iterator.new(c:bat[:int]);   #[8] (0) ITRbunIterator 
7 8 <- 3  type check needed 
-io.print(x:oid);   #[9] (0) IOprint_val 10 <- 7  
type check needed 
-redo (x:oid, z:int) := iterator.next(c:bat[:int]); #[10] (0) ITRbunNext 7 
8 <- 3  type check needed 
-exit (x:oid, z:int);   #[11] (0)  7 8  type check 
needed 
+barrier go:bit := true:bit;#[13] (0)  12 <- 13 
+io.print(d:bat[:int]); #[14] (0) IOprint_val 14 <- 4 
+redo go:bit := true:bit;   #[15] (0)  12 <- 13 
+exit go:bit;   #[16] (0)  12 
+end user.qry;  #[17] (0)  
+#garbagecollector actions= 0 time=18 usec 
+function user.qry():void;  #[0] (0)  0 
+b:bat[:int] := bat.new(:int);  #[1] (0) CMDBATnew 1 <-

MonetDB: default - Approve output

[Martin van Dinther]

Changeset: 526859e31e24 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=526859e31e24
Modified Files:

sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.FreeBSD

sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.Windows
Branch: default
Log Message:

Approve output


diffs (24 lines):

diff --git 
a/sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.FreeBSD 
b/sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.FreeBSD
--- 
a/sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.FreeBSD
+++ 
b/sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.FreeBSD
@@ -37,7 +37,7 @@ Ready.
 [ 1,   "one"   ]
 [ 2,   "two"   ]
 #DELETE FROM sys.statistics;
-[ 185  ]
+[ 199  ]
 #SELECT /* column_id, */ type, width, /* stamp, */ "sample", "count", 
"unique", nils, minval, maxval, sorted, revsorted FROM sys.statistics;
 % sys.statistics,  sys.statistics, sys.statistics, sys.statistics, 
sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, 
sys.statistics # table_name
 % type,width,  sample, count,  unique, nils,   minval, maxval, sorted, 
revsorted # name
diff --git 
a/sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.Windows 
b/sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.Windows
--- 
a/sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.Windows
+++ 
b/sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.Windows
@@ -37,7 +37,7 @@ Ready.
 [ 1,   "one"   ]
 [ 2,   "two"   ]
 #DELETE FROM sys.statistics;
-[ 185  ]
+[ 199  ]
 #SELECT /* column_id, */ type, width, /* stamp, */ "sample", "count", 
"unique", nils, minval, maxval, sorted, revsorted FROM sys.statistics;
 % sys.statistics,  sys.statistics, sys.statistics, sys.statistics, 
sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, 
sys.statistics # table_name
 % type,width,  sample, count,  unique, nils,   minval, maxval, sorted, 
revsorted # name
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - approve output

[Niels Nes]

Changeset: 13a8d7ac30bf for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=13a8d7ac30bf
Modified Files:

sql/test/BugTracker-2018/Tests/sqlitelogictest-aritmetic-expressions-handling.Bug-6576.stable.out
Branch: default
Log Message:

approve output


diffs (53 lines):

diff --git 
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-aritmetic-expressions-handling.Bug-6576.stable.out
 
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-aritmetic-expressions-handling.Bug-6576.stable.out
--- 
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-aritmetic-expressions-handling.Bug-6576.stable.out
+++ 
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-aritmetic-expressions-handling.Bug-6576.stable.out
@@ -75,7 +75,7 @@ Ready.
 #SELECT ALL + - 32 * - 32 + - - 76 - - - 43 * COUNT ( * ) + - + 84 * 0 * + + 
39 + + 44 * + 76; -- 4401
 % .L4 # table_name
 % L4 # name
-% bigint # type
+% hugeint # type
 % 4 # length
 [ 4401 ]
 #SELECT 38 + - 63 * 0 * - 13 AS col2; -- 38
@@ -112,13 +112,13 @@ Ready.
 #SELECT - 13 * - ( + 0 ) + 39 * - COUNT ( * ) * - COUNT ( * ) col1; -- 39
 % .L5 # table_name
 % col1 # name
-% bigint # type
+% hugeint # type
 % 2 # length
 [ 39   ]
 #SELECT COUNT ( - + 70 ) - - 99 * - 0 AS col2; -- 1
 % .L4 # table_name
 % col2 # name
-% bigint # type
+% hugeint # type
 % 1 # length
 [ 1]
 #SELECT - ( - - 15 ) + - 53 * - 0; -- -15
@@ -130,7 +130,7 @@ Ready.
 #SELECT - + 22 * + COUNT ( * ) + - - 58 - + 83 * + MAX ( - 94 * 0 ); -- 36
 % .L5 # table_name
 % L5 # name
-% bigint # type
+% hugeint # type
 % 2 # length
 [ 36   ]
 #SELECT DISTINCT - 16 + ( + 37 ) - - 56 * - - 11 * - 0 + + MAX ( + 29 ) AS 
col2; -- 50
@@ -148,13 +148,13 @@ Ready.
 #SELECT ALL - 30 + + 85, - ( - + 43 ) - 71 + - 0 * - - 78 + - 78 + - - 47 * - 
93 + 32 * + SUM ( 90 ) AS col0; -- 55, -1597
 % .L2, .L6 # table_name
 % L2,  col0 # name
-% smallint,bigint # type
+% smallint,hugeint # type
 % 2,   5 # length
 [ 55,  -1597   ]
 #SELECT ALL + COUNT ( * ) - - + 0 * - 32; -- 1
 % .L4 # table_name
 % L4 # name
-% bigint # type
+% hugeint # type
 % 1 # length
 [ 1]
 
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approve output.

[Sjoerd Mullender]

Changeset: e72729b7b8dd for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e72729b7b8dd
Modified Files:
sql/test/Tests/systemfunctions.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out.powerpc64.int128
Branch: default
Log Message:

Approve output.


diffs (truncated from 46346 to 300 lines):

diff --git a/sql/test/Tests/systemfunctions.stable.out 
b/sql/test/Tests/systemfunctions.stable.out
--- a/sql/test/Tests/systemfunctions.stable.out
+++ b/sql/test/Tests/systemfunctions.stable.out
@@ -249,17 +249,7 @@ Ready.
 [ "sys",   "avg",  0,  "double",   "avg"   ]
 [ "sys",   "avg",  1,  "bigint",   ""  ]
 [ "sys",   "avg",  0,  "double",   "avg"   ]
-[ "sys",   "avg",  1,  "decimal",  ""  ]
-[ "sys",   "avg",  0,  "double",   "avg"   ]
-[ "sys",   "avg",  1,  "decimal",  ""  ]
-[ "sys",   "avg",  0,  "double",   "avg"   ]
-[ "sys",   "avg",  1,  "decimal",  ""  ]
-[ "sys",   "avg",  0,  "double",   "avg"   ]
-[ "sys",   "avg",  1,  "decimal",  ""  ]
-[ "sys",   "avg",  0,  "double",   "avg"   ]
 [ "sys",   "avg",  1,  "real", ""  ]
-[ "sys",   "avg",  0,  "double",   "avg"   ]
-[ "sys",   "avg",  1,  "double",   ""  ]
 [ "sys",   "bbp",  0,  "int",  "create function sys.bbp ()\n returns 
table (id int, name string,\n ttype string, count bigint, refcnt int, lrefcnt 
int,\n location string, heat int, dirty string,\n status string, kind string)\n 
external name bbp.get;" ]
 [ "sys",   "bbp",  1,  "clob", ""  ]
 [ "sys",   "bbp",  2,  "clob", ""  ]
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -828,5009 +828,4994 @@ insert into sys.args values (19200, 233,
 insert into sys.args values (19201, 233, 'arg_1', 'sec_interval', 13, 0, 1, 1);
 insert into sys.functions values (234, 'avg', 'avg', 'sql', 0, 6, false, 
false, false, 2000, true);
 insert into sys.args values (19202, 234, 'res_0', 'double', 53, 0, 0, 0);
-insert into sys.args values (19203, 234, 'arg_1', 'tinyint', 8, 0, 1, 1);
+insert into sys.args values (19203, 234, 'arg_1', 'double', 53, 0, 1, 1);
 insert into sys.functions values (235, 'avg', 'avg', 'sql', 0, 6, false, 
false, false, 2000, true);
 insert into sys.args values (19204, 235, 'res_0', 'double', 53, 0, 0, 0);
-insert into sys.args values (19205, 235, 'arg_1', 'smallint', 16, 0, 1, 1);
+insert into sys.args values (19205, 235, 'arg_1', 'tinyint', 8, 0, 1, 1);
 insert into sys.functions values (236, 'avg', 'avg', 'sql', 0, 6, false, 
false, false, 2000, true);
 insert into sys.args values (19206, 236, 'res_0', 'double', 53, 0, 0, 0);
-insert into sys.args values (19207, 236, 'arg_1', 'int', 32, 0, 1, 1);
+insert into sys.args values (19207, 236, 'arg_1', 'smallint', 16, 0, 1, 1);
 insert into sys.functions values (237, 'avg', 'avg', 'sql', 0, 6, false, 
false, false, 2000, true);
 insert into sys.args values (19208, 237, 'res_0', 'double', 53, 0, 0, 0);
-insert into sys.args values (19209, 237, 'arg_1', 'bigint', 64, 0, 1, 1);
+insert into sys.args values (19209, 237, 'arg_1', 'int', 32, 0, 1, 1);
 insert into sys.functions values (238, 'avg', 'avg', 'sql', 0, 6, false, 
false, false, 2000, true);
 insert into sys.args values (19210, 238, 'res_0', 'double', 53, 0, 0, 0);
-insert into sys.args values (19211, 238, 'arg_1', 'hugeint', 128, 0, 1, 1);
+insert into sys.args values (19211, 238, 'arg_1', 'bigint', 64, 0, 1, 1);
 insert into sys.functions values (239, 'avg', 'avg', 'sql', 0, 6, false, 
false, false, 2000, true);
 insert into sys.args values (19212, 239, 'res_0', 'double', 53, 0, 0, 0);
-insert into sys.args values (19213, 239, 'arg_1', 'decimal', 2, 0, 1, 1);
+insert into sys.args values (19213, 239, 'arg_1', 'hugeint', 128, 0, 1, 1);
 insert into sys.functions values (240, 'avg', 'avg', 'sql', 0, 6, false, 
false, false, 2000, true);
 insert into sys.args values (19214, 240, 'res_0', 'double', 53, 0, 0, 0);
-insert into sys.args values (19215, 240, 'arg_1', 'decimal', 4, 0, 1, 1);
-insert into sys.functions values (241, 'avg', 'avg', 'sql', 0, 6, false, 
false, false, 2000, true);
-insert into sys.args values (19216, 241, 'res_0', 'double', 53, 0, 0, 0);
-insert into sys.args values (19217, 241, 'arg_1', 'decimal', 9, 0, 1, 1);
-insert into sys.functions values (242, 'avg', 'avg', 'sql', 0, 6, false, 
false, false, 2000, t

MonetDB: default - Approve output.

[Pedro Ferreira]

Changeset: 0e0dff03be95 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0e0dff03be95
Modified Files:
sql/test/BugTracker-2017/Tests/create_view_order_by.Bug-3465.stable.out
Branch: default
Log Message:

Approve output.


diffs (32 lines):

diff --git 
a/sql/test/BugTracker-2017/Tests/create_view_order_by.Bug-3465.stable.out 
b/sql/test/BugTracker-2017/Tests/create_view_order_by.Bug-3465.stable.out
--- a/sql/test/BugTracker-2017/Tests/create_view_order_by.Bug-3465.stable.out
+++ b/sql/test/BugTracker-2017/Tests/create_view_order_by.Bug-3465.stable.out
@@ -263,7 +263,7 @@ Ready.
 #select * from system_tables
 #ORDER BY system, query, name DESC
 #LIMIT 10;
-% .L57,.L57,   .L57,   .L57,   .L57,   .L57,   .L57,   .L57 # 
table_name
+% .L61,.L61,   .L61,   .L61,   .L61,   .L61,   .L61,   .L61 # 
table_name
 % name,schema_id,  query,  type,   system, commit_action,  access, 
temporary # name
 % varchar, int,varchar,smallint,   boolean,
smallint,   smallint,   tinyint # type
 % 13,  4,  177,2,  5,  1,  1,  1 # length
@@ -281,7 +281,7 @@ Ready.
 #INTERSECT
 #(select * from system_tables UNION select * from system_views)
 #ORDER BY name DESC;
-% .L57,.L57,   .L57,   .L57,   .L57,   .L57,   .L57,   .L57 # 
table_name
+% .L61,.L61,   .L61,   .L61,   .L61,   .L61,   .L61,   .L61 # 
table_name
 % name,schema_id,  query,  type,   system, commit_action,  access, 
temporary # name
 % varchar, int,varchar,smallint,   boolean,
smallint,   smallint,   tinyint # type
 % 0,   1,  0,  1,  5,  1,  1,  1 # length
@@ -292,9 +292,7 @@ Ready.
 % .L53,.L53,   .L53,   .L53,   .L53,   .L53,   .L53,   .L53 # 
table_name
 % name,schema_id,  query,  type,   system, commit_action,  access, 
temporary # name
 % varchar, int,varchar,smallint,   boolean,
smallint,   smallint,   tinyint # type
-% 9,   4,  0,  1,  5,  1,  1,  1 # length
-[ "test10",2000,   NULL,   0,  false,  0,  0,  0   ]
-[ "my_tables", 2000,   NULL,   0,  false,  0,  0,  0   ]
+% 0,   1,  0,  1,  5,  1,  1,  1 # length
 #DROP VIEW all_tbl_objs;
 #DROP VIEW all_tables;
 #DROP VIEW all_views;
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approve output

[Pedro Ferreira]

Changeset: 438489fc0ec4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=438489fc0ec4
Modified Files:
sql/test/analytics/Tests/analytics09.sql
sql/test/analytics/Tests/analytics09.stable.err
sql/test/analytics/Tests/analytics09.stable.out
Branch: default
Log Message:

Approve output


diffs (144 lines):

diff --git a/sql/test/analytics/Tests/analytics09.sql 
b/sql/test/analytics/Tests/analytics09.sql
--- a/sql/test/analytics/Tests/analytics09.sql
+++ b/sql/test/analytics/Tests/analytics09.sql
@@ -43,7 +43,7 @@ select cast(sum(aa) * count(aa) / avg(aa
 select avg(sum(aa)) over (),
avg(sum(aa)) over (rows unbounded preceding),
cast(sum(aa) * count(aa) / avg(aa) over (rows between current row and 
unbounded following) as bigint),
-   avg(sum(aa)) over (range unbounded preceding) from analytics group by 
aa; --TODO support multiple aggregations within the same projection
+   avg(sum(aa)) over (range unbounded preceding) from analytics group by 
aa;
 
 select cast(sum(aa) * count(aa) over () as bigint),
cast(sum(aa) over () as bigint) from analytics group by aa;
@@ -52,15 +52,15 @@ select cast(sum(sum(aa)) over () as bigi
cast(sum(aa) * count(count(aa)) over () as bigint) from analytics group 
by aa;
 
 select count(aa) over (),
-   avg(aa) over () * count(aa) from analytics group by aa; --TODO
+   avg(aa) over () * count(aa) from analytics group by aa;
 
 select cast(sum(aa) over () as bigint),
cast(sum(aa) over () as bigint),
-   cast(sum(aa) * count(aa) over () as bigint) from analytics group by aa; 
--TODO
+   cast(sum(aa) * count(aa) over () as bigint) from analytics group by aa;
 
 select 21 - avg(sum(aa)) over (),
avg(45 * count(aa) + sum(aa)) over (),
-   cast(sum(aa) * count(aa) over () as bigint) from analytics group by aa; 
--TODO
+   cast(sum(aa) * count(aa) over () as bigint) from analytics group by aa;
 
 select avg(sum(aa)) over (partition by bb) from analytics group by bb;
 
diff --git a/sql/test/analytics/Tests/analytics09.stable.err 
b/sql/test/analytics/Tests/analytics09.stable.err
--- a/sql/test/analytics/Tests/analytics09.stable.err
+++ b/sql/test/analytics/Tests/analytics09.stable.err
@@ -28,31 +28,7 @@ stderr of test 'analytics09` in director
 # 13:13:17 >  "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-1389" "--port=37694"
 # 13:13:17 >  
 
-MAPI  = (monetdb) /var/tmp/mtest-7775/.s.monetdb.35563
-QUERY = select avg(sum(aa)) over (),
-   avg(sum(aa)) over (rows unbounded preceding),
-   cast(sum(aa) * count(aa) / avg(aa) over (rows between current 
row and unbounded following) as bigint),
-   avg(sum(aa)) over (range unbounded preceding) from analytics 
group by aa; --TODO support multiple aggregations within the same projection
-ERROR = !Cannot use non GROUP BY column 'L3' in query results without an 
aggregate function
-CODE  = 42000
-MAPI  = (monetdb) /var/tmp/mtest-2883/.s.monetdb.36767
-QUERY = select count(aa) over (),
-   avg(aa) over () * count(aa) from analytics group by aa; --TODO
-ERROR = !Cannot use non GROUP BY column 'L2' in query results without an 
aggregate function
-CODE  = 42000
-MAPI  = (monetdb) /var/tmp/mtest-2883/.s.monetdb.36767
-QUERY = select cast(sum(aa) over () as bigint),
-   cast(sum(aa) over () as bigint),
-   cast(sum(aa) * count(aa) over () as bigint) from analytics 
group by aa; --TODO
-ERROR = !Cannot use non GROUP BY column in query results without an aggregate 
function
-CODE  = 42000
-MAPI  = (monetdb) /var/tmp/mtest-2883/.s.monetdb.36767
-QUERY = select 21 - avg(sum(aa)) over (),
-   avg(45 * count(aa) + sum(aa)) over (),
-   cast(sum(aa) * count(aa) over () as bigint) from analytics 
group by aa; --TODO
-ERROR = !Cannot use non GROUP BY column in query results without an aggregate 
function
-CODE  = 42000
-MAPI  = (monetdb) /var/tmp/mtest-4999/.s.monetdb.31453
+MAPI  = (monetdb) /var/tmp/mtest-17924/.s.monetdb.36475
 QUERY = select cast(sum(aa) * 100 / sum(sum(aa)) over (partition by bb) as 
bigint) from analytics; --error, nesting aggregation functions
 ERROR = !SELECT: identifier 'bb' unknown
 CODE  = 42000
diff --git a/sql/test/analytics/Tests/analytics09.stable.out 
b/sql/test/analytics/Tests/analytics09.stable.out
--- a/sql/test/analytics/Tests/analytics09.stable.out
+++ b/sql/test/analytics/Tests/analytics09.stable.out
@@ -179,6 +179,22 @@ Ready.
 [ 1]
 [ 1]
 [ 1]
+#select avg(sum(aa)) over (),
+#   avg(sum(aa)) over (rows unbounded preceding),
+#   cast(sum(aa) * count(aa) / avg(aa) over (rows between current row and 
unbounded following) as bigint),
+#   avg(sum(aa)) over (range unbounded preceding) from analytics group by 
aa;
+% sys.L3,  sys.L7, sys.L16,sys.L21 # table_name
+% L3,  L7, L16,L21 # name
+% double,  double, bigint, double # type

MonetDB: default - Approve output

[Martin Kersten]

Changeset: 4bd393d1b4e8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4bd393d1b4e8
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
Branch: default
Log Message:

Approve output


diffs (45 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
@@ -11138,7 +11138,7 @@ stdout of test 'MAL-signatures` in direc
 [ "iterator",  "next", "command iterator.next(step:sht, last:sht):sht ",   
"ITRnext_sht;", ""  ]
 [ "json",  "#fromstr", "command json.#fromstr():void ",
"JSONfromString;",  "Validate a string to be JSON compliant. A NOOP if 
valid json, NULL otherwise." ]
 [ "json",  "#tostr",   "command json.#tostr():void ",  
"JSONtoString;","Convert JSON to its string equivalent. Dealing with 
escape characters" ]
-[ "json",  "dump", "command json.dump(j:json):void ",  "JSONdump;",
""  ]
+[ "json",  "dump", "pattern json.dump(j:json):void ",  "JSONdump;",
""  ]
 [ "json",  "filter",   "command json.filter(name:json, 
pathexpr:str):json ",   "JSONfilter;",  "Filter all members of an object by a 
path expression, returning an array.\nNon-matching elements are skipped." ]
 [ "json",  "filter",   "command json.filter(name:json, idx:bte, 
other:str):json ", "JSONfilterArrayDefault_bte;",  ""  ]
 [ "json",  "filter",   "command json.filter(name:json, idx:int, 
other:str):json ", "JSONfilterArrayDefault_int;",  ""  ]
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
@@ -15539,7 +15539,7 @@ stdout of test 'MAL-signatures` in direc
 [ "iterator",  "next", "command iterator.next(step:sht, last:sht):sht ",   
"ITRnext_sht;", ""  ]
 [ "json",  "#fromstr", "command json.#fromstr():void ",
"JSONfromString;",  "Validate a string to be JSON compliant. A NOOP if 
valid json, NULL otherwise." ]
 [ "json",  "#tostr",   "command json.#tostr():void ",  
"JSONtoString;","Convert JSON to its string equivalent. Dealing with 
escape characters" ]
-[ "json",  "dump", "command json.dump(j:json):void ",  "JSONdump;",
""  ]
+[ "json",  "dump", "pattern json.dump(j:json):void ",  "JSONdump;",
""  ]
 [ "json",  "filter",   "command json.filter(name:json, 
pathexpr:str):json ",   "JSONfilter;",  "Filter all members of an object by a 
path expression, returning an array.\nNon-matching elements are skipped." ]
 [ "json",  "filter",   "command json.filter(name:json, idx:bte, 
other:str):json ", "JSONfilterArrayDefault_bte;",  ""  ]
 [ "json",  "filter",   "command json.filter(name:json, idx:int, 
other:str):json ", "JSONfilterArrayDefault_int;",  ""  ]
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
@@ -161,7 +161,7 @@ bool BATordered(BAT *b);
 bool BATordered_rev(BAT *b);
 gdk_return BATorderidx(BAT *b, bool stable);
 gdk_return BATouterjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT 
*sr, bool nil_matches, BUN estimate) __attribute__((__warn_unused_result__));
-gdk_return BATprint(BAT *b);
+gdk_return BATprint(stream *s, BAT *b);
 gdk_return BATprintcolumns(stream *s, int argc, BAT *argv[]);
 gdk_return BATprod(void *res, int tp, BAT *b, BAT *s, bool skip_nils, bool 
abort_on_error, bool nil_if_empty);
 BAT *BATproject(BAT *l, BAT *r);
@@ -1300,7 +1300,7 @@ str ITRnext_int(int *i, int *step, int *
 str ITRnext_lng(lng *i, lng *step, lng *last);
 str ITRnext_oid(oid *i, oid *step, oid *last);
 str ITRnext_sht(sht *i, sht *step, sht *last);
-str JSONdump(void *ret, json *val);
+str JSONdump(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
 str JSONfilter(json *ret, json *js, str *expr);
 str JSONfilterArrayDefault_bte(json *ret, json *j, bte *index, str *other);
 str JSONfilterArrayDefault_hge(json *ret, json *j, hge *index, str *other);
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approve output

[Martin Kersten]

Changeset: b7748b51b521 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b7748b51b521
Modified Files:
sql/test/sys-schema/Tests/systemfunctions.stable.out
sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
Branch: default
Log Message:

Approve output


diffs (22 lines):

diff --git a/sql/test/sys-schema/Tests/systemfunctions.stable.out 
b/sql/test/sys-schema/Tests/systemfunctions.stable.out
--- a/sql/test/sys-schema/Tests/systemfunctions.stable.out
+++ b/sql/test/sys-schema/Tests/systemfunctions.stable.out
@@ -737,7 +737,6 @@ stdout of test 'systemfunctions` in dire
 [ "sys",   "host", 1,  "inet", ""  ]
 [ "sys",   "hostmask", 0,  "inet", "create function \"hostmask\" 
(p inet) returns inet\n external name inet.\"hostmask\";" ]
 [ "sys",   "hostmask", 1,  "inet", ""  ]
-[ "sys",   "hot_snapshot", 0,  "clob", "create procedure 
hot_snapshot(tarfile string)\n external name sql.hot_snapshot;"   ]
 [ "sys",   "hour", 0,  "int",  "hours" ]
 [ "sys",   "hour", 1,  "time", ""  ]
 [ "sys",   "hour", 0,  "int",  "hours" ]
diff --git a/sql/test/sys-schema/Tests/systemfunctions.stable.out.int128 
b/sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
--- a/sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
+++ b/sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
@@ -783,7 +783,6 @@ stdout of test 'systemfunctions` in dire
 [ "sys",   "host", 1,  "inet", ""  ]
 [ "sys",   "hostmask", 0,  "inet", "create function \"hostmask\" 
(p inet) returns inet\n external name inet.\"hostmask\";" ]
 [ "sys",   "hostmask", 1,  "inet", ""  ]
-[ "sys",   "hot_snapshot", 0,  "clob", "create procedure 
hot_snapshot(tarfile string)\n external name sql.hot_snapshot;"   ]
 [ "sys",   "hour", 0,  "int",  "hours" ]
 [ "sys",   "hour", 1,  "time", ""  ]
 [ "sys",   "hour", 0,  "int",  "hours" ]
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approve output

[Panagiotis Koutsourakis]

Changeset: 4e89e4e893b8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4e89e4e893b8
Modified Files:
sql/test/scanner/Tests/raw_strings.stable.err
sql/test/scanner/Tests/raw_strings.stable.out
Branch: default
Log Message:

Approve output


diffs (123 lines):

diff --git a/sql/test/scanner/Tests/raw_strings.stable.err 
b/sql/test/scanner/Tests/raw_strings.stable.err
--- a/sql/test/scanner/Tests/raw_strings.stable.err
+++ b/sql/test/scanner/Tests/raw_strings.stable.err
@@ -0,0 +1,30 @@
+stderr of test 'raw_strings` in directory 'sql/test/scanner` itself:
+
+
+# 13:58:26 >  
+# 13:58:26 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=37621" "--set" 
"mapi_usock=/var/tmp/mtest-27871/.s.monetdb.37621" "--forcemito" 
"--dbpath=/home/kutsurak/work/src/monet/worktrees/master/build/install/var/MonetDB/mTests_sql_test_scanner"
 "--set" "embedded_c=true"
+# 13:58:26 >  
+
+# builtin opt  gdk_dbpath = 
/home/kutsurak/work/src/monet/worktrees/master/build/install/var/monetdb5/dbfarm/demo
+# builtin opt  mapi_port = 5
+# builtin opt  mapi_open = false
+# builtin opt  mapi_ipv6 = false
+# builtin opt  mapi_autosense = false
+# builtin opt  sql_optimizer = default_pipe
+# builtin opt  sql_debug = 0
+# cmdline opt  gdk_nr_threads = 0
+# cmdline opt  mapi_open = true
+# cmdline opt  mapi_port = 37621
+# cmdline opt  mapi_usock = /var/tmp/mtest-27871/.s.monetdb.37621
+# cmdline opt  gdk_dbpath = 
/home/kutsurak/work/src/monet/worktrees/master/build/install/var/MonetDB/mTests_sql_test_scanner
+# cmdline opt  embedded_c = true
+
+# 13:58:26 >  
+# 13:58:26 >  "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-27871" "--port=37621"
+# 13:58:26 >  
+
+
+# 13:58:26 >  
+# 13:58:26 >  "Done."
+# 13:58:26 >  
+
diff --git a/sql/test/scanner/Tests/raw_strings.stable.out 
b/sql/test/scanner/Tests/raw_strings.stable.out
--- a/sql/test/scanner/Tests/raw_strings.stable.out
+++ b/sql/test/scanner/Tests/raw_strings.stable.out
@@ -0,0 +1,85 @@
+stdout of test 'raw_strings` in directory 'sql/test/scanner` itself:
+
+
+# 13:58:26 >  
+# 13:58:26 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=37621" "--set" 
"mapi_usock=/var/tmp/mtest-27871/.s.monetdb.37621" "--forcemito" 
"--dbpath=/home/kutsurak/work/src/monet/worktrees/master/build/install/var/MonetDB/mTests_sql_test_scanner"
 "--set" "embedded_c=true"
+# 13:58:26 >  
+
+# MonetDB 5 server v11.36.0 (hg id: b0c3d06a15 (git))
+# This is an unreleased version
+# Serving database 'mTests_sql_test_scanner', using 4 threads
+# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers
+# Found 15.488 GiB available main-memory of which we use 12.622 GiB
+# Copyright (c) 1993 - July 2008 CWI.
+# Copyright (c) August 2008 - 2019 MonetDB B.V., all rights reserved
+# Visit https://www.monetdb.org/ for further information
+# Listening for connection requests on 
mapi:monetdb://zarquon.zarniwoop.org:37621/
+# Listening for UNIX domain connection requests on 
mapi:monetdb:///var/tmp/mtest-27871/.s.monetdb.37621
+# SQL catalog created, loading sql scripts once
+# loading sql script: 09_like.sql
+# loading sql script: 10_math.sql
+# loading sql script: 12_url.sql
+# loading sql script: 13_date.sql
+# loading sql script: 14_inet.sql
+# loading sql script: 15_querylog.sql
+# loading sql script: 16_tracelog.sql
+# loading sql script: 17_temporal.sql
+# loading sql script: 18_index.sql
+# loading sql script: 20_vacuum.sql
+# loading sql script: 21_dependency_views.sql
+# loading sql script: 22_clients.sql
+# loading sql script: 23_skyserver.sql
+# loading sql script: 25_debug.sql
+# loading sql script: 26_sysmon.sql
+# loading sql script: 27_rejects.sql
+# loading sql script: 39_analytics.sql
+# loading sql script: 39_analytics_hge.sql
+# loading sql script: 40_json.sql
+# loading sql script: 40_json_hge.sql
+# loading sql script: 41_md5sum.sql
+# loading sql script: 45_uuid.sql
+# loading sql script: 46_profiler.sql
+# loading sql script: 51_sys_schema_extension.sql
+# loading sql script: 58_hot_snapshot.sql
+# loading sql script: 60_wlcr.sql
+# loading sql script: 61_wlcr.sql
+# loading sql script: 72_fits.sql
+# loading sql script: 74_netcdf.sql
+# loading sql script: 75_lidar.sql
+# loading sql script: 75_storagemodel.sql
+# loading sql script: 80_statistics.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 80_udf_hge.sql
+# loading sql script: 85_bam.sql
+# loading sql script: 90_generator.sql
+# loading sql script: 90_generator_hge.sql
+# loading sql script: 99_system.sql
+# MonetDB/SQL module loaded
+
+# 13:58:26 >  
+# 13:58:26 >  "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-27871" "--port=37621"
+# 13:58:26 >  
+
+#SELECT r'\"';
+% . # table_name
+% single_value # name
+% char # type
+% 2 # length
+[ "\\\""   ]
+#SELECT r;
+% . # table_name
+% single_value # name
+% char # t

MonetDB: default - approve output

[Niels Nes]

Changeset: 63956e923864 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=63956e923864
Modified Files:
monetdb5/mal/Tests/tst161.stable.err
Branch: default
Log Message:

approve output


diffs (11 lines):

diff --git a/monetdb5/mal/Tests/tst161.stable.err 
b/monetdb5/mal/Tests/tst161.stable.err
--- a/monetdb5/mal/Tests/tst161.stable.err
+++ b/monetdb5/mal/Tests/tst161.stable.err
@@ -42,7 +42,6 @@ QUERY = # testing definition of new atom
 z:= mytype.l();
 io.print(z);
 ERROR = !TypeException:mytype.l[0]:constant coercion error from int to mytype
-!TypeException:mytype.l[0]:improper variable id
 
 # 13:20:34 >  
 # 13:20:34 >  "Done."
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approve output

[Martin Kersten]

Changeset: e54b1faa2fa0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e54b1faa2fa0
Modified Files:
sql/benchmarks/ssbm/Tests/01-explain.stable.out
sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/02-explain.stable.out
sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/03-explain.stable.out
sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/04-explain.stable.out
sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/05-explain.stable.out
sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/06-explain.stable.out
sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/07-explain.stable.out
sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/08-explain.stable.out
sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/09-explain.stable.out
sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/10-explain.stable.out
sql/benchmarks/ssbm/Tests/10-explain.stable.out.int128
sql/benchmarks/tpch/Tests/01-explain.stable.out
sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
sql/benchmarks/tpch/Tests/02-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out.int128
sql/benchmarks/tpch/Tests/05-explain.stable.out
sql/benchmarks/tpch/Tests/05-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/05-explain.stable.out.int128
sql/benchmarks/tpch/Tests/06-explain.stable.out
sql/benchmarks/tpch/Tests/06-explain.stable.out.int128
sql/benchmarks/tpch/Tests/08-explain.stable.out.int128
sql/benchmarks/tpch/Tests/09-explain.stable.out
sql/benchmarks/tpch/Tests/09-explain.stable.out.int128
sql/benchmarks/tpch/Tests/10-explain.stable.out
sql/benchmarks/tpch/Tests/10-explain.stable.out.int128
sql/benchmarks/tpch/Tests/12-explain.stable.out
sql/benchmarks/tpch/Tests/12-explain.stable.out.int128
sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
sql/benchmarks/tpch/Tests/17-explain.stable.out
sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
Branch: default
Log Message:

Approve output


diffs (truncated from 1842 to 300 lines):

diff --git a/sql/benchmarks/ssbm/Tests/01-explain.stable.out 
b/sql/benchmarks/ssbm/Tests/01-explain.stable.out
--- a/sql/benchmarks/ssbm/Tests/01-explain.stable.out
+++ b/sql/benchmarks/ssbm/Tests/01-explain.stable.out
@@ -43,30 +43,30 @@ function user.s2_1(A0:int,A1:int,A2:int,
 X_9:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_quantity",0);
 X_17:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_discount",0);
 C_6:bat[:oid] := sql.tid(X_5,"sys","lineorder");
-C_72 := algebra.subselect(X_17,C_6,A1,A2,true,true,false);
+C_79 := algebra.subselect(X_17,C_6,A1,A2,true,true,false);
 (C_19,r1_22) := sql.bind(X_5,"sys","lineorder","lo_discount",2);
-C_73 := algebra.subselect(r1_22,nil:bat[:oid],A1,A2,true,true,false);
+C_80 := algebra.subselect(r1_22,nil:bat[:oid],A1,A2,true,true,false);
 X_21:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_discount",1);
-C_75 := algebra.subselect(X_21,C_6,A1,A2,true,true,false);
-C_22 := sql.subdelta(C_72,C_6,C_19,C_73,C_75);
-C_76 := algebra.thetasubselect(X_9,C_22,A3,"<");
+C_82 := algebra.subselect(X_21,C_6,A1,A2,true,true,false);
+C_22 := sql.subdelta(C_79,C_6,C_19,C_80,C_82);
+C_83 := algebra.thetasubselect(X_9,C_22,A3,"<");
 (C_12,r1_12) := sql.bind(X_5,"sys","lineorder","lo_quantity",2);
-C_77 := algebra.thetasubselect(r1_12,nil:bat[:oid],A3,"<");
+C_84 := algebra.thetasubselect(r1_12,nil:bat[:oid],A3,"<");
 X_15:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_quantity",1);
-C_78 := algebra.thetasubselect(X_15,C_22,A3,"<");
-C_25 := sql.subdelta(C_76,C_22,C_12,C_77,C_78);
+C_85 := algebra.thetasubselect(X_15,C_22,A3,"<");
+C_25 := sql.subdelta(C_83,C_22,C_12,C_84,C_85);
 X_27:bat[:oid] := 
sql.bind_idxbat(X_5,"sys","lineorder","lineorder_lo_orderdate_fkey",0);
 (X_29,r1_37) := 
sql.bind_idxbat(X_5,"sys","lineorder","lineorder_lo_orderdate_fkey",2);
 X_31:bat[:oid] := 
sql.bind_idxbat(X_5,"sys","lineorder","lineorder_lo_orderdate_fkey",1);
 X_32 := sql.projectdelta(C_25,X_27,X_29,r1_37,X_31);
 X_35:bat[:int] := sql.bind(X_5,"sys","dwdate","d_year",0);
 C_33:bat[:oid] := sql.tid(X_5,"sys","dwdate");
-C_79 := algebra.subselect(X_35,C_33,A0,A0,true,false,false);
+C_86 := algebra.subselect(X_35,C_33,A0,A0,true,false,false);
 (C_37,r1_47) :=

MonetDB: default - Approve output

[Martin Kersten]

Changeset: 1c4b9c1ac63c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1c4b9c1ac63c
Modified Files:
clients/Tests/exports.stable.out
Branch: default
Log Message:

Approve output


diffs (36 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
@@ -1566,6 +1566,7 @@ int OPTmultiplexImplementation(Client cn
 str OPTmultiplexSimple(Client cntxt, MalBlkPtr mb);
 str OPTorcam(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
 int OPTorcamImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
p);
+int OPTpostfixImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr p);
 int OPTprofilerImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr p);
 int OPTprojectionpathImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr p);
 int OPTpushselectImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
@@ -1939,7 +1940,7 @@ str ZORDslice_int(bat *r, int *xb, int *
 str abortRef;
 str addOptimizerPipe(Client cntxt, MalBlkPtr mb, str name);
 str addPipeDefinition(Client cntxt, str name, str pipe);
-void addtoMalBlkHistory(MalBlkPtr mb, str marker);
+void addtoMalBlkHistory(MalBlkPtr mb);
 str affectedRowsRef;
 str aggrRef;
 str alarmRef;
@@ -2116,7 +2117,6 @@ int getHgeConstant(MalBlkPtr mb, hge val
 int getIntConstant(MalBlkPtr mb, int val);
 int getLngConstant(MalBlkPtr mb, lng val);
 MalBlkPtr getMalBlkHistory(MalBlkPtr mb, int idx);
-MalBlkPtr getMalBlkMarker(MalBlkPtr mb, str marker);
 lng getMemoryClaim(MalBlkPtr mb, MalStkPtr stk, InstrPtr pci, int i, int flag);
 str getName(const char *nme);
 str getNameLen(const char *nme, size_t len);
@@ -2138,7 +2138,6 @@ lng getUserTime(void);
 str getVarName(MalBlkPtr mb, int i);
 lng getVolume(MalStkPtr stk, InstrPtr pci, int rd);
 int getWrdConstant(MalBlkPtr mb, wrd val);
-MalBlkPtr gotoMalBlkMarker(MalBlkPtr mb, str marker);
 str grabRef;
 str groupRef;
 str groupbyRef;
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approve output

[Martin Kersten]

Changeset: 992cf3c3a818 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=992cf3c3a818
Modified Files:
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/modules/mal/Tests/inspect00.stable.out
monetdb5/optimizer/Tests/inline02.stable.out
monetdb5/optimizer/Tests/inline03.stable.out
monetdb5/optimizer/Tests/inline04.stable.out
monetdb5/optimizer/Tests/inline06.stable.out
monetdb5/optimizer/Tests/inline07.stable.out
monetdb5/optimizer/Tests/inline09.stable.out
monetdb5/optimizer/Tests/inline10.stable.out
monetdb5/optimizer/Tests/inlineCst.stable.out
monetdb5/optimizer/Tests/inlineFunction2.stable.out
monetdb5/optimizer/Tests/manifold2.stable.out
sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out

sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out

sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out
sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
sql/test/remote/Tests/partition_elim.stable.out
Branch: default
Log Message:

Approve output


diffs (truncated from 1629 to 300 lines):

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
@@ -64,10 +64,10 @@ Ready.
 % 118 # length
 function user.s4_1():void;
 X_24:void := querylog.define("explain copy into ttt from 
\\'/tmp/xyz\\';","default_pipe",12);
-barrier X_34 := language.dataflow();
+barrier X_53 := language.dataflow();
 X_1 := sql.mvc();
 (X_11:bat[:int],X_12:bat[:int],X_13:bat[:int]) := 
sql.copy_from(nil,"|","\\n",nil:str,"null","/tmp/xyz",-1,0,0,0);
-exit X_34;
+exit X_53;
 X_14 := sql.append(X_1,"sys","ttt","a",X_11);
 X_18 := sql.append(X_14,"sys","ttt","b",X_12);
 X_20 := sql.append(X_18,"sys","ttt","c",X_13);
@@ -98,10 +98,10 @@ end user.s4_1;
 % 118 # length
 function user.s12_1():void;
 X_24:void := querylog.define("explain copy into ttt from 
\\'/tmp/xyz\\';","user_1",12);
-barrier X_35 := language.dataflow();
+barrier X_54 := language.dataflow();
 X_1 := sql.mvc();
 (X_11:bat[:int],X_12:bat[:int],X_13:bat[:int]) := 
sql.copy_from(nil,"|","\\n",nil:str,"null","/tmp/xyz",-1,0,0,0);
-exit X_35;
+exit X_54;
 X_14 := sql.append(X_1,"sys","ttt","a",X_11);
 X_18 := sql.append(X_14,"sys","ttt","b",X_12);
 X_22 := aggr.count(X_13);
diff --git a/monetdb5/modules/mal/Tests/inspect00.stable.out 
b/monetdb5/modules/mal/Tests/inspect00.stable.out
--- a/monetdb5/modules/mal/Tests/inspect00.stable.out
+++ b/monetdb5/modules/mal/Tests/inspect00.stable.out
@@ -64,6 +64,7 @@ stack depth 2
 [ 0@0,   "tst",  "0@0"   ]
 [ 1@0,   "i","nil"   ]
 [ 2@0, "X_2",  "0@0"  ]
+[ 3@0, "X_3",  "nil"   ]
 
 # 09:13:25 >  
 # 09:13:25 >  Done.
diff --git a/monetdb5/optimizer/Tests/inline02.stable.out 
b/monetdb5/optimizer/Tests/inline02.stable.out
--- a/monetdb5/optimizer/Tests/inline02.stable.out
+++ b/monetdb5/optimizer/Tests/inline02.stable.out
@@ -35,10 +35,10 @@ function user.qry():void;   
 X_16:int := calc.+(1:int,2:int);   #[3] (0) CMDvarADDsignal 16 <- 
5 7 
 zz:int := X_16:int;#[4] (0)  6 <- 16 
 # base line test for inlining   
-X_20:bat[:int] := batcalc.+(b:bat[:int],b:bat[:int]);  #[6] (0) 
CMDbatADDsignal 20 <- 1 1 
-z:bat[:int] := X_20:bat[:int]; #[7] (0)  9 <- 20 
-X_24:bat[:int] := batcalc.+(b:bat[:int],2:int);#[8] (0) 
CMDbatADDsignal 24 <- 1 7 
-z:bat[:int] := X_24:bat[:int]; #[9] (0)  9 <- 24 
+X_21:bat[:int] := batcalc.+(b:bat[:int],b:bat[:int]);  #[6] (0) 
CMDbatADDsignal 21 <- 1 1 
+z:bat[:int] := X_21:bat[:int]; #[7] (0)  9 <- 21 
+X_25:bat[:int] := batcalc.+(b:bat[:int],2:int);#[8] (0) 
CMDbatADDsignal 25 <- 1 7 
+z:bat[:int] := X_25:bat[:int]; #[9] (0)  9 <- 25 
 end user.qry;  #[10] (0)  
 
 # 18:00:43 >  
diff --git a/monetdb5/optimizer/Tests/inline03.stable.out 
b/monetdb5/optimizer/Tests/inline03.stable.out
--- a/monetdb5/optimizer/Tests/inline03.stable.out
+++ b/monetdb5/optimizer/Tests/inline03.stable.out
@@ -32,14 +32,14 @@ Ready.
 function user.qry():void;  #[0] (0)  0 
 b:bat[:int] := bat.new(:oid,:i

MonetDB: default - Approve output

[Martin Kersten]

Changeset: 9f53cfea95d0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9f53cfea95d0
Modified Files:
monetdb5/optimizer/Tests/inline12.stable.out
Branch: default
Log Message:

Approve output


diffs (14 lines):

diff --git a/monetdb5/optimizer/Tests/inline12.stable.out 
b/monetdb5/optimizer/Tests/inline12.stable.out
--- a/monetdb5/optimizer/Tests/inline12.stable.out
+++ b/monetdb5/optimizer/Tests/inline12.stable.out
@@ -33,8 +33,8 @@ function user.qry():void;   
 X_17:int := calc.+(1:int,2:int);   #[3] (0) CMDvarADDsignal 17 <- 
5 7 
 zz:int := X_17:int;#[4] (0)  6 <- 17 
 # base line test for inlining   
-X_21:bat[:int] := batcalc.+(b:bat[:int],b:bat[:int]);  #[6] (0) 
CMDbatADDsignal 21 <- 1 1 
-z:bat[:int] := X_21:bat[:int]; #[7] (0)  9 <- 21 
+X_22:bat[:int] := batcalc.+(b:bat[:int],b:bat[:int]);  #[6] (0) 
CMDbatADDsignal 22 <- 1 1 
+z:bat[:int] := X_22:bat[:int]; #[7] (0)  9 <- 22 
 z:bat[:int] := batcalc.+(b:bat[:int],2:int);   #[8] (0) 
CMDbatADDsignal 9 <- 1 7 
 end user.qry;  #[9] (0)  
 
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approve output

[Martin Kersten]

Changeset: d5ddbee32495 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d5ddbee32495
Modified Files:
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out

monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single

sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single
sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out
sql/test/Tests/setoptimizer.stable.out
sql/test/Tests/setoptimizer.stable.out.Windows
sql/test/remote/Tests/partition_elim.stable.out
Branch: default
Log Message:

Approve output


diffs (truncated from 916 to 300 lines):

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
@@ -56,7 +56,7 @@ Ready.
 % def # name
 % clob # type
 % 541 # length
-[ 
"optimizer.inline();optimizer.candidates();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.garbageCollector();"
  ]
+[ 
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.garbageCollector();"
  ]
 #explain copy into ttt from '/tmp/xyz';
 % .explain # table_name
 % mal # name
@@ -90,7 +90,7 @@ end user.s4_1;
 % def # name
 % clob # type
 % 564 # length
-[ 
"optimizer.inline();optimizer.candidates();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.sql_append();optimizer.garbageCollector();"
   ]
+[ 
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.sql_append();optimizer.garbageCollector();"
   ]
 #explain copy into ttt from '/tmp/xyz';
 % .explain # table_name
 % mal # name
diff --git 
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single 
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single
--- 
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single
+++ 
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single
@@ -56,7 +56,7 @@ Ready.
 % def # name
 % clob # type
 % 541 # length
-[ 
"optimizer.inline();optimizer.candidates();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.garbageCollector();"
  ]
+[ 
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optim

MonetDB: default - Approve output

[Martin Kersten]

Changeset: be5f51e44622 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=be5f51e44622
Modified Files:
monetdb5/modules/mal/Tests/remote03.stable.err
monetdb5/modules/mal/Tests/remote03.stable.out
monetdb5/optimizer/Tests/dataflow3.stable.out
monetdb5/optimizer/Tests/dataflow4.stable.out
Branch: default
Log Message:

Approve output


diffs (191 lines):

diff --git a/monetdb5/modules/mal/Tests/remote03.stable.err 
b/monetdb5/modules/mal/Tests/remote03.stable.err
--- a/monetdb5/modules/mal/Tests/remote03.stable.err
+++ b/monetdb5/modules/mal/Tests/remote03.stable.err
@@ -1,11 +1,11 @@
 stderr of test 'remote03` in directory 'monetdb5/modules/mal` itself:
 
 
-# 13:32:04 >  
-# 13:32:04 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=38272" "--set" 
"mapi_usock=/var/tmp/mtest-30987/.s.monetdb.38272" "--set" "monet_prompt=" 
"--forcemito" 
"--dbpath=/ufs/sjoerd/Monet-devel/var/MonetDB/mTests_monetdb5_modules_mal" 
"--set" "embedded_r=yes"
-# 13:32:04 >  
+# 04:04:13 >  
+# 04:04:13 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=32121" "--set" 
"mapi_usock=/var/tmp/mtest-3168/.s.monetdb.32121" "--set" "monet_prompt=" 
"--forcemito" 
"--dbpath=/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_modules_mal"
+# 04:04:13 >  
 
-# builtin opt  gdk_dbpath = /ufs/sjoerd/Monet-devel/var/monetdb5/dbfarm/demo
+# builtin opt  gdk_dbpath = 
/export/scratch1/mk/default//Linux/var/monetdb5/dbfarm/demo
 # builtin opt  gdk_debug = 0
 # builtin opt  gdk_vmtrim = no
 # builtin opt  monet_prompt = >
@@ -17,18 +17,17 @@ stderr of test 'remote03` in directory '
 # builtin opt  sql_debug = 0
 # cmdline opt  gdk_nr_threads = 0
 # cmdline opt  mapi_open = true
-# cmdline opt  mapi_port = 38272
-# cmdline opt  mapi_usock = /var/tmp/mtest-30987/.s.monetdb.38272
+# cmdline opt  mapi_port = 32121
+# cmdline opt  mapi_usock = /var/tmp/mtest-3168/.s.monetdb.32121
 # cmdline opt  monet_prompt = 
-# cmdline opt  gdk_dbpath = 
/ufs/sjoerd/Monet-devel/var/MonetDB/mTests_monetdb5_modules_mal
-# cmdline opt  embedded_r = yes
+# cmdline opt  gdk_dbpath = 
/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_modules_mal
 # cmdline opt  gdk_debug = 536870922
 
-# 13:32:05 >  
-# 13:32:05 >  "mclient" "-lmal" "-ftest" "-Eutf-8" 
"--host=/var/tmp/mtest-30987" "--port=38272"
-# 13:32:05 >  
+# 04:04:13 >  
+# 04:04:13 >  "mclient" "-lmal" "-ftest" "-Eutf-8" 
"--host=/var/tmp/mtest-3168" "--port=32121"
+# 04:04:13 >  
 
-MAPI  = (monetdb) /var/tmp/mtest-30987/.s.monetdb.38272
+MAPI  = (monetdb) /var/tmp/mtest-3168/.s.monetdb.32121
 QUERY = # let connect figure out itself how to connect to the running db
 uri := sabaoth.getLocalConnectionURI();
 conn:str := remote.connect(uri, "monetdb", "monetdb");
@@ -94,10 +93,9 @@ QUERY = # let connect figure out itself 
io.print("Received an error from the remote site");
 exit MALException;
 
+ERROR = 
!SyntaxException:remote.exec:(mapi:monetdb://mone...@vienna.da.cwi.nl/mTests_monetdb5_modules_mal)
 rmt0_X_0_void := io.print.bla();
 
+# 04:04:13 >  
+# 04:04:13 >  "Done."
+# 04:04:13 >  
 
-
-# 23:12:09 >  
-# 23:12:09 >  "Done."
-# 23:12:09 >  
-
diff --git a/monetdb5/modules/mal/Tests/remote03.stable.out 
b/monetdb5/modules/mal/Tests/remote03.stable.out
--- a/monetdb5/modules/mal/Tests/remote03.stable.out
+++ b/monetdb5/modules/mal/Tests/remote03.stable.out
@@ -1,34 +1,32 @@
 stdout of test 'remote03` in directory 'monetdb5/modules/mal` itself:
 
 
-# 22:17:31 >  
-# 22:17:31 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=30468" "--set" 
"mapi_usock=/var/tmp/mtest-3813/.s.monetdb.30468" "--set" "monet_prompt=" 
"--forcemito" "--set" "mal_listing=2" 
"--dbpath=/export/scratch1/mk/current//Linux/var/MonetDB/mTests_monetdb5_modules_mal"
 "remote03.mal"
-# 22:17:31 >  
+# 04:04:13 >  
+# 04:04:13 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=32121" "--set" 
"mapi_usock=/var/tmp/mtest-3168/.s.monetdb.32121" "--set" "monet_prompt=" 
"--forcemito" 
"--dbpath=/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_modules_mal"
+# 04:04:13 >  
 
-# MonetDB 5 server v11.18.0
+# MonetDB 5 server v11.24.0
 # This is an unreleased version
 # Serving database 'mTests_monetdb5_modules_mal', using 8 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically 
linked
-# Found 15.591 GiB available main-memory.
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit 
integers dynamically linked
+# Found 15.589 GiB available main-memory.
 # Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
+# Copyright (c) August 2008-2016 MonetDB B.V., all rights reserved
 # Visit http://www.monetdb.org/ for further informatio

MonetDB: default - Approve output

[Martin Kersten]

Changeset: fdd3562dc126 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fdd3562dc126
Modified Files:
clients/Tests/exports.stable.out
sql/test/BugTracker-2016/Tests/storagemodel.stable.out
sql/test/BugTracker-2016/Tests/storagemodel.stable.out.32bit
Branch: default
Log Message:

Approve output


diffs (57 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
@@ -260,6 +260,8 @@ gdk_return GDKreleasemmap(void *ptr, siz
 gdk_return GDKreleasesem(int sem_id, str *msg);
 void GDKreset(int status);
 void GDKsetenv(str name, str value);
+void GDKsetmemorylimit(size_t nbytes);
+void GDKsetmemorylimit(size_t nbytes){ GDK_mallocedbytes_limit = nbytes;
 ssize_t GDKstrFromStr(unsigned char *dst, const unsigned char *src, ssize_t 
len);
 str GDKstrdup(const char *s) __attribute__((__warn_unused_result__));
 str GDKstrndup(const char *s, size_t n) 
__attribute__((__warn_unused_result__));
@@ -1201,6 +1203,7 @@ str IOimport(void *ret, bat *bid, str *f
 str IOprint_val(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
 str IOprintf(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
 str IOprintfStream(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str IOsetmemorylimit(void *res, lng *nbytes);
 str IOtable(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
 str ITRbunIterator(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
 str ITRbunNext(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
diff --git a/sql/test/BugTracker-2016/Tests/storagemodel.stable.out 
b/sql/test/BugTracker-2016/Tests/storagemodel.stable.out
--- a/sql/test/BugTracker-2016/Tests/storagemodel.stable.out
+++ b/sql/test/BugTracker-2016/Tests/storagemodel.stable.out
@@ -74,7 +74,7 @@ Ready.
 [ "sys",   "_tables",  "id",   "int",  "writable", 4,  0,  
false,  0,  true]
 [ "sys",   "_tables",  "name", "varchar",  "writable", 8,  
0,  false,  0,  false   ]
 [ "sys",   "_tables",  "schema_id","int",  "writable", 4,  
0,  false,  0,  false   ]
-[ "sys",   "_tables",  "query","varchar",  "writable", 
45, 0,  false,  0,  false   ]
+[ "sys",   "_tables",  "query","varchar",  "writable", 
34, 0,  false,  0,  false   ]
 [ "sys",   "_tables",  "type", "smallint", "writable", 2,  
0,  false,  0,  false   ]
 [ "sys",   "_tables",  "system",   "boolean",  "writable", 
1,  0,  false,  0,  false   ]
 [ "sys",   "_tables",  "commit_action","smallint", 
"writable", 2,  0,  false,  0,  false   ]
@@ -96,10 +96,10 @@ Ready.
 % schema,  table,  column, type,   mode,   typewidth,  hashes, phash,  
imprints,   sorted # name
 % clob,clob,   clob,   clob,   clob,   int,bigint, boolean,
bigint, boolean # type
 % 3,   7,  13, 8,  8,  2,  4,  5,  1,  5 # 
length
-[ "sys",   "_tables",  "id",   "int",  "writable", 4,  2600,   
false,  0,  false   ]
+[ "sys",   "_tables",  "id",   "int",  "writable", 4,  1064,   
false,  0,  false   ]
 [ "sys",   "_tables",  "name", "varchar",  "writable", 8,  
0,  false,  0,  false   ]
 [ "sys",   "_tables",  "schema_id","int",  "writable", 4,  
0,  false,  0,  false   ]
-[ "sys",   "_tables",  "query","varchar",  "writable", 
45, 0,  false,  0,  false   ]
+[ "sys",   "_tables",  "query","varchar",  "writable", 
33, 0,  false,  0,  false   ]
 [ "sys",   "_tables",  "type", "smallint", "writable", 2,  
0,  false,  0,  false   ]
 [ "sys",   "_tables",  "system",   "boolean",  "writable", 
1,  0,  false,  0,  false   ]
 [ "sys",   "_tables",  "commit_action","smallint", 
"writable", 2,  0,  false,  0,  false   ]
diff --git a/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.32bit 
b/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.32bit
--- a/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.32bit
+++ b/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.32bit
@@ -74,7 +74,7 @@ Ready.
 [ "sys",   "_tables",  "id",   "int",  "writable", 4,  0,  
false,  0,  true]
 [ "sys",   "_tables",  "name", "varchar",  "writable", 8,  
0,  false,  0,  false   ]
 [ "sys",   "_tables",  "schema_id","int",  "writable", 4,  
0,  false,  0,  false   ]
-[ "sys",   "_tables",  "query","varchar",  "writable", 
45, 0,  false,  0,  false   ]
+[ "sys",   "_tables", 

MonetDB: default - Approve output

[Martin Kersten]

Changeset: 8a0828829707 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8a0828829707
Modified Files:
sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out
sql/backends/monet5/UDF/cudf/Tests/udf-reverse.stable.out
sql/benchmarks/ssbm/Tests/01-explain.stable.out
sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/02-explain.stable.out
sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/03-explain.stable.out
sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/10-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/11-explain.stable.out
sql/benchmarks/ssbm/Tests/11-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/12-explain.stable.out
sql/benchmarks/ssbm/Tests/12-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/13-explain.stable.out
sql/benchmarks/ssbm/Tests/13-explain.stable.out.int128
sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
sql/benchmarks/tpch/Tests/02-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out.int128
sql/benchmarks/tpch/Tests/04-explain.stable.out
sql/benchmarks/tpch/Tests/05-explain.stable.out.int128
sql/benchmarks/tpch/Tests/06-explain.stable.out.int128
sql/benchmarks/tpch/Tests/07-explain.stable.out.int128
sql/benchmarks/tpch/Tests/08-explain.stable.out.int128
sql/benchmarks/tpch/Tests/09-explain.stable.out.int128
sql/benchmarks/tpch/Tests/10-explain.stable.out.int128
sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
sql/benchmarks/tpch/Tests/12-explain.stable.out.int128
sql/benchmarks/tpch/Tests/13-explain.stable.out
sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
sql/benchmarks/tpch/Tests/15-explain.stable.out.int128
sql/benchmarks/tpch/Tests/16-explain.stable.out
sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
sql/benchmarks/tpch/Tests/18-explain.stable.out.int128
sql/benchmarks/tpch/Tests/19-explain.stable.out.int128
sql/benchmarks/tpch/Tests/20-explain.stable.out.int128
sql/benchmarks/tpch/Tests/21-explain.stable.out
sql/benchmarks/tpch/Tests/22-explain.stable.out.int128
sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out

sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out

sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out

sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128
sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single
sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out
sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out
sql/test/BugTracker-2016/Tests/querylog.stable.err
sql/test/BugTracker-2016/Tests/querylog.stable.out
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/mergetables/Tests/mergequery.stable.out
sql/test/remote/Tests/partition_elim.stable.out
Branch: default
Log Message:

Approve output


diffs (truncated from 6654 to 300 lines):

diff --git a/sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out 
b/sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out
--- a/sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out
+++ b/sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out
@@ -107,17 +107,17 @@ function user.s8_1():void;
 X_31 := bat.new(nil:int);
 X_40 := bat.append(X_31,0);
 X_0 := sql.mvc();
-X_1:bat[:oid] := sql.tid(X_0,"sys","udf_fuse");
+C_1:bat[:oid] := sql.tid(X_0,"sys","udf_fuse");
 X_4:bat[:bte] := sql.bind(X_0,"sys","udf_fuse","a",0);
-(X_7,r1_8) := sql.bind(X_0,"sys","udf_fuse","a",2);
+(C_7,r1_8) := sql.bind(X_0,"sys","udf_fuse","a",2);
 X_10:bat[:bte] := sql.bind(X_0,"sys","udf_fuse","a",1);
-X_12 := sql.delta(X_4,X_7,r1_8,X_10);
-X_13 := algebra.projection(X_1,X_12);
+X_12 := sql.delta(X_4,C_7,r1_8,X_

MonetDB: default - Approve output

[Martin Kersten]

Changeset: 5144526f745d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5144526f745d
Modified Files:
monetdb5/optimizer/Tests/inlineFunction.stable.out
monetdb5/optimizer/Tests/inlineFunction1.stable.out
monetdb5/optimizer/Tests/inlineFunction3.stable.out
monetdb5/optimizer/Tests/inlineFunction4.stable.out
Branch: default
Log Message:

Approve output


diffs (61 lines):

diff --git a/monetdb5/optimizer/Tests/inlineFunction.stable.out 
b/monetdb5/optimizer/Tests/inlineFunction.stable.out
--- a/monetdb5/optimizer/Tests/inlineFunction.stable.out
+++ b/monetdb5/optimizer/Tests/inlineFunction.stable.out
@@ -29,7 +29,7 @@ Ready.
 
 #result of inline
 function user.tst():void;
-X_3 := true:bit;
+true:bit;
 X_4:int := 0;
 X_4:int := 100;
 z := X_4;
diff --git a/monetdb5/optimizer/Tests/inlineFunction1.stable.out 
b/monetdb5/optimizer/Tests/inlineFunction1.stable.out
--- a/monetdb5/optimizer/Tests/inlineFunction1.stable.out
+++ b/monetdb5/optimizer/Tests/inlineFunction1.stable.out
@@ -30,12 +30,12 @@ Ready.
 #result of inline
 #mdb.list("user","tst");
 function user.tst():void;
-X_3 := true:bit;
+true:bit;
 z := 0:int;
 end user.tst;
 #mdb.list("user","tst");
 function user.tst():void;
-X_3 := true:bit;
+true:bit;
 z := 0:int;
 end user.tst;
 
diff --git a/monetdb5/optimizer/Tests/inlineFunction3.stable.out 
b/monetdb5/optimizer/Tests/inlineFunction3.stable.out
--- a/monetdb5/optimizer/Tests/inlineFunction3.stable.out
+++ b/monetdb5/optimizer/Tests/inlineFunction3.stable.out
@@ -29,8 +29,8 @@ Ready.
 #io.printf("#result of inline\n");
 #result of inline
 function user.tst():void;
-X_3 := false:bit;
-X_9 := false:bit;
+false:bit;
+false:bit;
 z := 1:int;
 end user.tst;
 
diff --git a/monetdb5/optimizer/Tests/inlineFunction4.stable.out 
b/monetdb5/optimizer/Tests/inlineFunction4.stable.out
--- a/monetdb5/optimizer/Tests/inlineFunction4.stable.out
+++ b/monetdb5/optimizer/Tests/inlineFunction4.stable.out
@@ -29,10 +29,10 @@ Ready.
 #io.printf("#result of inline\n");
 #result of inline
 function user.tst():void;
-X_3 := false:bit;
+false:bit;
 X_5:int := 0;
-X_10 := false:bit;
-X_16 := -1:int;
+false:bit;
+-1:int;
 X_5:int := -1:int;
 z := X_5;
 end user.tst;
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - approve output

[Niels Nes]

Changeset: 7418439d33d6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7418439d33d6
Modified Files:
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/optimizer/Tests/dataflow3.stable.out
sql/test/remote/Tests/partition_elim.stable.out
Branch: default
Log Message:

approve output


diffs (253 lines):

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
@@ -64,10 +64,10 @@ Ready.
 % 126 # length
 function user.s8_1():void;
 X_38:void := querylog.define("explain copy into ttt from 
\\'/tmp/xyz\\';","default_pipe",12);
-barrier X_56 := language.dataflow();
+barrier X_58 := language.dataflow();
 X_0 := sql.mvc();
 (X_21:bat[:int],X_22:bat[:int],X_23:bat[:int]) := 
sql.copy_from(nil,"|","\\n",nil:str,"null","/tmp/xyz",-1,0,0,0,nil:str);
-exit X_56;
+exit X_58;
 X_25 := sql.append(X_0,"sys","ttt","a",X_21);
 X_30 := sql.append(X_25,"sys","ttt","b",X_22);
 X_33 := sql.append(X_30,"sys","ttt","c",X_23);
@@ -125,10 +125,10 @@ end user.s8_1;
 % 126 # length
 function user.s24_1():void;
 X_38:void := querylog.define("explain copy into ttt from 
\\'/tmp/xyz\\';","user_1",12);
-barrier X_56 := language.dataflow();
+barrier X_58 := language.dataflow();
 X_0 := sql.mvc();
 (X_21:bat[:int],X_22:bat[:int],X_23:bat[:int]) := 
sql.copy_from(nil,"|","\\n",nil:str,"null","/tmp/xyz",-1,0,0,0,nil:str);
-exit X_56;
+exit X_58;
 X_25 := sql.append(X_0,"sys","ttt","a",X_21);
 X_30 := sql.append(X_25,"sys","ttt","b",X_22);
 X_35 := aggr.count(X_23);
diff --git a/monetdb5/optimizer/Tests/dataflow3.stable.out 
b/monetdb5/optimizer/Tests/dataflow3.stable.out
--- a/monetdb5/optimizer/Tests/dataflow3.stable.out
+++ b/monetdb5/optimizer/Tests/dataflow3.stable.out
@@ -26,13 +26,13 @@ Ready.
 
 #mdb.list("user","s1_0");
 function user.s1_0():void;
-barrier X_30 := language.dataflow();
+barrier X_31 := language.dataflow();
 X17 := bat.new(:lng);
 X54 := bat.new(:lng);
 X55 := bat.new(:lng);
 X56 := bat.new(:lng);
 X57 := bat.new(:lng);
-exit X_30;
+exit X_31;
 X59 := 
remote.connect("mapi:monetdb://volund.ins.cwi.nl:5/sn4","monetdb","monetdb","msql");
 remote.register(X59,"user","s1_0map");
 X66 := remote.put(X59,X54);
diff --git a/sql/test/remote/Tests/partition_elim.stable.out 
b/sql/test/remote/Tests/partition_elim.stable.out
--- a/sql/test/remote/Tests/partition_elim.stable.out
+++ b/sql/test/remote/Tests/partition_elim.stable.out
@@ -135,7 +135,7 @@ Ready.
 % mal # name
 % clob # type
 % 68 # length
-function user.SQLanalyze():void;
+function user.main():void;
 barrier X_1253 := language.dataflow();
 X_1181 := bat.new(nil:str);
 X_1188 := bat.append(X_1181,".test");
@@ -189,13 +189,37 @@ barrier X_1253 := language.dataflow();
 language.pass(C_1167);
 exit X_1253;
 sql.resultSet(X_1198,X_1199,X_1200,X_1201,X_1202,X_1169,X_1179);
-end user.SQLanalyze;
+end user.main;
+#inline   actions= 0 time=3 usec 
+#remapactions= 0 time=8 usec 
+#costmodelactions= 1 time=4 usec 
+#coercion actions= 0 time=5 usec 
+#evaluate actions= 6 time=48 usec 
+#emptybindactions= 0 time=24 usec 
+#aliases  actions=10 time=24 usec 
+#mitosis  actions= 1 time=72 usec 
+#mergetable   actions= 3 time=157 usec 
+#deadcode actions= 4 time=21 usec 
+#aliases  actions= 0 time=16 usec 
+#constantsactions= 7 time=17 usec 
+#commonTerms  actions= 0 time=18 usec 
+#projectionpath   actions= 0 time=12 usec 
+#deadcode actions= 0 time=16 usec 
+#reorder  actions= 1 time=79 usec 
+#reduce   actions=43 time=23 usec 
+#matpack  actions= 2 time=17 usec 
+#dataflow actions=27 time=63 usec 
+#multiplexactions= 0 time=5 usec 
+#profiler actions= 1 time=9 usec 
+#candidates   actions= 1 time=4 usec 
+#garbagecollector actions= 1 time=44 usec 
+#totalactions= 1 time=984 usec 
 #explain select x,y from test where x between (7-3) and (7-1);
 % .explain # table_name
 % mal # name
 % clob # type
 % 75 # length
-function user.SQLanalyze():void;
+function user.main():void;
 barrier X_1397 := language.dataflow();
 X_1320 := bat.new(nil:str);
 X_1327 := bat.append(X_1320,".test");
@@ -249,13 +273,37 @@ barrier X_1397 := language.dataflow();
 language.pass(C_1305);
 exit X_1397;
 sql.resultSet(X_1337,X_1338,X_1339,X_1340,X_1341,X_1307,X_1318);
-end user.SQLanalyze;
+end user.main;
+#inline   actions= 0 time=3 usec 
+#remapactions= 0 time=9 usec 
+#costmodel   

MonetDB: default - Approve output

[Martin Kersten]

Changeset: 6965ede4a2bb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6965ede4a2bb
Modified Files:
sql/test/json/Tests/shop.sql
sql/test/json/Tests/shop.stable.out
Branch: default
Log Message:

Approve output


diffs (35 lines):

diff --git a/sql/test/json/Tests/shop.sql b/sql/test/json/Tests/shop.sql
--- a/sql/test/json/Tests/shop.sql
+++ b/sql/test/json/Tests/shop.sql
@@ -43,9 +43,9 @@ SELECT json.text(json.filter(j,'book.aut
 
 -- a single author from the book store
 SELECT * FROM books 
-WHERE json.text(json.filter(j,'book.author')) = 'Nigel Rise';
+WHERE json.text(json.filter(j,'book.author')) = 'Nigel Rees';
 SELECT * FROM books 
-WHERE json.text(json.filter(j,'..author')) = 'Nigel Rise';
+WHERE json.text(json.filter(j,'..author')) = 'Nigel Rees';
 
 -- numeric calculations
 SELECT * FROM books 
diff --git a/sql/test/json/Tests/shop.stable.out 
b/sql/test/json/Tests/shop.stable.out
--- a/sql/test/json/Tests/shop.stable.out
+++ b/sql/test/json/Tests/shop.stable.out
@@ -124,14 +124,14 @@ Ready.
 % sys.books,   sys.books # table_name
 % i,   j # name
 % int, json # type
-% 1,   0 # length
+% 1,   155 # length
 [ 1,   " { \n\"book\": \n  { \"category\": \"reference\",\n
\"author\": \"Nigel Rees\",\n\"title\": \"Sayings of the Century\",\n   
 \"price\": 8.95\n  }}" ]
 #SELECT * FROM books 
 #WHERE json.text(json.filter(j,'..author')) = 'Nigel Rise';
 % sys.books,   sys.books # table_name
 % i,   j # name
 % int, json # type
-% 1,   0 # length
+% 1,   155 # length
 [ 1,   " { \n\"book\": \n  { \"category\": \"reference\",\n
\"author\": \"Nigel Rees\",\n\"title\": \"Sayings of the Century\",\n   
 \"price\": 8.95\n  }}" ]
 #SELECT * FROM books 
 #WHERE json.number(json.filter(j,'book.price')) >= 12.99;
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - approve output

[Niels Nes]

Changeset: c662655667aa for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c662655667aa
Added Files:
sql/test/BugTracker-2014/Tests/typecast_error.Bug-3622.stable.err
sql/test/BugTracker-2014/Tests/typecast_error.Bug-3622.stable.out
Modified Files:

sql/test/BugTracker-2013/Tests/qualified_aggrname.Bug-3332.stable.out.int128
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
sql/test/BugTracker-2014/Tests/typecast_error.Bug-3622.sql
sql/test/Dependencies/Tests/Dependencies_bam.stable.out.int128
sql/test/bugs/Tests/aggr_single_value.stable.out.int128
sql/test/pg_regress/Tests/float4.stable.out
sql/test/pg_regress/Tests/float8.stable.out
sql/test/pg_regress/Tests/int8.stable.out
Branch: default
Log Message:

approve output


diffs (truncated from 484 to 300 lines):

diff --git 
a/sql/test/BugTracker-2013/Tests/qualified_aggrname.Bug-3332.stable.out.int128 
b/sql/test/BugTracker-2013/Tests/qualified_aggrname.Bug-3332.stable.out.int128
--- 
a/sql/test/BugTracker-2013/Tests/qualified_aggrname.Bug-3332.stable.out.int128
+++ 
b/sql/test/BugTracker-2013/Tests/qualified_aggrname.Bug-3332.stable.out.int128
@@ -50,8 +50,8 @@ Ready.
 #2086  "idxs"  2000NULL0   true0   false   0
 [ 40   ]
 #select sys.median(cast (id as double)) from tbls;
-% sys.L1 # table_name
-% L1 # name
+% sys.L2 # table_name
+% L2 # name
 % double # type
 % 24 # length
 [ 5183 ]
diff --git a/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out 
b/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
--- a/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
+++ b/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
@@ -45,44 +45,44 @@ Ready.
 % 187 # length
 function user.s5_1{autoCommit=true}(A0:timestamp,A1:timestamp,A2:void):void;
 barrier X_109 := language.dataflow();
+X_6:bat[:oid,:lng]  := bat.new(nil:oid,nil:lng);
 X_5 := sql.mvc();
-X_6:bat[:oid,:lng]  := bat.new(nil:oid,nil:lng);
 X_66:bat[:oid,:oid]  := sql.tid(X_5,"sys","foo_nil_2dec",0,2);
+X_69:bat[:oid,:timestamp]  := sql.bind(X_5,"sys","foo_nil_2dec","t",0,0,2);
+(X_71:bat[:oid,:oid] ,X_72:bat[:oid,:timestamp] ) := 
sql.bind(X_5,"sys","foo_nil_2dec","t",2,0,2);
+X_81 := sql.delta(X_69,X_71,X_72);
+X_83 := algebra.leftfetchjoin(X_66,X_81);
+X_16 := calc.timestamp(A0,7);
+X_85 := algebra.project(X_83,X_16);
+X_87 := batmtime.diff(X_83,X_85);
 X_68:bat[:oid,:oid]  := sql.tid(X_5,"sys","foo_nil_2dec",1,2);
-X_69:bat[:oid,:timestamp]  := sql.bind(X_5,"sys","foo_nil_2dec","t",0,0,2);
 X_70:bat[:oid,:timestamp]  := sql.bind(X_5,"sys","foo_nil_2dec","t",0,1,2);
-(X_71:bat[:oid,:oid] ,X_72:bat[:oid,:timestamp] ) := 
sql.bind(X_5,"sys","foo_nil_2dec","t",2,0,2);
 (X_73:bat[:oid,:oid] ,X_74:bat[:oid,:timestamp] ) := 
sql.bind(X_5,"sys","foo_nil_2dec","t",2,1,2);
 X_14:bat[:oid,:timestamp]  := sql.bind(X_5,"sys","foo_nil_2dec","t",1);
-X_81 := sql.delta(X_69,X_71,X_72);
 X_82 := sql.delta(X_70,X_73,X_74,X_14);
-X_83 := algebra.leftfetchjoin(X_66,X_81);
 X_84 := algebra.leftfetchjoin(X_68,X_82);
-X_16 := calc.timestamp(A0,7);
-X_85 := algebra.project(X_83,X_16);
 X_86 := algebra.project(X_84,X_16);
-X_87 := batmtime.diff(X_83,X_85);
 X_88 := batmtime.diff(X_84,X_86);
 X_99 := mat.packIncrement(X_87,2);
 X_18:bat[:oid,:lng]  := mat.packIncrement(X_99,X_88);
 X_19 := bat.append(X_6,X_18,true);
 X_20 := calc.timestamp(A1,7);
 X_91 := algebra.project(X_83,X_20);
+X_93 := batmtime.diff(X_83,X_91);
 X_92 := algebra.project(X_84,X_20);
-X_93 := batmtime.diff(X_83,X_91);
 X_94 := batmtime.diff(X_84,X_92);
 X_101 := mat.packIncrement(X_93,2);
 X_21:bat[:oid,:lng]  := mat.packIncrement(X_101,X_94);
 X_22 := bat.append(X_19,X_21,true);
 X_24:bat[:oid,:lng]  := bat.new(nil:oid,nil:lng);
 X_75:bat[:oid,:lng]  := sql.bind(X_5,"sys","foo_nil_2dec","v",0,0,2);
+(X_77:bat[:oid,:oid] ,X_78:bat[:oid,:lng] ) := 
sql.bind(X_5,"sys","foo_nil_2dec","v",2,0,2);
+X_95 := sql.delta(X_75,X_77,X_78);
+X_97 := algebra.leftfetchjoin(X_66,X_95);
 X_76:bat[:oid,:lng]  := sql.bind(X_5,"sys","foo_nil_2dec","v",0,1,2);
-(X_77:bat[:oid,:oid] ,X_78:bat[:oid,:lng] ) := 
sql.bind(X_5,"sys","foo_nil_2dec","v",2,0,2);
 (X_79:bat[:oid,:oid] ,X_80:bat[:oid,:lng] ) := 
sql.bind(X_5,"sys","foo_nil_2dec","v",2,1,2);
 X_32:bat[:oid,:lng]  := sql.bind(X_5,"sys","foo_nil_2dec","v",1);
-X_95 := sql.delta(X_75,X_77,X_78);
 X_96 := sql.delta(X_76,X_79,X_80,X_32);
-X_97 := algebra.leftfetchjoin(X_66,X_95);
 X_98 := algebra.leftfetchjoin(X_68,X_96);
 X_103 := mat.packIncrement(X_97,2);
 X_34 := mat.packIncrement(X_103,X_98);
diff --git a/sql/test/BugTracker-2014/Tests/typecast_error.Bug-3622.sql 
b/sql/test/BugTracker-2014/Tests/typecast_error.Bug-3622.sql
--- a/sql/t

MonetDB: default - Approve output

[Martin Kersten]

Changeset: d0a79eb0c1c5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d0a79eb0c1c5
Modified Files:
monetdb5/mal/Tests/tst049.mal
monetdb5/mal/Tests/tst049.stable.out
monetdb5/mal/Tests/tst285.mal
monetdb5/mal/Tests/tst285.stable.out
monetdb5/mal/Tests/tst960.mal
monetdb5/mal/Tests/tst960.stable.out
Branch: default
Log Message:

Approve output


diffs (89 lines):

diff --git a/monetdb5/mal/Tests/tst049.mal b/monetdb5/mal/Tests/tst049.mal
--- a/monetdb5/mal/Tests/tst049.mal
+++ b/monetdb5/mal/Tests/tst049.mal
@@ -30,7 +30,7 @@ io.print(i);
 i:= str.like("trx","t_");
 io.print(i);
 
-z:= batstr.like(b,"t_");
+z:= batalgebra.like(b,"t_");
 io.print(z);
 z:= mal.manifold("str","like",b,"%math%");
 io.print(z);
diff --git a/monetdb5/mal/Tests/tst049.stable.out 
b/monetdb5/mal/Tests/tst049.stable.out
--- a/monetdb5/mal/Tests/tst049.stable.out
+++ b/monetdb5/mal/Tests/tst049.stable.out
@@ -123,7 +123,7 @@ function user.main():void;
 io.print(i);
 i := str.like("trx","t_");
 io.print(i);
-z := batstr.like(b,"t_");
+z := batalgebra.like(b,"t_");
 io.print(z);
 z := mal.manifold("str","like",b,"%math%");
 io.print(z);
diff --git a/monetdb5/mal/Tests/tst285.mal b/monetdb5/mal/Tests/tst285.mal
--- a/monetdb5/mal/Tests/tst285.mal
+++ b/monetdb5/mal/Tests/tst285.mal
@@ -1,11 +1,8 @@
 b:= bat.new(:oid,:str);
 bat.append(b,"hello");
 bat.append(b,"goodbye");
-o:=bat.new(:oid,:oid);
 
-p:= bat.new(:oid,:str);
-bat.append(p,"%hel%");
+z0:= algebra.likesubselect(b,nil:bat,"%hel%",false);
+io.print(z0);
 
-(z0,z1):= algebra.likesubselect(b,p,"");
-io.print(z0,z1);
 
diff --git a/monetdb5/mal/Tests/tst285.stable.out 
b/monetdb5/mal/Tests/tst285.stable.out
--- a/monetdb5/mal/Tests/tst285.stable.out
+++ b/monetdb5/mal/Tests/tst285.stable.out
@@ -26,17 +26,14 @@ function user.main():void;
 b := bat.new(:oid,:str);
 bat.append(b,"hello");
 bat.append(b,"goodbye");
-o := bat.new(:oid,:oid);
-p := bat.new(:oid,:str);
-bat.append(p,"%hel%");
-(z0,z1) := algebra.likesubselect(b,p,"");
-io.print(z0,z1);
+z0 := algebra.likesubselect(b,nil:BAT,"%hel%",false);
+io.print(z0);
 end main;
 #--#
 # th   h  # name
 # void oid oid  # type
 #--#
-[ 0@0, 0@0,0@0  ]
+[ 0@0, 0@0  ]
 
 # 08:01:12 >  
 # 08:01:12 >  Done.
diff --git a/monetdb5/mal/Tests/tst960.mal b/monetdb5/mal/Tests/tst960.mal
--- a/monetdb5/mal/Tests/tst960.mal
+++ b/monetdb5/mal/Tests/tst960.mal
@@ -15,7 +15,7 @@ io.print(L);
 B:= batcalc.==(S,"hello");
 io.print(B);
 
-C:= batstr.like(S,"hello");
+C:= batalgebra.like(S,"hello");
 io.print(C);
 
 U:= batstr.toUpper(S);
diff --git a/monetdb5/mal/Tests/tst960.stable.out 
b/monetdb5/mal/Tests/tst960.stable.out
--- a/monetdb5/mal/Tests/tst960.stable.out
+++ b/monetdb5/mal/Tests/tst960.stable.out
@@ -65,7 +65,7 @@ function user.main():void;
 io.print(L);
 B := batcalc.==(S,"hello");
 io.print(B);
-C := batstr.like(S,"hello");
+C := batalgebra.like(S,"hello");
 io.print(C);
 U := batstr.toUpper(S);
 io.print(U);
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approve output

[Martin Kersten]

Changeset: 001914af1e2b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=001914af1e2b
Modified Files:
monetdb5/modules/mal/Tests/inspect05.stable.out.int128
Branch: default
Log Message:

Approve output


diffs (42 lines):

diff --git a/monetdb5/modules/mal/Tests/inspect05.stable.out.int128 
b/monetdb5/modules/mal/Tests/inspect05.stable.out.int128
--- a/monetdb5/modules/mal/Tests/inspect05.stable.out.int128
+++ b/monetdb5/modules/mal/Tests/inspect05.stable.out.int128
@@ -35,8 +35,6 @@ end main;
 # str  str str str 

str 
  # type
 
#-#
 [ "append",  "command",  "bat",  
"(i:bat[:any_1,:any_2],u:any_2,force:bit):bat[:any_1,:any_2] ", 

"BKCappend_val_force_wrap;" ]
-[ "append",  "command",  "bat",  
"(i:bat[:any_1,:void],u:any_1):bat[:any_1,:void] ", 
"BKCappend_reverse_val_wrap;"   
]
-[ "append",  "command",  "bat",  
"(i:bat[:void,:any_1],u:any_1):bat[:void,:any_1] ", 
"BKCappend_val_wrap;"   
]
 [ "append",  "command",  "bat",  
"(i:bat[:oid,:any_1],u:any_1):bat[:oid,:any_1] ",   
"BKCappend_val_wrap;"   
]
 [ "append",  "command",  "bat",  
"(i:bat[:any_1,:any_2],u:bat[:any_1,:any_2],force:bit):bat[:any_1,:any_2] ",
"BKCappend_force_wrap;" 
]
 [ "append",  "command",  "bat",  
"(i:bat[:any_1,:any_2],u:bat[:any_1,:any_2]):bat[:any_1,:any_2] ",  
"BKCappend_wrap;"   
]
@@ -52,7 +50,6 @@ end main;
 [ "getColumnType", "command",  "bat",  "(b:bat[:oid,:any_2]):str ",
"BKCgetColumnType;"  ]
 [ "getDelta","command",  "bat",  
"(b:bat[:any_1,:any_2]):bat[:any_1,:any_2] ",   
"BKCgetDelta;"  ]
 [ "getHeadType", "command",  "bat",  
"(b:bat[:any_1,:any_2]):str ",  
"BKCgetHeadType;"   ]
-[ "getHeat",   "command",  "bat",  "(b:bat[:oid,:any_2]):lng ",
"BKCheat;"  ]
 [ "getName",   "command",  "bat",  "(b:bat[:oid,:any_2]):str ",
"BKCgetBBPname;"  ]
 [ "getRole",   "command",  "bat",  "(bid:bat[:oid,:any_2]):str ",  
"BKCgetRole;"  ]
 [ "getSequenceBase", "command",  "bat",  
"(b:bat[:oid,:any_1]):oid ",
"BKCgetSequenceBase;"   ]
@@ -81,7 +78,6 @@ end main;
 [ "insert",  "command",  "bat",  
"(b:bat[:any_1,:any_2],src:bat[:any_1,:any_2],force:bit):bat[:any_1,:any_2] ",  
"BKCinsert_bat_force;"  
]
 [ "insert",  "command",  "bat",  
"(b:bat[:any_1,:any_2],src:bat[:any_1,:any_2]):bat[:any_1,:any_2] ",
"BKCinsert_bat;"
]
 [ "intersectcand",   "command",  "bat",  
"(a:bat[:oid,:oid],b:bat[:oid,:oid]):bat[:oid,:oid] ",  
"BKCintersectcand;" ]
-[ "isCached",  "command",  "bat",  "(b:bat[:oid,:any_2]):bit ",
"BKCisCached;"  ]
 [ "isPersistent",  "command",  "bat",  "(b:bat[:oid,:any_2]):bit ",
"BKCisPersistent;"  ]
 [ "isSorted",  "command",  "bat",  "(b:bat[:oid,:any_1]):bit ",
"BKCisSorted;"  ]
 [ "isSortedReverse",   "command",  "bat",  "(b:bat[:oid,:any_1]):bit ",
"BKCisSortedReverse;"  ]
@@ -115,11 +111,11 @@ end main;
 [ "save","command",  "bat",  
"(nme:str):bit ",   
"BKCsave;"  ]
 [ "save",  "command",  "b

MonetDB: default - Approve output

[Martin Kersten]

Changeset: 211cb31e24c0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=211cb31e24c0
Modified Files:
clients/Tests/exports.stable.out
sql/backends/monet5/Tests/limithack.stable.out
sql/backends/monet5/generator/Tests/generator01.stable.err
sql/backends/monet5/generator/Tests/generator04.stable.err
sql/test/BugTracker-2014/Tests/too_general_errmsg.Bug-3605.stable.err
sql/test/leaks/Tests/check1_bam.stable.out.int128
sql/test/leaks/Tests/check2_bam.stable.out.int128
sql/test/leaks/Tests/check3_bam.stable.out.int128
sql/test/leaks/Tests/check4_bam.stable.out.int128
sql/test/leaks/Tests/check5_bam.stable.out.int128
Branch: default
Log Message:

Approve output


diffs (truncated from 512 to 300 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
@@ -742,7 +742,6 @@ str ALGgroupby(bat *res, const bat *gids
 str ALGhsort(bat *result, const bat *bid);
 str ALGhsort_rev(bat *result, const bat *bid);
 str ALGhtsort(bat *result, const bat *lid);
-str ALGindexjoin(bat *result, const bat *lid, const bat *rid);
 str ALGjoin(bat *result, const bat *lid, const bat *rid);
 str ALGjoin2(bat *l, bat *r, const bat *lid, const bat *rid);
 str ALGjoinPath(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
diff --git a/sql/backends/monet5/Tests/limithack.stable.out 
b/sql/backends/monet5/Tests/limithack.stable.out
--- a/sql/backends/monet5/Tests/limithack.stable.out
+++ b/sql/backends/monet5/Tests/limithack.stable.out
@@ -67,7 +67,7 @@ Ready.
 % id,  name,   schema_id,  query,  type,   system, commit_action,  
readonly,   temporary # name
 % int, varchar,int,varchar,smallint,   boolean,
smallint,   boolean,tinyint # type
 % 4,   15, 4,  0,  1,  5,  1,  5,  1 # length
-[ 7194,"systemfunctions",  2000,   NULL,   0,  true,   0,  
false,  0   ]
+[ 7211,"systemfunctions",  2000,   NULL,   0,  true,   0,  
false,  0   ]
 
 # 17:27:34 >  
 # 17:27:34 >  "Done."
diff --git a/sql/backends/monet5/generator/Tests/generator01.stable.err 
b/sql/backends/monet5/generator/Tests/generator01.stable.err
--- a/sql/backends/monet5/generator/Tests/generator01.stable.err
+++ b/sql/backends/monet5/generator/Tests/generator01.stable.err
@@ -29,85 +29,85 @@ stderr of test 'generator01` in director
 # 12:42:21 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-23485" "--port=37579"
 # 12:42:21 >  
 
-MAPI  = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679
+MAPI  = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
 QUERY = select * from generate_series(0,10,-2);
 ERROR = !Illegal generator range
-MAPI  = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679
+MAPI  = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
 QUERY = select * from generate_series(10,2,2);
 ERROR = !Illegal generator range
-MAPI  = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679
+MAPI  = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
 QUERY = select * from generate_series(0,10,0) ;
 ERROR = !zero step size not allowed
-MAPI  = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679
+MAPI  = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
 QUERY = select * from generate_series(0,10,null) ;
 ERROR = !null step size not allowed
-MAPI  = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679
+MAPI  = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
 QUERY = select * from generate_series(null,10,1) ;
-ERROR = !Illegal generator range
-MAPI  = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679
+ERROR = !types tinyint(8,0) and timestamp(7,0) are not equal for column 'L2'
+MAPI  = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
 QUERY = select * from generate_series(cast(null as tinyint),10,1) ;
 ERROR = !Illegal generator range
-MAPI  = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679
+MAPI  = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
 QUERY = select * from generate_series(null,cast(10 as tinyint),cast(1 as 
tinyint)) ;
-ERROR = !Illegal generator range
-MAPI  = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679
+ERROR = !types tinyint(8,0) and timestamp(7,0) are not equal for column 'L1'
+MAPI  = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
 QUERY = select * from generate_series(cast(null as tinyint),cast(10 as 
tinyint),cast(1 as tinyint)) ;
 ERROR = !Illegal generator range
-MAPI  = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679
+MAPI  = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
 QUERY = select * from generate_series(cast(null as smallint),10,1) ;
 ERROR = !Illegal generator range
-MAPI  = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679
+MAPI  = (monetdb) /var/tmp/mtest-28786/.s.monetdb.30361
 QUERY = select * from generate_series(null,cast(10 as smallint),cast(1 as 
smallint)) ;
-ERROR = !Illegal generator range
-MAPI  = (monetdb) /

MonetDB: default - Approve output

[Martin Kersten]

Changeset: ad4146e92709 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ad4146e92709
Added Files:
sql/test/mergetables/Tests/mergekey.stable.err
sql/test/mergetables/Tests/mergekey.stable.out
Branch: default
Log Message:

Approve output


diffs (112 lines):

diff --git a/sql/test/mergetables/Tests/mergekey.stable.err 
b/sql/test/mergetables/Tests/mergekey.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/mergetables/Tests/mergekey.stable.err
@@ -0,0 +1,40 @@
+stderr of test 'mergekey` in directory 'sql/test/mergetables` itself:
+
+
+# 20:50:25 >  
+# 20:50:25 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=34630" "--set" 
"mapi_usock=/var/tmp/mtest-1158/.s.monetdb.34630" "--set" "monet_prompt=" 
"--forcemito" "--set" "mal_listing=2" 
"--dbpath=/export/scratch1/mk/default//Linux/var/MonetDB/mTests_sql_test_mergetables"
 "--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 20:50:25 >  
+
+# builtin opt  gdk_dbpath = 
/export/scratch1/mk/default//Linux/var/monetdb5/dbfarm/demo
+# builtin opt  gdk_debug = 0
+# builtin opt  gdk_vmtrim = no
+# builtin opt  monet_prompt = >
+# builtin opt  monet_daemon = no
+# builtin opt  mapi_port = 5
+# builtin opt  mapi_open = false
+# builtin opt  mapi_autosense = false
+# builtin opt  sql_optimizer = default_pipe
+# builtin opt  sql_debug = 0
+# cmdline opt  gdk_nr_threads = 0
+# cmdline opt  mapi_open = true
+# cmdline opt  mapi_port = 34630
+# cmdline opt  mapi_usock = /var/tmp/mtest-1158/.s.monetdb.34630
+# cmdline opt  monet_prompt = 
+# cmdline opt  mal_listing = 2
+# cmdline opt  gdk_dbpath = 
/export/scratch1/mk/default//Linux/var/MonetDB/mTests_sql_test_mergetables
+# cmdline opt  mal_listing = 0
+# cmdline opt  embedded_r = yes
+# cmdline opt  gdk_debug = 536870922
+
+# 20:50:25 >  
+# 20:50:25 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-1158" "--port=34630"
+# 20:50:25 >  
+
+MAPI  = (monetdb) /var/tmp/mtest-1158/.s.monetdb.34630
+QUERY = ALTER TABLE complete ADD TABLE partk2;
+
+
+# 20:50:25 >  
+# 20:50:25 >  "Done."
+# 20:50:25 >  
+
diff --git a/sql/test/mergetables/Tests/mergekey.stable.out 
b/sql/test/mergetables/Tests/mergekey.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/mergetables/Tests/mergekey.stable.out
@@ -0,0 +1,62 @@
+stdout of test 'mergekey` in directory 'sql/test/mergetables` itself:
+
+
+# 20:50:25 >  
+# 20:50:25 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=34630" "--set" 
"mapi_usock=/var/tmp/mtest-1158/.s.monetdb.34630" "--set" "monet_prompt=" 
"--forcemito" "--set" "mal_listing=2" 
"--dbpath=/export/scratch1/mk/default//Linux/var/MonetDB/mTests_sql_test_mergetables"
 "--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 20:50:25 >  
+
+# MonetDB 5 server v11.20.0
+# This is an unreleased version
+# Serving database 'mTests_sql_test_mergetables', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit 
integers dynamically linked
+# Found 15.590 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://vienna.ins.cwi.nl:34630/
+# Listening for UNIX domain connection requests on 
mapi:monetdb:///var/tmp/mtest-1158/.s.monetdb.34630
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/R   module loaded
+
+Ready.
+
+# 20:50:25 >  
+# 20:50:25 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-1158" "--port=34630"
+# 20:50:25 >  
+
+#CREATE TABLE partk1 ( x double, y double, z double);
+#ALTER TABLE partk1 ADD PRIMARY KEY (x,y,z);
+#COPY 4 RECORDS INTO partk1 FROM stdin USING DELIMITERS ' ','\n';
+#0.0 0.0 0.0
+#1.0 0.0 0.0 
+#0.0 1.0 0.0 
+#1.0 1.0 0.0 
+[ 4]
+#CREATE TABLE partk2 ( x double, y double, z double);
+#COPY 4 RECORDS INTO partk2 FROM stdin USING DELIMITERS ' ','\n';
+#2.0 0.0 0.0
+#3.0 0.0 0.0 
+#2.0 1.0 0.0 
+#3.0 1.0 0.0 
+[ 4]
+#CREATE MERGE TABLE complete ( x double, y double, z double);
+#ALTER TABLE complete ADD PRIMARY KEY (x,y,z);
+#ALTER TABLE complete ADD TABLE partk1;
+#SELECT * FROM COMPLETE;
+% sys.complete,sys.complete,   sys.complete # table_name
+% x,   y,  z # name
+% double,  double, double # type
+% 24,  24, 24 # length
+[ 0,   0,  0   ]
+[ 1,   0,  0   ]
+[ 0,   1,  0   ]
+[ 1,   1,  0   ]
+#DROP TABLE complete;
+#DROP TABLE partk1;
+#DROP TABLE partk2;
+
+# 20:50:25 >  
+# 20:50:25 >  "Done."
+# 20:50:25 >  
+
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approve output

[Martin Kersten]

Changeset: 126476ddc757 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=126476ddc757
Modified Files:
monetdb5/tests/suite_00/Tests/test_10.mal
monetdb5/tests/suite_00/Tests/test_10.stable.out
Branch: default
Log Message:

Approve output


diffs (135 lines):

diff --git a/monetdb5/tests/suite_00/Tests/test_10.mal 
b/monetdb5/tests/suite_00/Tests/test_10.mal
--- a/monetdb5/tests/suite_00/Tests/test_10.mal
+++ b/monetdb5/tests/suite_00/Tests/test_10.mal
@@ -10,9 +10,6 @@
ka_a := algebra.sort(s);
la_a := io.print(ka_a);
ma_a := io.printf("#~EndVariableOutput~#\n");
-   na_a := algebra.sortHT(s);
-   oa_a := io.print(na_a);
-   na := algebra.sortHT(s);
oa_a := io.print(na);
s := bat.new(nil:oid,nil:int);
pa_a := bat.append(s,1);
@@ -26,6 +23,3 @@
xa_a := algebra.sort(s);
ya_a := io.print(xa_a);
ab_a := io.printf("#~EndVariableOutput~#\n");
-   bb_a := algebra.sortHT(s);
-   cb_a := io.print(bb_a);
-   db_a := clients.quit();
diff --git a/monetdb5/tests/suite_00/Tests/test_10.stable.out 
b/monetdb5/tests/suite_00/Tests/test_10.stable.out
--- a/monetdb5/tests/suite_00/Tests/test_10.stable.out
+++ b/monetdb5/tests/suite_00/Tests/test_10.stable.out
@@ -5,14 +5,19 @@ stdout of test 'test_10` in directory 'm
 # 07:27:19 >  Mtimeout -timeout 60 mserver5 
"--config=/ufs/mk/monet5/Linux/etc/MonetDB5.conf" --debug=10 --set 
"monet_mod_path=/ufs/mk/monet5/Linux/lib/MonetDB5:/ufs/mk/opensource/MonetDB/Linux/lib/MonetDB"
 --set "gdk_dbfarm=/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm" --set 
"sql_logdir=/ufs/mk/monet5/Linux/var/MonetDB5/dblogs" --set mapi_port=35545 
--set monet_prompt= --trace --dbname=mTests_tests_suite_00  test_10.mal < 
/dev/null
 # 07:27:19 >  
 
-# MonetDB Server v4.99.19
-# Copyright (c) 1993-2006 CWI, all rights reserved
-# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs dynamically linked
-# config:/ufs/mk/monet5/Linux/etc/MonetDB5.conf
-# dbfarm:/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm
-# dbname:mTests_tests_suite_00
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:30579/
+# MonetDB 5 server v11.20.0
+# This is an unreleased version
+# Serving database 'mTests_monetdb5_tests_suite_00', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit 
integers dynamically linked
+# Found 15.590 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://vienna.ins.cwi.nl:33407/
+# Listening for UNIX domain connection requests on 
mapi:monetdb:///var/tmp/mtest-21327/.s.monetdb.33407
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
 function user.main():void;
 s := bat.new(nil:oid,nil:int);
 ca_a := bat.append(s,5);
@@ -28,11 +33,6 @@ function user.main():void;
 la_a := io.print(ka_a);
 #  io.print("printf(\"#~EndVariableOutput~#\\n\");"); 
 ma_a := io.printf("#~EndVariableOutput~#\n");
-#  io.print("sortHT(s).print();"); 
-na_a := algebra.sortHT(s);
-oa_a := io.print(na_a);
-#  io.print("sortHT(s).print();"); 
-na := algebra.sortHT(s);
 oa_a := io.print(na);
 s := bat.new(nil:oid,nil:int);
 pa_a := bat.append(s,1);
@@ -48,71 +48,7 @@ function user.main():void;
 ya_a := io.print(xa_a);
 #  io.print("printf(\"#~EndVariableOutput~#\\n\");"); 
 ab_a := io.printf("#~EndVariableOutput~#\n");
-#  io.print("sortHT(s).print();"); 
-bb_a := algebra.sortHT(s);
-cb_a := io.print(bb_a);
-#  io.print("quit();"); 
-db_a := clients.quit();
 end main;
-#~BeginVariableOutput~#
-#-#
-# th # name
-# int  int   # type
-#-#
-[ 0@0,   5   ]
-[ 1@0,   3   ]
-[ 2@0,   2   ]
-[ 3@0,   1   ]
-[ 4@0,   1   ]
-[ 5@0,   2   ]
-[ 6@0,   3   ]
-#~EndVariableOutput~#
-#-#
-# ht # name
-# int  int   # type
-#-#
-[ 0@0,   5   ]
-[ 1@0,   3   ]
-[ 2@0,   2   ]
-[ 3@0,   1   ]
-[ 4@0,   1   ]
-[ 5@0,   2   ]
-[ 6@0,   3   ]
-#-#
-# ht # name
-# int  int   # type
-#-#
-[ 0@0,   5   ]
-[ 1@0,   3   ]
-[ 2@0,   2   ]
-[ 3@0,   1   ]
-[ 4@0,   1   ]
-[ 5@0,   2   ]
-[ 6@0,   3   ]
-#~BeginVariableOutput~#
-#-#
-# th # name
-# int  int   # type
-#-#
-[ 0@0,   1   ]
-[ 1@0,   1   ]
-[ 2@0,   1   ]
-[ 3@0,   1   ]
-[ 4@0,   1   ]
-[ 5@0,   2   ]
-[ 6@0,   1   ]
-#~EndVariableOutput~#
-#-#
-# ht # name
-# int  int   # type
-#-#
-[ 0@0,   1   ]
-[ 1@0,   1   ]
-[ 2@0,   1   ]

MonetDB: default - Approve output

[Martin Kersten]

Changeset: 0ab947d3c70c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0ab947d3c70c
Modified Files:
monetdb5/modules/mal/Tests/inspect05.stable.out.int128
Branch: default
Log Message:

Approve output


diffs (116 lines):

diff --git a/monetdb5/modules/mal/Tests/inspect05.stable.out.int128 
b/monetdb5/modules/mal/Tests/inspect05.stable.out.int128
--- a/monetdb5/modules/mal/Tests/inspect05.stable.out.int128
+++ b/monetdb5/modules/mal/Tests/inspect05.stable.out.int128
@@ -17,6 +17,7 @@ stdout of test 'inspect05` in directory 
 # MonetDB/GIS module loaded
 # MonetDB/JAQL module loaded
 # MonetDB/SQL module loaded
+
 function user.main():void;
 #Illustrate the modules loaded after start 
 k := inspect.getKind();
@@ -30,104 +31,6 @@ function user.main():void;
 a := inspect.getAddresses();
 io.table(1,fs,k,m0,s,a);
 end main;
-#-#
-# hsymbol  symbol   symbol 

 symbol 
  # name
-# str  str str str 

str 
  # type
-#-#
-[ "append",  "command",  "bat",  
"(i:bat[:any_1,:any_2],u:any_2,force:bit):bat[:any_1,:any_2] ", 

"BKCappend_val_force_wrap;" ]
-[ "append",  "command",  "bat",  
"(i:bat[:oid,:any_1],u:any_1):bat[:oid,:any_1] ",   
"BKCappend_val_wrap;"   
]
-[ "append",  "command",  "bat",  
"(i:bat[:any_1,:any_2],u:bat[:any_1,:any_2],force:bit):bat[:any_1,:any_2] ",
"BKCappend_force_wrap;" 
]
-[ "append",  "command",  "bat",  
"(i:bat[:any_1,:any_2],u:bat[:any_1,:any_2]):bat[:any_1,:any_2] ",  
"BKCappend_wrap;"   
]
-[ "attach","command",  "bat",  "(tt:int,heapfile:str):bat[:oid,:any_1] 
",  "BKCattach;"  ]
-[ "delete",  "command",  "bat",  
"(b:bat[:any_1,:any_2],src:bat[:any_1,:any_2]):bat[:any_1,:any_2] ",
"BKCdelete_bat_bun;"
]
-[ "delete",  "command",  "bat",  
"(b:bat[:any_1,:any_2]):bat[:any_1,:any_2] ",   
"BKCdelete_all;"
]
-[ "delete",  "command",  "bat",  
"(b:bat[:any_1,:any_2],h:any_1):bat[:any_1,:any_2] ",   
"BKCdelete;"
]
-[ "delete",  "command",  "bat",  
"(b:bat[:any_1,:any_2],h:any_1,t:any_2):bat[:any_1,:any_2] ",   
"BKCdelete_bun;"
]
-[ "densebat",  "command",  "bat",  "(sz:wrd):bat[:oid,:oid] ", 
"BKCdensebat;"  ]
-[ "getAccess", "command",  "bat",  "(b:bat[:oid,:any_1]):str ",
"BKCgetAccess;"  ]
-[ "getAlpha","command",  "bat",  
"(b:bat[:any_1,:any_2]):bat[:any_1,:any_2] ",   
"BKCgetAlpha;"  ]
-[ "getCapacity",   "command",  "bat",  "(b:bat[:oid,:any_2]):lng ",
"BKCgetCapacity;"  ]
-[ "getColumnType", "command",  "bat",  "(b:bat[:oid,:any_2]):str ",
"BKCgetColumnType;"  ]
-[ "getDelta","command",  "bat",  
"(b:bat[:any_1,:any_2]):bat[:any_1,:any_2] ",   
"BKCgetDelta;"  ]
-[ "getHeadType", "command",  "bat",  
"(b:ba

MonetDB: default - Approve output

[Martin Kersten]

Changeset: 190bf2e77fc3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=190bf2e77fc3
Removed Files:
monetdb5/mal/Tests/tst4700.mal
monetdb5/optimizer/Tests/common.mal
monetdb5/optimizer/Tests/common.stable.err
monetdb5/optimizer/Tests/common.stable.out
monetdb5/optimizer/Tests/common01.mal
monetdb5/optimizer/Tests/common01.stable.err
monetdb5/optimizer/Tests/common01.stable.out
monetdb5/optimizer/Tests/inliners.mal
monetdb5/optimizer/Tests/mapreduce00.mal
monetdb5/optimizer/Tests/reorder01.mal
monetdb5/optimizer/Tests/reorder01.stable.err
monetdb5/optimizer/Tests/reorder01.stable.out
monetdb5/optimizer/Tests/tst4631.mal
monetdb5/optimizer/Tests/tst4631.stable.err
monetdb5/optimizer/Tests/tst4631.stable.out
monetdb5/optimizer/Tests/tst4730.mal
monetdb5/optimizer/Tests/tst4730.stable.err
monetdb5/optimizer/Tests/tst4730.stable.out
monetdb5/tests/gdkTests/Tests/binsemijoin2.mal
monetdb5/tests/gdkTests/Tests/binsemijoin2.stable.err
monetdb5/tests/gdkTests/Tests/binsemijoin2.stable.out
monetdb5/tests/suite_00/Tests/All
monetdb5/tests/suite_00/Tests/test_10.mal
monetdb5/tests/suite_00/Tests/test_10.stable.err
monetdb5/tests/suite_00/Tests/test_10.stable.out
monetdb5/tests/suite_00/Tests/test_40.mal
monetdb5/tests/suite_00/Tests/test_40.stable.err
monetdb5/tests/suite_00/Tests/test_40.stable.out
monetdb5/tests/suite_00/Tests/test_50.mal
monetdb5/tests/suite_00/Tests/test_50.stable.err
monetdb5/tests/suite_00/Tests/test_50.stable.out
Modified Files:
monetdb5/mal/Tests/recycle03.mal
monetdb5/mal/Tests/recycle03.stable.out
monetdb5/mal/Tests/recycle04.mal
monetdb5/mal/Tests/recycle04.stable.out
monetdb5/optimizer/Tests/All
monetdb5/tests/BugReports/Tests/no.051.mal
monetdb5/tests/BugReports/Tests/no.051.stable.out
monetdb5/tests/gdkTests/Tests/All
Branch: default
Log Message:

Approve output


diffs (truncated from 4284 to 300 lines):

diff --git a/monetdb5/mal/Tests/recycle03.mal b/monetdb5/mal/Tests/recycle03.mal
--- a/monetdb5/mal/Tests/recycle03.mal
+++ b/monetdb5/mal/Tests/recycle03.mal
@@ -36,7 +36,7 @@ function qry(low:int, hgh:int);
 x:bat[:oid,:oid]  := sql.tid(m,"sys","tbl");
 b:bat[:oid,:int]:= sql.bind(m,"sys","tbl","col",0);
 s1:= algebra.subselect(b,x,low,hgh,true,true,false);
-j:= algebra.semijoin(s1,b);
+j:= aggr.count(s1);
io.print(j);
 end qry;
 
diff --git a/monetdb5/mal/Tests/recycle03.stable.out 
b/monetdb5/mal/Tests/recycle03.stable.out
--- a/monetdb5/mal/Tests/recycle03.stable.out
+++ b/monetdb5/mal/Tests/recycle03.stable.out
@@ -49,7 +49,7 @@ function sql.qry(low:int,hgh:int):void;
 x:bat[:oid,:oid]  := sql.tid(m,"sys","tbl");
 b:bat[:oid,:int]  := sql.bind(m,"sys","tbl","col",0);
 s1 := algebra.subselect(b,x,low,hgh,true,true,false);
-j := algebra.semijoin(s1,b);
+j := aggr.count(s1);
 io.print(j);
 end qry;
 #
@@ -85,57 +85,40 @@ function sql.qry(low:int,hgh:int):void;
 x:bat[:oid,:oid]  := sql.tid(m,"sys","tbl");
 b:bat[:oid,:int]  := sql.bind(m,"sys","tbl","col",0);
 s1 := algebra.subselect(b,x,low,hgh,true,true,false);
-j := algebra.semijoin(s1,b);
+j := aggr.count(s1);
 io.print(j);
 end qry;
 [ "start" ]
-#-#
-# ht # name
-# void void  # type
-#--#
-[ 0@0, 1@0  ]
-[ 1@0, 2@0  ]
-[ 2@0, 3@0  ]
-[ 3@0, 4@0  ]
-[ 4@0, 5@0  ]
-[ 5@0, 6@0  ]
-[ 6@0, 7@0  ]
-[ 7@0, 8@0  ]
-[ 8@0, 9@0  ]
-[ 9@0, 10@0  ]
+#RECYCLE [  0] cost 5 mem 0 srch  -nan X_0 := sql.mvc();
+#RECYCLE [  1] cost 48 mem 88 srch 17.00 X_3 := 
sql.tid(X_0=1,X_2="sys",X_1="tbl");
+#RECYCLE [  2] cost 29 mem 48 srch 16.50 X_6 := 
sql.bind(X_0=1,X_2="sys",X_1="tbl",X_5="col",X_4=0);
+#RECYCLE [  3] cost 12 mem 0 srch 15.00 X_10 := 
algebra.subselect(X_6=,X_3=,X_0=1,X_9=10,X_8=true,X_8=true,X_7=false);
+#RECYCLE [  4] cost 1 mem 0 srch 14.50 X_11 := aggr.count(X_10=);
+[ 10 ]
 [ "zoom in" ]
-#-#
-# ht # name
-# void void  # type
-#--#
-[ 0@0, 1@0  ]
-[ 1@0, 2@0  ]
-[ 2@0, 3@0  ]
-[ 3@0, 4@0  ]
-[ 4@0, 5@0  ]
+#REUSED  [  0]  729590 (usec) X_0 := sql.mvc();
+#REUSED  [  1]  729594 (usec) X_3 := sql.tid(X_0=1,X_2="sys",X_1="tbl");
+#REUSED  [  2]  729599 (usec) X_6 := 
sql.bind(X_0=1,X_2="sys",X_1="tbl",X_5="col",X_4=0);
+#RECYCLE [  5] cost 10 mem 0 srch 12.80 X_13 := 
algebra.subselect(X_6=,X_10=,X_0=1,X_12=5,X_8=true,X_8=true,X_7=false);
+#REUSED  [  3]  12 (usec) X_10 := 
algebra.subselect(X_6=,X_3=,X_0=1,X_9=10,X_8=true,X_8=true,X_7=false);
+#RECYCLE [  6] cost 1 mem 0 srch 12.83 X_14 := aggr.count(X_13=);
+[ 5 ]
 [ "next step" ]
-#-#
-# ht # name
-# vo

MonetDB: default - Approve output

[Martin Kersten]

Changeset: 7ed1f3fd23d6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7ed1f3fd23d6
Modified Files:
clients/Tests/SQL-dump_all.stable.out.int128
clients/Tests/exports.stable.out
clients/mapiclient/Tests/stethoscope--help.stable.err
clients/mapiclient/Tests/tomograph--help.stable.err
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/mal/Tests/All
monetdb5/mal/Tests/tst272.mal
monetdb5/mal/Tests/tst272.stable.out
monetdb5/mal/Tests/tst273.mal
monetdb5/mal/Tests/tst274.mal
monetdb5/mal/Tests/tst274.stable.err
monetdb5/mal/Tests/tst274.stable.out.oid64
monetdb5/mal/Tests/tst275.mal
monetdb5/mal/Tests/tst275.stable.out
monetdb5/mal/Tests/tst901a.mal
monetdb5/mal/Tests/tst901a.stable.out
monetdb5/modules/mal/Tests/inspect00.stable.out
monetdb5/modules/mal/Tests/inspect05.stable.out.int128
sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/10-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/11-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/12-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/13-explain.stable.out.int128
sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
sql/benchmarks/tpch/Tests/02-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out.int128
sql/benchmarks/tpch/Tests/04-explain.stable.out
sql/benchmarks/tpch/Tests/05-explain.stable.out.int128
sql/benchmarks/tpch/Tests/06-explain.stable.out.int128
sql/benchmarks/tpch/Tests/07-explain.stable.out.int128
sql/benchmarks/tpch/Tests/08-explain.stable.out.int128
sql/benchmarks/tpch/Tests/09-explain.stable.out.int128
sql/benchmarks/tpch/Tests/10-explain.stable.out.int128
sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
sql/benchmarks/tpch/Tests/12-explain.stable.out.int128
sql/benchmarks/tpch/Tests/13-explain.stable.out
sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
sql/benchmarks/tpch/Tests/15-explain.stable.out.int128
sql/benchmarks/tpch/Tests/16-explain.stable.out
sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
sql/benchmarks/tpch/Tests/18-explain.stable.out.int128
sql/benchmarks/tpch/Tests/19-explain.stable.out.int128
sql/benchmarks/tpch/Tests/20-explain.stable.out.int128
sql/benchmarks/tpch/Tests/21-explain.stable.out
sql/benchmarks/tpch/Tests/22-explain.stable.out.int128
sql/jdbc/tests/Tests/Test_Dobjects_bam.stable.out
sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out

sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out

sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
sql/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.sql
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out

sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128
sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/Tests/systemfunctions_bam.stable.out.int128
sql/test/Tests/trace.stable.out.int128
sql/test/leaks/Tests/check1_bam.stable.out.int128
sql/test/leaks/Tests/check2_bam.stable.out.int128
sql/test/leaks/Tests/check3_bam.stable.out.int128
sql/test/leaks/Tests/check4_bam.stable.out.int128
sql/test/leaks/Tests/check5_bam.stable.out.int128
sql/test/mapi/Tests/sql_int128.stable.out
sql/test/mergetables/Tests/mergequery.stable.out
Branch: default
Log Message:

Approve output


diffs (truncated from 5144 to 300 lines):

diff --git a/clients/Tests/SQL-dump_all.stable.out.int128 
b/clients/Tests/SQ

MonetDB: default - Approve output

[Martin Kersten]

Changeset: dbed55a1ad58 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dbed55a1ad58
Modified Files:
sql/test/mergetables/Tests/mergequery.stable.out
Branch: default
Log Message:

Approve output


diffs (truncated from 891 to 300 lines):

diff --git a/sql/test/mergetables/Tests/mergequery.stable.out 
b/sql/test/mergetables/Tests/mergequery.stable.out
--- a/sql/test/mergetables/Tests/mergequery.stable.out
+++ b/sql/test/mergetables/Tests/mergequery.stable.out
@@ -90,226 +90,200 @@ Ready.
 % clob # type
 % 127 # length
 function user.s13_1{autoCommit=true}(A0:dbl,A1:dbl):void;
-X_83:void  := querylog.define("explain insert into answ\nselect * from 
complete where x>=1.0 and x <=2.0;","default_pipe");
-barrier X_290 := language.dataflow();
+X_61:void  := querylog.define("explain insert into answ\nselect * from 
complete where x>=1.0 and x <=2.0;","default_pipe");
+barrier X_295 := language.dataflow();
 X_4 := sql.mvc();
 X_5:bat[:oid,:dbl]  := bat.new(nil:oid,nil:dbl);
-X_8:bat[:oid,:oid]  := sql.tid(X_4,"sys","part1");
-X_11:bat[:oid,:dbl]  := sql.bind(X_4,"sys","part1","x",0);
-X_107:bat[:oid,:dbl]  := sql.bind(X_4,"sys","part1","x",0,0,4);
-X_109:bat[:oid,:dbl]  := sql.bind(X_4,"sys","part1","x",0,1,4);
-X_111:bat[:oid,:dbl]  := sql.bind(X_4,"sys","part1","x",0,2,4);
-X_113:bat[:oid,:dbl]  := sql.bind(X_4,"sys","part1","x",0,3,4);
-(X_14,r1_14) := sql.bind(X_4,"sys","part1","x",2);
-(X_114:bat[:oid,:oid] ,X_115:bat[:oid,:dbl] ) := 
sql.bind(X_4,"sys","part1","x",2,0,4);
-(X_116:bat[:oid,:oid] ,X_117:bat[:oid,:dbl] ) := 
sql.bind(X_4,"sys","part1","x",2,1,4);
-(X_118:bat[:oid,:oid] ,X_119:bat[:oid,:dbl] ) := 
sql.bind(X_4,"sys","part1","x",2,2,4);
-(X_120:bat[:oid,:oid] ,X_121:bat[:oid,:dbl] ) := 
sql.bind(X_4,"sys","part1","x",2,3,4);
-X_17:bat[:oid,:dbl]  := sql.bind(X_4,"sys","part1","x",1);
-X_208 := mat.packIncrement(X_107,4);
-X_209 := mat.packIncrement(X_208,X_109);
-X_210 := mat.packIncrement(X_209,X_111);
-exit X_290;
-barrier X_302 := language.dataflow();
-X_11:bat[:oid,:dbl]  := mat.packIncrement(X_210,X_113);
-X_97 := algebra.subselect(X_11,X_8,A0,A1,true,true,false);
-X_192 := algebra.subselect(X_115,nil:bat[:oid,:oid],A0,A1,true,true,false);
-X_193 := algebra.subselect(X_117,nil:bat[:oid,:oid],A0,A1,true,true,false);
-X_194 := algebra.subselect(X_119,nil:bat[:oid,:oid],A0,A1,true,true,false);
-X_195 := algebra.subselect(X_121,nil:bat[:oid,:oid],A0,A1,true,true,false);
-X_100 := algebra.subselect(X_17,X_8,A0,A1,true,true,false);
-X_212 := mat.packIncrement(X_114,4);
-X_213 := mat.packIncrement(X_212,X_116);
-X_214 := mat.packIncrement(X_213,X_118);
-X_14 := mat.packIncrement(X_214,X_120);
-X_216 := mat.packIncrement(X_192,4);
-X_217 := mat.packIncrement(X_216,X_193);
-X_218 := mat.packIncrement(X_217,X_194);
-X_98 := mat.packIncrement(X_218,X_195);
-X_19 := sql.subdelta(X_97,X_8,X_14,X_98,X_100);
-X_220 := mat.packIncrement(X_115,4);
-X_221 := mat.packIncrement(X_220,X_117);
-X_222 := mat.packIncrement(X_221,X_119);
-r1_14 := mat.packIncrement(X_222,X_121);
-X_21 := sql.projectdelta(X_19,X_11,X_14,r1_14,X_17);
-X_22 := bat.append(X_5,X_21,true);
-X_23:bat[:oid,:oid]  := sql.tid(X_4,"sys","part2");
-X_25:bat[:oid,:dbl]  := sql.bind(X_4,"sys","part2","x",0);
-X_122:bat[:oid,:dbl]  := sql.bind(X_4,"sys","part2","x",0,0,4);
-X_123:bat[:oid,:dbl]  := sql.bind(X_4,"sys","part2","x",0,1,4);
-X_124:bat[:oid,:dbl]  := sql.bind(X_4,"sys","part2","x",0,2,4);
-X_125:bat[:oid,:dbl]  := sql.bind(X_4,"sys","part2","x",0,3,4);
-(X_26,r1_30) := sql.bind(X_4,"sys","part2","x",2);
-(X_126:bat[:oid,:oid] ,X_127:bat[:oid,:dbl] ) := 
sql.bind(X_4,"sys","part2","x",2,0,4);
-(X_128:bat[:oid,:oid] ,X_129:bat[:oid,:dbl] ) := 
sql.bind(X_4,"sys","part2","x",2,1,4);
-(X_130:bat[:oid,:oid] ,X_131:bat[:oid,:dbl] ) := 
sql.bind(X_4,"sys","part2","x",2,2,4);
-(X_132:bat[:oid,:oid] ,X_133:bat[:oid,:dbl] ) := 
sql.bind(X_4,"sys","part2","x",2,3,4);
-X_28:bat[:oid,:dbl]  := sql.bind(X_4,"sys","part2","x",1);
-X_224 := mat.packIncrement(X_122,4);
-X_225 := mat.packIncrement(X_224,X_123);
-X_226 := mat.packIncrement(X_225,X_124);
+X_88:bat[:oid,:dbl]  := sql.bind(X_4,"sys","part1","x",0,0,4);
+X_81:bat[:oid,:oid]  := sql.tid(X_4,"sys","part1",0,4);
+X_175 := algebra.subselect(X_88,X_81,A0,A1,true,true,false);
+(X_92:bat[:oid,:oid] ,X_93:bat[:oid,:dbl] ) := 
sql.bind(X_4,"sys","part1","x",2,0,4);
+X_179 := algebra.subselect(X_93,nil:bat[:oid,:oid],A0,A1,true,true,false);
+X_186 := sql.subdelta(X_175,X_81,X_92,X_179);
+X_190 := sql.projectdelta(X_186,X_88,X_92,X_93);
+X_89:bat[:oid,:dbl]  := sql.bind(X_4,"sys","part1","x",0,1,4);
+X_83:bat[:oid,:oid]  := sql.tid(X_4,"sys","part1",1,4);
+X_176 := algebra.subselect(X_89,X_83,A0,A1,true,true,false

MonetDB: default - Approve output

[Martin Kersten]

Changeset: 047ceceba818 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=047ceceba818
Modified Files:
monetdb5/optimizer/Tests/dataflow5.stable.out
monetdb5/optimizer/Tests/inline02.stable.out
monetdb5/optimizer/Tests/inline03.stable.out
monetdb5/optimizer/Tests/inline04.stable.out
monetdb5/optimizer/Tests/inline05.stable.out
monetdb5/optimizer/Tests/inline06.stable.out
monetdb5/optimizer/Tests/inline07.stable.out
monetdb5/optimizer/Tests/inline08.stable.out
monetdb5/optimizer/Tests/inline10.stable.out
monetdb5/optimizer/Tests/tst4700.stable.out
Branch: default
Log Message:

Approve output


diffs (truncated from 327 to 300 lines):

diff --git a/monetdb5/optimizer/Tests/dataflow5.stable.out 
b/monetdb5/optimizer/Tests/dataflow5.stable.out
--- a/monetdb5/optimizer/Tests/dataflow5.stable.out
+++ b/monetdb5/optimizer/Tests/dataflow5.stable.out
@@ -21,9 +21,9 @@ stdout of test 'dataflow5` in directory 
 # MonetDB/DataCell loaded
 function user.tst():void;
 b := bat.new(:oid,:int);
-bat.insert(b,0@0,1);
-bat.insert(b,1@0,2);
-bat.insert(b,2@0,3);
+bat.append(b,1);
+bat.append(b,2);
+bat.append(b,3);
 io.print(b);
 end user.tst;
 function user.main():void;
@@ -33,16 +33,16 @@ function user.main():void;
 end user.main;
 function user.tst():void;
 b := bat.new(:oid,:int);
-bat.insert(b,0@0,1);
-bat.insert(b,1@0,2);
-bat.insert(b,2@0,3);
+bat.append(b,1);
+bat.append(b,2);
+bat.append(b,3);
 io.print(b);
 end user.tst;
 function user.tst():void;
 b := bat.new(:oid,:int);
-bat.insert(b,0@0,1);
-bat.insert(b,1@0,2);
-bat.insert(b,2@0,3);
+bat.append(b,1);
+bat.append(b,2);
+bat.append(b,3);
 io.print(b);
 end user.tst;
 
diff --git a/monetdb5/optimizer/Tests/inline02.stable.out 
b/monetdb5/optimizer/Tests/inline02.stable.out
--- a/monetdb5/optimizer/Tests/inline02.stable.out
+++ b/monetdb5/optimizer/Tests/inline02.stable.out
@@ -17,7 +17,7 @@ function user.foo{inline}(a:int,b:int):i
 end user.foo;
 function user.qry():void;
 b := bat.new(:oid,:int);
-bat.insert(b,0@0,1);
+bat.append(b,1);
 zz := user.foo(1,2);
 # base line test for inlining 
 z:bat[:oid,:int]  := mal.multiplex("user","foo",b,b);
@@ -30,14 +30,14 @@ function user.main():void;
 end user.main;
 function user.qry():void;   #  0 qry:void := user.qry() {G}
 b := bat.new(:oid,:int);#  1 b:bat[:oid,:int] := 
CMDBATnew(_2:oid, _3:int) {G}
-bat.insert(b,0@0,1);#  2 _4:bat[:oid,:int] := 
BKCinsert_bun(b:bat[:oid,:int], _5:oid, _6:int) {G}
-X_16 := calc.+(1,2);#  3 _16:int := 
CMDvarADDsignal(_6:int, _8:int) 
-zz := X_16; #  4 zz:int := _16:int 
+bat.append(b,1);#  2 _4:bat[:oid,:int] := 
BKCappend_val_wrap(b:bat[:oid,:int], _5:int) {G}
+X_15 := calc.+(1,2);#  3 _15:int := 
CMDvarADDsignal(_5:int, _7:int) 
+zz := X_15; #  4 zz:int := _15:int 
 # base line test for inlining 
-X_20 := batcalc.+(b,b); #  6 _20:bat[:oid,:int] := 
CMDbatADDsignal(b:bat[:oid,:int], b:bat[:oid,:int]) {G}
-z:bat[:oid,:int] {inline} := X_20;  #  7 z:bat[:oid,:int] := 
_20:bat[:oid,:int] {G}
-X_24 := batcalc.+(b,2); #  8 _24:bat[:oid,:int] := 
CMDbatADDsignal(b:bat[:oid,:int], _8:int) {G}
-z:bat[:oid,:int] {inline} := X_24;  #  9 z:bat[:oid,:int] := 
_24:bat[:oid,:int] {G}
+X_19 := batcalc.+(b,b); #  6 _19:bat[:oid,:int] := 
CMDbatADDsignal(b:bat[:oid,:int], b:bat[:oid,:int]) {G}
+z:bat[:oid,:int] {inline} := X_19;  #  7 z:bat[:oid,:int] := 
_19:bat[:oid,:int] {G}
+X_23 := batcalc.+(b,2); #  8 _23:bat[:oid,:int] := 
CMDbatADDsignal(b:bat[:oid,:int], _7:int) {G}
+z:bat[:oid,:int] {inline} := X_23;  #  9 z:bat[:oid,:int] := 
_23:bat[:oid,:int] {G}
 end user.qry;   # 10  
 
 # 18:00:43 >  
diff --git a/monetdb5/optimizer/Tests/inline03.stable.out 
b/monetdb5/optimizer/Tests/inline03.stable.out
--- a/monetdb5/optimizer/Tests/inline03.stable.out
+++ b/monetdb5/optimizer/Tests/inline03.stable.out
@@ -19,7 +19,7 @@ function user.foo{inline}(a:int,b:int):i
 end user.foo;
 function user.qry():void;
 b := bat.new(:oid,:int);
-bat.insert(b,0@0,1);
+bat.append(b,1);
 z:bat[:oid,:int]  := mal.multiplex("user","foo",b,b);
 z:bat[:oid,:int]  := mal.multiplex("user","foo",b,2);
 end user.qry;
@@ -30,15 +30,15 @@ function user.main():void;
 end user.main;
 function user.qry():void;   #  0 qry:void := user.qry() {G}
 b := bat.new(:oid,:int);#  1 b:bat[:oid,:int] := 
CMDBATnew(_2:oid, _3:int) {G}
-bat.insert(b,0@0,1);#  2 _4:bat[:oid,:int] := 
BKCinsert_bun(b:bat[:oid,:int], _5:oid, _6:int) {G}
-X_14 := 1;  #  3 _14:int := _6:int 
- 

MonetDB: default - Approve output

[Martin Kersten]

Changeset: e581d7b5d5d1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e581d7b5d5d1
Modified Files:
monetdb5/optimizer/Tests/inline08.stable.out
monetdb5/optimizer/Tests/reorder00.stable.out
Branch: default
Log Message:

Approve output


diffs (33 lines):

diff --git a/monetdb5/optimizer/Tests/inline08.stable.out 
b/monetdb5/optimizer/Tests/inline08.stable.out
--- a/monetdb5/optimizer/Tests/inline08.stable.out
+++ b/monetdb5/optimizer/Tests/inline08.stable.out
@@ -26,7 +26,7 @@ function user.bar{inline}(a:str,b:str):s
 c := calc.+(sa,sb);
 return bar := c;
 end user.bar;
-
+!TypeException:user.qry[2]:'bat.append' undefined in: _4:any := 
bat.append(b:bat[:oid,:str], _5:int)
 function user.qry():void;
 b := bat.new(:oid,:str);
 bat.append(b,1);
diff --git a/monetdb5/optimizer/Tests/reorder00.stable.out 
b/monetdb5/optimizer/Tests/reorder00.stable.out
--- a/monetdb5/optimizer/Tests/reorder00.stable.out
+++ b/monetdb5/optimizer/Tests/reorder00.stable.out
@@ -18,7 +18,7 @@ function user.tst903():void;
 barrier i := 0:lng;
 k := mmath.rand();
 l := calc.lng(k);
-bat.insert(b,nil:oid,l);
+bat.append(b,l);
 redo i := iterator.next(1:lng,100:lng);
 exit i;
 t1 := alarm.usec();
@@ -128,7 +128,7 @@ function user.tst903():void;
 barrier i := 0:lng;
 k := mmath.rand();
 l := calc.lng(k);
-bat.insert(b,nil:oid,l);
+bat.append(b,l);
 redo i := iterator.next(1:lng,100:lng);
 exit i;
 t1 := alarm.usec();
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approve output

[Martin Kersten]

Changeset: 6136f997051a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6136f997051a
Removed Files:
monetdb5/modules/kernel/Tests/vacuum.mal
monetdb5/modules/kernel/Tests/vacuum.stable.err
monetdb5/modules/kernel/Tests/vacuum.stable.out
Modified Files:
clients/Tests/exports.stable.out
monetdb5/modules/kernel/Tests/All
monetdb5/modules/mal/Tests/inspect05.stable.out.int128
monetdb5/optimizer/Tests/dataflow3.mal
sql/test/BugTracker-2015/Tests/reserved_keywords.Bug-3613.stable.err
sql/test/BugTracker-2015/Tests/reserved_keywords.Bug-3613.stable.out
sql/test/Tests/setoptimizer.stable.err
sql/test/Tests/setoptimizer.stable.out
sql/test/Tests/systemfunctions_bam.stable.out.int128
sql/test/leaks/Tests/check1_bam.stable.out.int128
sql/test/leaks/Tests/check2_bam.stable.out.int128
sql/test/leaks/Tests/check3_bam.stable.out.int128
sql/test/leaks/Tests/check4_bam.stable.out.int128
sql/test/leaks/Tests/check5_bam.stable.out.int128
Branch: default
Log Message:

Approve output


diffs (truncated from 808 to 300 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
@@ -1545,7 +1545,6 @@ str MKEYhash(Client cntxt, MalBlkPtr mb,
 str MKEYrotate(wrd *ret, const wrd *v, const int *nbits);
 str MKEYrotate_xor_hash(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
 void MPresetProfiler(stream *fdout);
-str MRgetCloud(bat *ret, str *nme);
 char *MSP_locate_sqlscript(const char *mod_name, bit recurse);
 void MSinitClientPrg(Client cntxt, str mod, str nme);
 void MSresetInstructions(MalBlkPtr mb, int start);
@@ -1684,7 +1683,6 @@ str OCTOPUSrun(Client cntxt, MalBlkPtr m
 int OPTaccumulatorsImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
 void OPTaliasRemap(InstrPtr p, int *alias);
 int OPTaliasesImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr p);
-int OPTcentipedeImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
 int OPTclusterImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr p);
 int OPTcoercionImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
 int OPTcommonTermsImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
@@ -1707,7 +1705,6 @@ str OPTlegAdvice(Client cntxt, MalBlkPtr
 int OPTlegAdviceInternal(MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
 str OPTmacro(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
 int OPTmacroImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
p);
-int OPTmapreduceImplementation(Client cntxt, MalBlkPtr reduce, MalStkPtr stk, 
InstrPtr pc);
 int OPTmatpackImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
 int OPTmergetableImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr p);
 int OPTmitosisImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr p);
@@ -1716,7 +1713,6 @@ str OPTmultiplexSimple(Client cntxt);
 int OPToctopusImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
 str OPTorcam(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
 int OPTorcamImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
p);
-str OPTpeers(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
 int OPTpushrangesImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
 int OPTpushselectImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
 int OPTquerylogImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
@@ -1726,9 +1722,6 @@ 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 OPTstrengthReductionImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr 
stk, InstrPtr pci);
-str OPTvector(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str OPTvectorOid(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
 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);
@@ -2148,7 +2141,6 @@ int canBeCrackedProp;
 int canBeJoinselectProp;
 str catalogRef;
 str catchKernelException(Client cntxt, str ret);
-str centipedeRef;
 int charCst(Client cntxt, ValPtr val);
 void chkDeclarations(stream *out, MalBlkPtr mb);
 void chkFlow(stream *out, MalBlkPtr mb);
diff --git a/monetdb5/modules/kernel/Tests/All 
b/monetdb5/modules/kernel/Tests/All
--- a/monetdb5/modules/kernel/Tests/All
+++ b/monetdb5/modules/kernel/Tests/All
@@ -1,4 +1,3 @@
 time01
 TriBool
-vacuum
 batstr
diff --git a/monetdb5/mod

MonetDB: default - Approve output.

[Sjoerd Mullender]

Changeset: b498b7ceb798 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b498b7ceb798
Modified Files:
clients/mapiclient/Tests/mclient--help.stable.err
clients/mapiclient/Tests/mclient--help.stable.err.Windows
Branch: default
Log Message:

Approve output.


diffs (22 lines):

diff --git a/clients/mapiclient/Tests/mclient--help.stable.err 
b/clients/mapiclient/Tests/mclient--help.stable.err
--- a/clients/mapiclient/Tests/mclient--help.stable.err
+++ b/clients/mapiclient/Tests/mclient--help.stable.err
@@ -38,6 +38,7 @@ SQL specific opions
  -w nr   | --width=nr for pagination
  -D  | --dump create an SQL dump
  -N  | --inserts  use INSERT INTO statements when dumping
+ -P  | --progress show progress bar
 The file argument can be - for stdin
 
 # 18:57:57 >  
diff --git a/clients/mapiclient/Tests/mclient--help.stable.err.Windows 
b/clients/mapiclient/Tests/mclient--help.stable.err.Windows
--- a/clients/mapiclient/Tests/mclient--help.stable.err.Windows
+++ b/clients/mapiclient/Tests/mclient--help.stable.err.Windows
@@ -37,6 +37,7 @@ SQL specific opions
  -w nr   | --width=nr for pagination
  -D  | --dump create an SQL dump
  -N  | --inserts  use INSERT INTO statements when dumping
+ -P  | --progress show progress bar
 The file argument can be - for stdin
 
 # 18:57:57 >  
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approve output.

[Sjoerd Mullender]

Changeset: d08f48a5f055 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d08f48a5f055
Modified Files:
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out

monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
Branch: default
Log Message:

Approve output.


diffs (136 lines):

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
@@ -61,18 +61,18 @@ Ready.
 % .explain # table_name
 % mal # name
 % clob # type
-% 150 # length
+% 131 # length
 function user.s4_1{autoCommit=true}():void;
-X_25:void  := querylog.define("explain copy into ttt from 
\\'/tmp/xyz\\';","default_pipe",12);
-barrier X_34 := language.dataflow();
+X_26:void := querylog.define("explain copy into ttt from 
\\'/tmp/xyz\\';","default_pipe",12);
+barrier X_35 := language.dataflow();
 X_2 := sql.mvc();
-(X_13:bat[:oid,:int] ,X_14:bat[:oid,:int] ,X_15:bat[:oid,:int] ) := 
sql.copy_from("sys","ttt","|","\\n",nil:str,"null","/tmp/xyz",-1:lng,0:lng,0);
-exit X_34;
-X_16 := sql.append(X_2,"sys","ttt","a",X_13);
-X_18 := sql.append(X_16,"sys","ttt","b",X_14);
-X_20 := sql.append(X_18,"sys","ttt","c",X_15);
-X_22 := aggr.count(X_15);
-sql.affectedRows(X_20,X_22,"");
+(X_12:bat[:oid,:int],X_13:bat[:oid,:int],X_14:bat[:oid,:int]) := 
sql.copy_from(nil,"|","\\n",nil:str,"null","/tmp/xyz",-1,0,0);
+exit X_35;
+X_15 := sql.append(X_2,"sys","ttt","a",X_12);
+X_19 := sql.append(X_15,"sys","ttt","b",X_13);
+X_21 := sql.append(X_19,"sys","ttt","c",X_14);
+X_23 := aggr.count(X_14);
+sql.affectedRows(X_21,X_23,"");
 end user.s4_1;
 #declare opt_pipe_name string;
 #set opt_pipe_name = ( select optimizer );
@@ -95,18 +95,18 @@ end user.s4_1;
 % .explain # table_name
 % mal # name
 % clob # type
-% 150 # length
+% 131 # length
 function user.s12_1{autoCommit=true}():void;
-X_25:void  := querylog.define("explain copy into ttt from 
\\'/tmp/xyz\\';","user_1",12);
-barrier X_35 := language.dataflow();
+X_26:void := querylog.define("explain copy into ttt from 
\\'/tmp/xyz\\';","user_1",12);
+barrier X_36 := language.dataflow();
 X_2 := sql.mvc();
-(X_13:bat[:oid,:int] ,X_14:bat[:oid,:int] ,X_15:bat[:oid,:int] ) := 
sql.copy_from("sys","ttt","|","\\n",nil:str,"null","/tmp/xyz",-1:lng,0:lng,0);
-exit X_35;
-X_16 := sql.append(X_2,"sys","ttt","a",X_13);
-X_18 := sql.append(X_16,"sys","ttt","b",X_14);
-X_22 := aggr.count(X_15);
-X_20 := sql.append(X_18,"sys","ttt","c",X_15);
-sql.affectedRows(X_20,X_22,"");
+(X_12:bat[:oid,:int],X_13:bat[:oid,:int],X_14:bat[:oid,:int]) := 
sql.copy_from(nil,"|","\\n",nil:str,"null","/tmp/xyz",-1,0,0);
+exit X_36;
+X_15 := sql.append(X_2,"sys","ttt","a",X_12);
+X_19 := sql.append(X_15,"sys","ttt","b",X_13);
+X_23 := aggr.count(X_14);
+X_21 := sql.append(X_19,"sys","ttt","c",X_14);
+sql.affectedRows(X_21,X_23,"");
 end user.s12_1;
 #drop table ttt;
 
diff --git 
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
 
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
old mode 100644
new mode 100755
--- 
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
+++ 
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
@@ -55,24 +55,22 @@ Ready.
 % .L # table_name
 % def # name
 % clob # type
-% 470 # length
-[ 
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptySet();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.garbageCollector();"
 ]
+% 449 # length
+[ 
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.garbageCollector();"
  ]
 #explain copy into ttt from 'a:\tmp/xyz';
 % .explain # table_name
 % mal # name
 % clob # type
-% 153 # length
+% 134 # length
 function user.s4_1{autoCommit=true}():void;
-X_25:void  := querylog.define("explain copy into ttt from 
\\'a:tmp/xyz\\';","default_pipe");
-barrier X_34 := language.dataflow();
+X_26:void := querylog

MonetDB: default - Approve output.

[Sjoerd Mullender]

Changeset: c9ed01d5d48f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c9ed01d5d48f
Added Files:

monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single
Modified Files:

monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
Branch: default
Log Message:

Approve output.


diffs (146 lines):

diff --git 
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
 
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
--- 
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
+++ 
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
@@ -63,9 +63,11 @@ Ready.
 % clob # type
 % 134 # length
 function user.s4_1{autoCommit=true}():void;
-X_26:void := querylog.define("explain copy into ttt from 
\\'a:tmp/xyz\\';","default_pipe",10);
+X_26:void := querylog.define("explain copy into ttt from 
\\'a:tmp/xyz\\';","default_pipe",12);
+barrier X_35 := language.dataflow();
 X_2 := sql.mvc();
 (X_12:bat[:oid,:int],X_13:bat[:oid,:int],X_14:bat[:oid,:int]) := 
sql.copy_from(nil,"|","\\n",nil:str,"null","a:\\tmp/xyz",-1,0,0);
+exit X_35;
 X_15 := sql.append(X_2,"sys","ttt","a",X_12);
 X_19 := sql.append(X_15,"sys","ttt","b",X_13);
 X_21 := sql.append(X_19,"sys","ttt","c",X_14);
@@ -95,9 +97,11 @@ end user.s4_1;
 % clob # type
 % 133 # length
 function user.s12_1{autoCommit=true}():void;
-X_26:void := querylog.define("explain copy into ttt from 
\\'Z:/tmp/xyz\\';","user_1",10);
+X_26:void := querylog.define("explain copy into ttt from 
\\'Z:/tmp/xyz\\';","user_1",12);
+barrier X_36 := language.dataflow();
 X_2 := sql.mvc();
 (X_12:bat[:oid,:int],X_13:bat[:oid,:int],X_14:bat[:oid,:int]) := 
sql.copy_from(nil,"|","\\n",nil:str,"null","Z:/tmp/xyz",-1,0,0);
+exit X_36;
 X_15 := sql.append(X_2,"sys","ttt","a",X_12);
 X_19 := sql.append(X_15,"sys","ttt","b",X_13);
 X_23 := aggr.count(X_14);
diff --git 
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single 
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single
new file mode 100644
--- /dev/null
+++ 
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single
@@ -0,0 +1,112 @@
+stdout of test 'opt_sql_append` in directory 
'monetdb5/extras/mal_optimizer_template` itself:
+
+
+# 22:58:57 >  
+# 22:58:57 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"gdk_dbfarm=/ufs/manegold/_/Monet/HG/default/prefix/_/var/MonetDB" "--set" 
"mapi_open=true" "--set" "mapi_port=36275" "--set" "monet_prompt=" "--trace" 
"--forcemito" "--set" "mal_listing=2" 
"--dbname=mTests_extras_mal_optimizer_template" "--set" "mal_listing=0"
+# 22:58:57 >  
+
+# MonetDB 5 server v11.8.0
+# This is an unreleased version
+# Serving database 'mTests_extras_mal_optimizer_template', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically 
linked
+# Found 15.630 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://rome.ins.cwi.nl:36275/
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+# SQL catalog created, loading sql scripts once
+# loading sql script: 09_like.sql
+# loading sql script: 10_math.sql
+# loading sql script: 11_times.sql
+# loading sql script: 12_url.sql
+# loading sql script: 13_date.sql
+# loading sql script: 14_inet.sql
+# loading sql script: 15_history.sql
+# loading sql script: 16_tracelog.sql
+# loading sql script: 17_compress.sql
+# loading sql script: 18_dictionary.sql
+# loading sql script: 19_cluster.sql
+# loading sql script: 20_vacuum.sql
+# loading sql script: 21_dependency_functions.sql
+# loading sql script: 22_clients.sql
+# loading sql script: 23_skyserver.sql
+# loading sql script: 24_zorder.sql
+# loading sql script: 25_debug.sql
+# loading sql script: 40_geom.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 99_system.sql
+
+# 22:58:57 >  
+# 22:58:57 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=rome" 
"--port=36275"
+# 22:58:57 >  
+
+#create table ttt (a int, b int, c int);
+#select optimizer;
+% .L # table_name
+% single_value # name
+% varchar # type
+% 12 # length
+[ "default_pipe"   ]
+#select def from optimizers() where name = optimizer;
+% .L # table_name
+% def # name
+% clob # type
+% 449 # length
+[ 
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();opt

MonetDB: default - Approve output

[Martin van Dinther]

Changeset: 8a3bca1189ae for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8a3bca1189ae
Modified Files:
sql/test/pg_regress/Tests/int8.stable.err
sql/test/pg_regress/Tests/int8.stable.out
Branch: default
Log Message:

Approve output


diffs (34 lines):

diff --git a/sql/test/pg_regress/Tests/int8.stable.err 
b/sql/test/pg_regress/Tests/int8.stable.err
--- a/sql/test/pg_regress/Tests/int8.stable.err
+++ b/sql/test/pg_regress/Tests/int8.stable.err
@@ -64,11 +64,11 @@ ERROR = !SELECT: no such binary operator
 MAPI  = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
 QUERY = SELECT '' AS to_char_3, to_char( (q1 * -1), 'PR'), 
to_char( (q2 * -1), '.999PR') 
FROM INT8_TBL;
-ERROR = !SELECT: no such binary operator 'to_char(hugeint,char)'
+ERROR = !SELECT: no such binary operator 'to_char(bigint,char)'
 MAPI  = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
 QUERY = SELECT '' AS to_char_4, to_char( (q1 * -1), 'S'), 
to_char( (q2 * -1), 'S') 
FROM INT8_TBL;
-ERROR = !SELECT: no such binary operator 'to_char(hugeint,char)'
+ERROR = !SELECT: no such binary operator 'to_char(bigint,char)'
 MAPI  = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
 QUERY = SELECT '' AS to_char_5,  to_char(q2, 'MI') FROM 
INT8_TBL;  
 ERROR = !SELECT: no such binary operator 'to_char(bigint,char)'
diff --git a/sql/test/pg_regress/Tests/int8.stable.out 
b/sql/test/pg_regress/Tests/int8.stable.out
--- a/sql/test/pg_regress/Tests/int8.stable.out
+++ b/sql/test/pg_regress/Tests/int8.stable.out
@@ -94,12 +94,10 @@ Ready.
 % .L,  sys.int8_tbl,   sys.int8_tbl,   sys.L # table_name
 % three,   q1, q2, multiply # name
 % char,bigint, bigint, bigint # type
-% 0,   16, 17, 33 # length
+% 0,   16, 16, 18 # length
 [ "",  123,456,56088   ]
 [ "",  123,4567890123456789,   561850485185185047  ]
 [ "",  4567890123456789,   123,561850485185185047  ]
-[ "",  4567890123456789,   4567890123456789,   
20865620179974079051998750190521]
-[ "",  4567890123456789,   -4567890123456789,  
-20865620179974079051998750190521   ]
 #SELECT '' AS five, q1, q2, q1 / q2 AS divide FROM INT8_TBL;
 % .L,  sys.int8_tbl,   sys.int8_tbl,   sys.L # table_name
 % five,q1, q2, divide # name
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approve output

[Martin Kersten]

Changeset: c6718b64b2eb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c6718b64b2eb
Modified Files:
monetdb5/mal/Tests/tst044.stable.out
monetdb5/mal/Tests/tst804.stable.out
Branch: default
Log Message:

Approve output


diffs (45 lines):

diff --git a/monetdb5/mal/Tests/tst044.stable.out 
b/monetdb5/mal/Tests/tst044.stable.out
--- a/monetdb5/mal/Tests/tst044.stable.out
+++ b/monetdb5/mal/Tests/tst044.stable.out
@@ -34,23 +34,23 @@ function user.main():void;
 io.print(a);
 a := 0.3415:flt;
 io.print(a);
-b := 3.145:dbl;
+b := 3.144809265137:dbl;
 io.print(b);
 b := -3.145:dbl;
 io.print(b);
-b := 3.45:dbl;
+b := 3.45047683716:dbl;
 io.print(b);
-b := 0.3415:dbl;
+b := 0.34150001406669617:dbl;
 io.print(b);
 end user.main;
 [ 3.145 ]
 [ -3.145 ]
 [ 3.45 ]
 [ 0.3415 ]
-[ 3.145 ]
+[ 3.144809265137 ]
 [ -3.145 ]
-[ 3.45 ]
-[ 0.3415 ]
+[ 3.45047683716 ]
+[ 0.34150001406669617 ]
 
 # 16:38:20 >  
 # 16:38:20 >  Done.
diff --git a/monetdb5/mal/Tests/tst804.stable.out 
b/monetdb5/mal/Tests/tst804.stable.out
--- a/monetdb5/mal/Tests/tst804.stable.out
+++ b/monetdb5/mal/Tests/tst804.stable.out
@@ -13,7 +13,7 @@ stdout of test 'tst804` in directory 'mo
 ## test definiton of a function in a unknown module
 #function wrong.message():void;
 !SyntaxException:parseError:function wrong.message():void;
-!SyntaxException:parseError:  ^ not defined
+!SyntaxException:parseError:  ^ name not defined
 !SyntaxException:parseError:   io.print("shouldn't come here");
 !SyntaxException:parseError:^';' expected
 !SyntaxException:parseError:end message;
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approve output.

[Sjoerd Mullender]

Changeset: 7a08747cea00 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7a08747cea00
Modified Files:
clients/Tests/exports.stable.out
monetdb5/mal/Tests/tst044.stable.out
monetdb5/mal/Tests/tst804.stable.out
Branch: default
Log Message:

Approve output.


diffs (56 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
@@ -2277,6 +2277,7 @@ int hasSameSignature(MalBlkPtr mb, Instr
 int hasSideEffects(InstrPtr p, int strict);
 str hashRef;
 int headProp;
+str hgeRef;
 int hlbProp;
 int horiginProp;
 int hubProp;
diff --git a/monetdb5/mal/Tests/tst044.stable.out 
b/monetdb5/mal/Tests/tst044.stable.out
--- a/monetdb5/mal/Tests/tst044.stable.out
+++ b/monetdb5/mal/Tests/tst044.stable.out
@@ -34,23 +34,23 @@ function user.main():void;
 io.print(a);
 a := 0.3415:flt;
 io.print(a);
-b := 3.144809265137:dbl;
+b := 3.145:dbl;
 io.print(b);
 b := -3.145:dbl;
 io.print(b);
-b := 3.45047683716:dbl;
+b := 3.45:dbl;
 io.print(b);
-b := 0.34150001406669617:dbl;
+b := 0.3415:dbl;
 io.print(b);
 end user.main;
 [ 3.145 ]
 [ -3.145 ]
 [ 3.45 ]
 [ 0.3415 ]
-[ 3.144809265137 ]
+[ 3.145 ]
 [ -3.145 ]
-[ 3.45047683716 ]
-[ 0.34150001406669617 ]
+[ 3.45 ]
+[ 0.3415 ]
 
 # 16:38:20 >  
 # 16:38:20 >  Done.
diff --git a/monetdb5/mal/Tests/tst804.stable.out 
b/monetdb5/mal/Tests/tst804.stable.out
--- a/monetdb5/mal/Tests/tst804.stable.out
+++ b/monetdb5/mal/Tests/tst804.stable.out
@@ -13,7 +13,7 @@ stdout of test 'tst804` in directory 'mo
 ## test definiton of a function in a unknown module
 #function wrong.message():void;
 !SyntaxException:parseError:function wrong.message():void;
-!SyntaxException:parseError:  ^ name not defined
+
 !SyntaxException:parseError:   io.print("shouldn't come here");
 !SyntaxException:parseError:^';' expected
 !SyntaxException:parseError:end message;
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approve output

[Martin Kersten]

Changeset: db36cd939c2c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=db36cd939c2c
Modified Files:
clients/Tests/exports.stable.out
Branch: default
Log Message:

Approve output


diffs (11 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
@@ -743,7 +743,6 @@ str ALGgroupby(bat *res, const bat *gids
 str ALGjoin(bat *result, const bat *lid, const bat *rid);
 str ALGjoin2(bat *l, bat *r, const bat *lid, const bat *rid);
 str ALGjoinPath(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-BAT *ALGjoinPathBody(Client cntxt, int top, BAT **joins, int flag);
 str ALGjoinestimate(bat *result, const bat *lid, const bat *rid, const lng 
*estimate);
 str ALGkdiff(bat *result, const bat *lid, const bat *rid);
 str ALGkunion(bat *result, const bat *lid, const bat *rid);
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approve output

[Martin Kersten]

Changeset: d8bd9ed4fab1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d8bd9ed4fab1
Removed Files:
monetdb5/tests/BugTracker/Tests/joinpath-loop.Bug-2965.mal
monetdb5/tests/BugTracker/Tests/joinpath-loop.Bug-2965.stable.err
monetdb5/tests/BugTracker/Tests/joinpath-loop.Bug-2965.stable.out
Modified Files:
monetdb5/optimizer/Tests/tst4300.mal
monetdb5/optimizer/Tests/tst4300.stable.out
monetdb5/tests/BugTracker/Tests/All
sql/benchmarks/tpch/Tests/02-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out.int128
sql/benchmarks/tpch/Tests/16-explain.stable.out
sql/test/leaks/Tests/check0_bam.stable.out.int128
Branch: default
Log Message:

Approve output


diffs (truncated from 341 to 300 lines):

diff --git a/monetdb5/optimizer/Tests/tst4300.mal 
b/monetdb5/optimizer/Tests/tst4300.mal
--- a/monetdb5/optimizer/Tests/tst4300.mal
+++ b/monetdb5/optimizer/Tests/tst4300.mal
@@ -20,6 +20,6 @@ io.print(i);
 bo := batcalc.oid(b);
 co := batcalc.oid(c);
 cor:= bat.reverse(co);
-zz:= algebra.joinPath(bo,cor,d);
+zz:= algebra.leftjoinPath(bo,cor,d);
 i:= aggr.count(zz);
 io.print(i);
diff --git a/monetdb5/optimizer/Tests/tst4300.stable.out 
b/monetdb5/optimizer/Tests/tst4300.stable.out
--- a/monetdb5/optimizer/Tests/tst4300.stable.out
+++ b/monetdb5/optimizer/Tests/tst4300.stable.out
@@ -31,7 +31,7 @@ exit v;
 bo := batcalc.oid(b);
 co := batcalc.oid(c);
 cor := bat.reverse(co);
-zz := algebra.joinPath(bo,cor,d);
+zz := algebra.leftjoinPath(bo,cor,d);
 i := aggr.count(zz);
 io.print(i);
 end user.main;
diff --git a/monetdb5/tests/BugTracker/Tests/All 
b/monetdb5/tests/BugTracker/Tests/All
--- a/monetdb5/tests/BugTracker/Tests/All
+++ b/monetdb5/tests/BugTracker/Tests/All
@@ -5,6 +5,5 @@ batcast.SF-1730987
 empty_line_crash.SF-1806638
 parser.SF-2051309
 mal_var_persistent_over_sessions.SF-2581675
-joinpath-loop.Bug-2965
 algebra_project.Bug-3045
 stdev.Bug-3178
diff --git a/monetdb5/tests/BugTracker/Tests/joinpath-loop.Bug-2965.mal 
b/monetdb5/tests/BugTracker/Tests/joinpath-loop.Bug-2965.mal
deleted file mode 100644
--- a/monetdb5/tests/BugTracker/Tests/joinpath-loop.Bug-2965.mal
+++ /dev/null
@@ -1,13 +0,0 @@
-a:bat[:oid, :int] := bat.new(:oid, :int);
-b:bat[:oid, :int] := bat.new(:oid, :int);
-c:bat[:oid, :int] := bat.new(:oid, :int);
-bat.append(a, 1);
-bat.append(a, 2);
-bat.append(a, 3);
-bat.append(b, 1);
-bat.append(b, 2);
-bat.append(b, 0);
-bat.append(c, 0);
-bat.append(c, 3);
-bat.append(c, 1);
-algebra.joinPath(a, b, c);
diff --git a/monetdb5/tests/BugTracker/Tests/joinpath-loop.Bug-2965.stable.err 
b/monetdb5/tests/BugTracker/Tests/joinpath-loop.Bug-2965.stable.err
deleted file mode 100644
--- a/monetdb5/tests/BugTracker/Tests/joinpath-loop.Bug-2965.stable.err
+++ /dev/null
@@ -1,31 +0,0 @@
-stderr of test 'joinpath-loop.Bug-2965` in directory 
'monetdb5/tests/BugTracker` itself:
-
-
-# 16:23:27 >  
-# 16:23:27 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"gdk_dbfarm=/ufs/sjoerd/Monet-candidate/var/MonetDB" "--set" "mapi_open=true" 
"--set" "mapi_port=39263" "--set" "monet_prompt=" "--trace" "--forcemito" 
"--set" "mal_listing=2" "--dbname=mTests_tests_BugTracker" 
"joinpath-loop.Bug-2965.mal"
-# 16:23:27 >  
-
-# builtin opt  gdk_dbname = demo
-# builtin opt  gdk_dbfarm = /ufs/sjoerd/Monet-candidate/var/monetdb5/dbfarm
-# builtin opt  gdk_debug = 0
-# builtin opt  gdk_alloc_map = no
-# builtin opt  gdk_vmtrim = yes
-# builtin opt  monet_prompt = >
-# builtin opt  monet_daemon = no
-# builtin opt  mapi_port = 5
-# builtin opt  mapi_open = false
-# builtin opt  mapi_autosense = false
-# builtin opt  sql_optimizer = default_pipe
-# builtin opt  sql_debug = 0
-# cmdline opt  gdk_nr_threads = 0
-# cmdline opt  gdk_dbfarm = /ufs/sjoerd/Monet-candidate/var/MonetDB
-# cmdline opt  mapi_open = true
-# cmdline opt  mapi_port = 39263
-# cmdline opt  monet_prompt = 
-# cmdline opt  mal_listing = 2
-# cmdline opt  gdk_dbname = mTests_tests_BugTracker
-
-# 16:23:27 >  
-# 16:23:27 >  "Done."
-# 16:23:27 >  
-
diff --git a/monetdb5/tests/BugTracker/Tests/joinpath-loop.Bug-2965.stable.out 
b/monetdb5/tests/BugTracker/Tests/joinpath-loop.Bug-2965.stable.out
deleted file mode 100644
--- a/monetdb5/tests/BugTracker/Tests/joinpath-loop.Bug-2965.stable.out
+++ /dev/null
@@ -1,39 +0,0 @@
-stdout of test 'joinpath-loop.Bug-2965` in directory 
'monetdb5/tests/BugTracker` itself:
-
-
-# 16:23:27 >  
-# 16:23:27 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"gdk_dbfarm=/ufs/sjoerd/Monet-candidate/var/MonetDB" "--set" "mapi_open=true" 
"--set" "mapi_port=39263" "--set" "monet_prompt=" "--trace" "--forcemito" 
"--set" "mal_listing=2" "--dbname=mTests_tests_BugTracker" 
"joinpath-loop.Bug-2965.mal"
-# 16:23:27 >  
-
-# MonetDB 5 server v11.7.0
-# This is an unreleased version
-# Serving database 'mTests

MonetDB: default - approve output

[Niels Nes]

Changeset: 181f419a2a06 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=181f419a2a06
Modified Files:
sql/benchmarks/tpch/Tests/11-explain.stable.out
sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
Branch: default
Log Message:

approve output


diffs (30 lines):

diff --git a/sql/benchmarks/tpch/Tests/11-explain.stable.out 
b/sql/benchmarks/tpch/Tests/11-explain.stable.out
--- a/sql/benchmarks/tpch/Tests/11-explain.stable.out
+++ b/sql/benchmarks/tpch/Tests/11-explain.stable.out
@@ -56,9 +56,9 @@ Ready.
 % .explain # table_name
 % mal # name
 % clob # type
-% 633 # length
+% 812 # length
 function user.s2_1{autoCommit=true}(A0:str,A1:sht,A2:str):void;
-X_132:void := querylog.define("explain 
select\n\tps_partkey,\n\tsum(ps_supplycost * ps_availqty) as 
value\nfrom\n\tpartsupp,\n\tsupplier,\n\tnation\nwhere\n\tps_suppkey = 
s_suppkey\n\tand s_nationkey = n_nationkey\n\tand n_name = \\'GERMANY\\'\ngroup 
by\n\tps_partkey having\n\t\tsum(ps_supplycost * ps_availqty) > 
(\n\t\t\tselect\n\t\t\t\tsum(ps_supplycost * ps_availqty) * 
0.01\n\t\t\tfrom\n\t\t\t\tpartsupp,\n\t\t\t\tsupplier,\n\t\t\t\tnation\n\t\t\twhere\n\t\t\t\tps_suppkey
 = s_suppkey\n\t\t\t\tand s_nationkey = n_nationkey\n\t\t\t\tand n_name = 
\\'GERMANY\\'\n\t\t)\norder by\n\tvalue desc;","sequential_pipe",72);
+X_132:void := querylog.define("explain 
select\n\tps_partkey,\n\tsum(ps_supplycost * ps_availqty) as 
value\nfrom\n\tpartsupp,\n\tsupplier,\n\tnation\nwhere\n\tps_suppkey = 
s_suppkey\n\tand s_nationkey = n_nationkey\n\tand n_name = \\'GERMANY\\'\ngroup 
by\n\tps_partkey having\n\t\tsum(ps_supplycost * ps_availqty) > 
(\n\t\t\tselect\n\t\t\t\tsum(ps_supplycost * ps_availqty) * 
0.01\n\t\t\t--\t   
\n\t\t\t-- The above constant needs to be adjusted 
according\n\t\t\t-- to the scale factor (SF): constant = 0.0001 / 
SF.\n\t\t\tfrom\n\t\t\t\tpartsupp,\n\t\t\t\tsupplier,\n\t\t\t\tnation\n\t\t\twhere\n\t\t\t\tps_suppkey
 = s_suppkey\n\t\t\t\tand s_nationkey = n_nationkey\n\t\t\t\tand n_name = 
\\'GERMANY\\'\n\t\t)\norder by\n\tvalue desc;","sequential_pipe",72);
 X_5 := sql.mvc();
 X_6:bat[:oid,:oid]  := sql.tid(X_5,"sys","supplier");
 X_9:bat[:oid,:oid]  := 
sql.bind_idxbat(X_5,"sys","supplier","supplier_s_nationkey_fkey",0);
diff --git a/sql/benchmarks/tpch/Tests/11-explain.stable.out.int128 
b/sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
--- a/sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
+++ b/sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
@@ -56,9 +56,9 @@ Ready.
 % .explain # table_name
 % mal # name
 % clob # type
-% 633 # length
+% 812 # length
 function user.s2_1{autoCommit=true}(A0:str,A1:sht,A2:str):void;
-X_132:void := querylog.define("explain 
select\n\tps_partkey,\n\tsum(ps_supplycost * ps_availqty) as 
value\nfrom\n\tpartsupp,\n\tsupplier,\n\tnation\nwhere\n\tps_suppkey = 
s_suppkey\n\tand s_nationkey = n_nationkey\n\tand n_name = \\'GERMANY\\'\ngroup 
by\n\tps_partkey having\n\t\tsum(ps_supplycost * ps_availqty) > 
(\n\t\t\tselect\n\t\t\t\tsum(ps_supplycost * ps_availqty) * 
0.01\n\t\t\tfrom\n\t\t\t\tpartsupp,\n\t\t\t\tsupplier,\n\t\t\t\tnation\n\t\t\twhere\n\t\t\t\tps_suppkey
 = s_suppkey\n\t\t\t\tand s_nationkey = n_nationkey\n\t\t\t\tand n_name = 
\\'GERMANY\\'\n\t\t)\norder by\n\tvalue desc;","sequential_pipe",72);
+X_132:void := querylog.define("explain 
select\n\tps_partkey,\n\tsum(ps_supplycost * ps_availqty) as 
value\nfrom\n\tpartsupp,\n\tsupplier,\n\tnation\nwhere\n\tps_suppkey = 
s_suppkey\n\tand s_nationkey = n_nationkey\n\tand n_name = \\'GERMANY\\'\ngroup 
by\n\tps_partkey having\n\t\tsum(ps_supplycost * ps_availqty) > 
(\n\t\t\tselect\n\t\t\t\tsum(ps_supplycost * ps_availqty) * 
0.01\n\t\t\t--\t   
\n\t\t\t-- The above constant needs to be adjusted 
according\n\t\t\t-- to the scale factor (SF): constant = 0.0001 / 
SF.\n\t\t\tfrom\n\t\t\t\tpartsupp,\n\t\t\t\tsupplier,\n\t\t\t\tnation\n\t\t\twhere\n\t\t\t\tps_suppkey
 = s_suppkey\n\t\t\t\tand s_nationkey = n_nationkey\n\t\t\t\tand n_name = 
\\'GERMANY\\'\n\t\t)\norder by\n\tvalue desc;","sequential_pipe",72);
 X_5 := sql.mvc();
 X_6:bat[:oid,:oid]  := sql.tid(X_5,"sys","supplier");
 X_9:bat[:oid,:oid]  := 
sql.bind_idxbat(X_5,"sys","supplier","supplier_s_nationkey_fkey",0);
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approve output

[Martin Kersten]

Changeset: 4db79327c25c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4db79327c25c
Modified Files:
sql/test/leaks/Tests/check1.stable.out.int128
sql/test/leaks/Tests/check2.stable.out.int128
sql/test/leaks/Tests/check3.stable.out.int128
sql/test/leaks/Tests/check4.stable.out.int128
sql/test/leaks/Tests/check5.stable.out.int128
Branch: default
Log Message:

Approve output


diffs (truncated from 355 to 300 lines):

diff --git a/sql/test/leaks/Tests/check1.stable.out.int128 
b/sql/test/leaks/Tests/check1.stable.out.int128
--- a/sql/test/leaks/Tests/check1.stable.out.int128
+++ b/sql/test/leaks/Tests/check1.stable.out.int128
@@ -39,11 +39,11 @@ Ready.
 [ "oid",   "bit",  0   ]
 [ "oid",   "bit",  4   ]
 [ "oid",   "bit",  50  ]
-[ "oid",   "bit",  351 ]
+[ "oid",   "bit",  352 ]
 [ "oid",   "bit",  1520]
 [ "oid",   "bit",  1520]
 [ "oid",   "bit",  1520]
-[ "oid",   "bte",  4258]
+[ "oid",   "bte",  4259]
 [ "oid",   "int",  0   ]
 [ "oid",   "int",  0   ]
 [ "oid",   "int",  0   ]
@@ -111,21 +111,21 @@ Ready.
 [ "oid",   "int",  229 ]
 [ "oid",   "int",  229 ]
 [ "oid",   "int",  232 ]
-[ "oid",   "int",  351 ]
-[ "oid",   "int",  351 ]
-[ "oid",   "int",  351 ]
-[ "oid",   "int",  351 ]
-[ "oid",   "int",  351 ]
+[ "oid",   "int",  352 ]
+[ "oid",   "int",  352 ]
+[ "oid",   "int",  352 ]
+[ "oid",   "int",  352 ]
+[ "oid",   "int",  352 ]
 [ "oid",   "int",  1520]
 [ "oid",   "int",  1520]
 [ "oid",   "int",  1520]
 [ "oid",   "int",  1520]
 [ "oid",   "int",  1520]
-[ "oid",   "int",  4258]
-[ "oid",   "int",  4258]
-[ "oid",   "int",  4258]
-[ "oid",   "int",  4258]
-[ "oid",   "int",  4258]
+[ "oid",   "int",  4259]
+[ "oid",   "int",  4259]
+[ "oid",   "int",  4259]
+[ "oid",   "int",  4259]
+[ "oid",   "int",  4259]
 [ "oid",   "lng",  0   ]
 [ "oid",   "lng",  0   ]
 [ "oid",   "lng",  0   ]
@@ -259,15 +259,15 @@ Ready.
 [ "oid",   "str",  50  ]
 [ "oid",   "str",  50  ]
 [ "oid",   "str",  232 ]
-[ "oid",   "str",  351 ]
-[ "oid",   "str",  351 ]
-[ "oid",   "str",  351 ]
-[ "oid",   "str",  351 ]
+[ "oid",   "str",  352 ]
+[ "oid",   "str",  352 ]
+[ "oid",   "str",  352 ]
+[ "oid",   "str",  352 ]
 [ "oid",   "str",  1520]
 [ "oid",   "str",  1520]
 [ "oid",   "str",  1520]
-[ "oid",   "str",  4258]
-[ "oid",   "str",  4258]
+[ "oid",   "str",  4259]
+[ "oid",   "str",  4259]
 [ "oid",   "timestamp",0   ]
 [ "oid",   "timestamp",0   ]
 [ "oid",   "wrd",  0   ]
diff --git a/sql/test/leaks/Tests/check2.stable.out.int128 
b/sql/test/leaks/Tests/check2.stable.out.int128
--- a/sql/test/leaks/Tests/check2.stable.out.int128
+++ b/sql/test/leaks/Tests/check2.stable.out.int128
@@ -39,11 +39,11 @@ Ready.
 [ "oid",   "bit",  0   ]
 [ "oid",   "bit",  4   ]
 [ "oid",   "bit",  50  ]
-[ "oid",   "bit",  351 ]
+[ "oid",   "bit",  352 ]
 [ "oid",   "bit",  1520]
 [ "oid",   "bit",  1520]
 [ "oid",   "bit",  1520]
-[ "oid",   "bte",  4258]
+[ "oid",   "bte",  4259]
 [ "oid",   "int",  0   ]
 [ "oid",   "int",  0   ]
 [ "oid",   "int",  0   ]
@@ -111,21 +111,21 @@ Ready.
 [ "oid",   "int",  229 ]
 [ "oid",   "int",  229 ]
 [ "oid",   "int",  232 ]
-[ "oid",   "int",  351 ]
-[ "oid",   "int",  351 ]
-[ "oid",   "int",  351 ]
-[ "oid",   "int",  351 ]
-[ "oid",   "int",  351 ]
+[ "oid",   "int",  352 ]
+[ "oid",   "int",  352 ]
+[ "oid",   "int",  352 ]
+[ "oid",   "int",  352 ]
+[ "oid",   "int",  352 ]
 [ "oid",   "int",  1520]
 [ "oid",   "int",  1520]
 [ "oid",   "int",  1520]
 [ "oid",   "int",  1520]
 [ "oid",   "int",  1520]
-[ "oid",   "int",  4258]
-[ "oid",   "int",  4258]
-[ "oid",   "int",  4258]
-[ "oid",   "int",  4258]
-[ "oid",   "int",  4258]
+[ "oid",   "int",  4259]
+[ "oid",   "int",  4259]
+[ "oid",   "int",  4259]
+[ "oid",   "int",  4259]
+[ "oid",   "int",  4259]
 [ "oid",   "lng",  0   ]
 [ "oid",   "lng",  0   ]
 [ "oid",   "lng",  0   ]
@@ -259,15 +259,15 @@ Ready.
 [ "oid",   "str",  50  ]
 [ "oid",   "str",  50  ]
 [ "oid",   "str",  232 ]
-[ "oid",   "str",  351 ]
-[ "oid",   "str",  351 ]
-[ "oid",   "str",  351

MonetDB: default - Approve output

[Martin Kersten]

Changeset: a20cc0b7d0bf for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a20cc0b7d0bf
Modified Files:
clients/Tests/SQL-dump.stable.out
clients/Tests/SQL-dump.stable.out.int128
clients/Tests/SQL-dump.stable.out.oid32
clients/Tests/SQL-dump.stable.out.oid32.int128
Branch: default
Log Message:

Approve output


diffs (truncated from 1959 to 300 lines):

diff --git a/clients/Tests/SQL-dump.stable.out 
b/clients/Tests/SQL-dump.stable.out
--- a/clients/Tests/SQL-dump.stable.out
+++ b/clients/Tests/SQL-dump.stable.out
@@ -1166,7 +1166,7 @@ external name sql.sysmon_stop;
 -- For strings we take a sample to determine their average length.
 
 create function sys."storage"()
-returns table ("schema" string, "table" string, "column" string, "type" 
string, "mode" string, location string, "count" bigint, typewidth int, 
columnsize bigint, heapsize bigint, hashes bigint, imprints bigint, sorted 
boolean)
+returns table ("schema" string, "table" string, "column" string, "type" 
string, "mode" string, location string, "count" bigint, typewidth int, 
columnsize bigint, heapsize bigint, hashes bigint, phash boolean, imprints 
bigint, sorted boolean)
 external name sql."storage";
 create function sys.storagemodel()
 returns table (
@@ -1337,7 +1337,7 @@ CREATE TABLE "sys"."_columns" (
"number"  INTEGER,
"storage" VARCHAR(2048)
 );
-COPY 351 RECORDS INTO "sys"."_columns" FROM stdin USING DELIMITERS 
'\t','\n','"';
+COPY 352 RECORDS INTO "sys"."_columns" FROM stdin USING DELIMITERS 
'\t','\n','"';
 2002   "id""int"   32  0   2001NULLtrue0   NULL
 2003   "name"  "varchar"   10240   2001NULLtrue1   
NULL
 2004   "authorization" "int"   32  0   2001NULLtrue2   
NULL
diff --git a/clients/Tests/SQL-dump.stable.out.int128 
b/clients/Tests/SQL-dump.stable.out.int128
--- a/clients/Tests/SQL-dump.stable.out.int128
+++ b/clients/Tests/SQL-dump.stable.out.int128
@@ -1203,7 +1203,7 @@ external name sql.sysmon_stop;
 -- For strings we take a sample to determine their average length.
 
 create function sys."storage"()
-returns table ("schema" string, "table" string, "column" string, "type" 
string, "mode" string, location string, "count" bigint, typewidth int, 
columnsize bigint, heapsize bigint, hashes bigint, imprints bigint, sorted 
boolean)
+returns table ("schema" string, "table" string, "column" string, "type" 
string, "mode" string, location string, "count" bigint, typewidth int, 
columnsize bigint, heapsize bigint, hashes bigint, phash boolean, imprints 
bigint, sorted boolean)
 external name sql."storage";
 create function sys.storagemodel()
 returns table (
@@ -1378,7 +1378,7 @@ CREATE TABLE "sys"."_columns" (
"number"  INTEGER,
"storage" VARCHAR(2048)
 );
-COPY 351 RECORDS INTO "sys"."_columns" FROM stdin USING DELIMITERS 
'\t','\n','"';
+COPY 352 RECORDS INTO "sys"."_columns" FROM stdin USING DELIMITERS 
'\t','\n','"';
 2002   "id""int"   32  0   2001NULLtrue0   NULL
 2003   "name"  "varchar"   10240   2001NULLtrue1   
NULL
 2004   "authorization" "int"   32  0   2001NULLtrue2   
NULL
@@ -1634,102 +1634,103 @@ 6938  "att_type"  "varchar"   64  0   
6942NULL
 6939   "value" "clob"  0   0   6942NULLtrue3   NULL
 6940   "file_id"   "int"   32  0   6942NULLtrue4   
NULL
 6941   "gr_name"   "varchar"   256 0   6942NULLtrue
5   NULL
-6966   "schema""clob"  0   0   6979NULLtrue0   
NULL
-6967   "table" "clob"  0   0   6979NULLtrue1   NULL
-6968   "column""clob"  0   0   6979NULLtrue2   
NULL
-6969   "type"  "clob"  0   0   6979NULLtrue3   NULL
-6970   "mode"  "clob"  0   0   6979NULLtrue4   NULL
-6971   "location"  "clob"  0   0   6979NULLtrue5   
NULL
-6972   "count" "bigint"64  0   6979NULLtrue6   
NULL
-6973   "typewidth" "int"   32  0   6979NULLtrue7   
NULL
-6974   "columnsize""bigint"64  0   6979NULLtrue
8   NULL
-6975   "heapsize"  "bigint"64  0   6979NULLtrue
9   NULL
-6976   "hashes""bigint"64  0   6979NULLtrue
10  NULL
-6977   "imprints"  "bigint"64  0   6979NULLtrue
11  NULL
-6978   "sorted""boolean"   1   0   6979NULLtrue
12  NULL
-6981   "schema""clob"  0   0   6991NULLtrue0   
NULL
-6982   "table" "clob"  0   0   6991NULLtrue1   NULL
-6983   "column""clob"  0   0   6991NULLtrue2  

MonetDB: default - Approve output

[Martin Kersten]

Changeset: a5c5fcac667d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a5c5fcac667d
Modified Files:
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
Branch: default
Log Message:

Approve output


diffs (48 lines):

diff --git a/sql/test/Tests/systemfunctions.stable.out 
b/sql/test/Tests/systemfunctions.stable.out
--- a/sql/test/Tests/systemfunctions.stable.out
+++ b/sql/test/Tests/systemfunctions.stable.out
@@ -684,7 +684,7 @@ Ready.
 [ "sys",   "stddev_samp",  1,  "timestamp",""  ]
 [ "sys",   "stop", 0,  "int",  "create procedure sys.stop(tag 
int)\nexternal name sql.sysmon_stop;"]
 [ "sys",   "stop", 0,  "bigint",   "create procedure sys.stop(tag 
bigint)\nexternal name sql.sysmon_stop;" ]
-[ "sys",   "storage",  0,  "clob", "-- This Source Code Form is 
subject to the terms of the Mozilla Public\n-- License, v. 2.0.  If a copy of 
the MPL was not distributed with this\n-- file, You can obtain one at 
http://mozilla.org/MPL/2.0/.\n--\n-- Copyright 2008-2015 MonetDB B.V.\n\n-- 
Author M.Kersten\n-- This script gives the database administrator insight in 
the actual\n-- footprint of the persistent tables and the maximum playground 
used\n-- when indices are introduced upon them.\n-- By chancing the 
storagemodelinput table directly, the footprint for\n-- yet to be loaded 
databases can be assessed.\n\n-- The actual storage footprint of an existing 
database can be\n-- obtained by the table procuding function storage()\n-- It 
represents the actual state of affairs, i.e. storage on disk\n-- of columns and 
foreign key indices, and possible temporary hash indices.\n-- For strings we 
take a sample to determine their average length.\n\ncreate function 
sys.\"storage\"()\nreturns table (\"sc
 hema\" string, \"table\" string, \"column\" string, \"type\" string, \"mode\" 
string, location string, \"count\" bigint, typewidth int, columnsize bigint, 
heapsize bigint, hashes bigint, imprints bigint, sorted boolean)\nexternal name 
sql.\"storage\";"   ]
+[ "sys",   "storage",  0,  "clob", "-- This Source Code Form is 
subject to the terms of the Mozilla Public\n-- License, v. 2.0.  If a copy of 
the MPL was not distributed with this\n-- file, You can obtain one at 
http://mozilla.org/MPL/2.0/.\n--\n-- Copyright 2008-2015 MonetDB B.V.\n\n-- 
Author M.Kersten\n-- This script gives the database administrator insight in 
the actual\n-- footprint of the persistent tables and the maximum playground 
used\n-- when indices are introduced upon them.\n-- By chancing the 
storagemodelinput table directly, the footprint for\n-- yet to be loaded 
databases can be assessed.\n\n-- The actual storage footprint of an existing 
database can be\n-- obtained by the table procuding function storage()\n-- It 
represents the actual state of affairs, i.e. storage on disk\n-- of columns and 
foreign key indices, and possible temporary hash indices.\n-- For strings we 
take a sample to determine their average length.\n\ncreate function 
sys.\"storage\"()\nreturns table (\"sc
 hema\" string, \"table\" string, \"column\" string, \"type\" string, \"mode\" 
string, location string, \"count\" bigint, typewidth int, columnsize bigint, 
heapsize bigint, hashes bigint, phash boolean, imprints bigint, sorted 
boolean)\nexternal name sql.\"storage\";"]
 [ "sys",   "storage",  1,  "clob", ""  ]
 [ "sys",   "storage",  2,  "clob", ""  ]
 [ "sys",   "storage",  3,  "clob", ""  ]
@@ -695,8 +695,9 @@ Ready.
 [ "sys",   "storage",  8,  "bigint",   ""  ]
 [ "sys",   "storage",  9,  "bigint",   ""  ]
 [ "sys",   "storage",  10, "bigint",   ""  ]
-[ "sys",   "storage",  11, "bigint",   ""  ]
-[ "sys",   "storage",  12, "boolean",  ""  ]
+[ "sys",   "storage",  11, "boolean",  ""  ]
+[ "sys",   "storage",  12, "bigint",   ""  ]
+[ "sys",   "storage",  13, "boolean",  ""  ]
 [ "sys",   "storagemodel", 0,  "clob", "create function 
sys.storagemodel()\nreturns table (\n\t\"schema\" string,\n\t\"table\" 
string,\n\t\"column\" string,\n\t\"type\" 
string,\n\t\"count\"\tbigint,\n\tcolumnsize bigint,\n\theapsize 
bigint,\n\thashes bigint,\n\timprints bigint,\n\tsorted 
boolean)\nbegin\n\treturn select i.\"schema\", i.\"table\", i.\"column\", 
i.\"type\", i.\"count\",\n\tcolumnsize(i.\"type\", i.count, 
i.\"distinct\"),\n\theapsize(i.\"type\", i.\"distinct\", 
i.\"atomwidth\"),\n\thashsize(i.\"reference\", 
i.\"count\"),\n\timprintsize(i.\"count\",i.\"type\"),\n\ti.sorted\n\tfrom 
sys.storagemodelinput i;\nend;"   ]
 [ "sys",   "storagemodel", 1,  "clob", ""  ]
 [ "sys",   "storagemodel", 2,  "clob", ""  ]
diff --git a/sql/test/Tests/systemfunctions.stable.out.int128 
b/sql/test/Tes

MonetDB: default - Approve output

[Martin Kersten]

Changeset: 222e2534a70c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=222e2534a70c
Modified Files:
clients/Tests/exports.stable.out
sql/benchmarks/ssbm/Tests/01-explain.stable.out
sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/02-explain.stable.out
sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/03-explain.stable.out
sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/04-explain.stable.out
sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/05-explain.stable.out
sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/06-explain.stable.out
sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/07-explain.stable.out
sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/08-explain.stable.out
sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/09-explain.stable.out
sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/10-explain.stable.out
sql/benchmarks/ssbm/Tests/10-explain.stable.out.int128
sql/benchmarks/tpch/Tests/01-explain.stable.out
sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
sql/benchmarks/tpch/Tests/02-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out.int128
sql/benchmarks/tpch/Tests/05-explain.stable.out
sql/benchmarks/tpch/Tests/05-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/05-explain.stable.out.int128
sql/benchmarks/tpch/Tests/06-explain.stable.out.int128
sql/benchmarks/tpch/Tests/08-explain.stable.out.int128
sql/benchmarks/tpch/Tests/09-explain.stable.out.int128
sql/benchmarks/tpch/Tests/10-explain.stable.out
sql/benchmarks/tpch/Tests/10-explain.stable.out.int128
sql/benchmarks/tpch/Tests/12-explain.stable.out
sql/benchmarks/tpch/Tests/12-explain.stable.out.int128
sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
sql/benchmarks/tpch/Tests/17-explain.stable.out.int128

sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
Branch: default
Log Message:

Approve output


diffs (truncated from 1977 to 300 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
@@ -1983,6 +1983,7 @@ str batcalcRef;
 str batmalRef;
 str batmmathRef;
 str batmtimeRef;
+str batsqlRef;
 str batstrRef;
 str batxmlRef;
 str bbpRef;
@@ -1990,7 +1991,6 @@ str bindRef;
 str binddbatRef;
 str bindidxRef;
 var_t blobsize(size_t nitems);
-str boxRef;
 str bpmRef;
 str bstreamRef;
 int bstream_create_wrap(Bstream *BS, Stream *S, int *bufsize);
@@ -2064,9 +2064,11 @@ void delVariable(MalBlkPtr mb, int varid
 str deleteRef;
 void deleteSymbol(Module scope, Symbol prg);
 str deltaRef;
+str dense_rankRef;
 str depositRef;
 void deriveModule(Module scope, str nme);
 malType destinationType(MalBlkPtr mb, InstrPtr p);
+str diffRef;
 str disconnectRef;
 void displayVolume(Client cntxt, lng vol);
 str divRef;
@@ -2085,7 +2087,6 @@ str exportOperationRef;
 str export_tableRef;
 int fcnBinder(stream *out, Module scope, MalBlkPtr mb, InstrPtr p);
 str fcnDefinition(MalBlkPtr mb, InstrPtr p, str s, int flg, str base, size_t 
len);
-int fileProp;
 int findGDKtype(int type);
 int findInstruction(Module scope, MalBlkPtr mb, InstrPtr pci);
 Module findModule(Module scope, str name);
@@ -2240,7 +2241,6 @@ str iteratorRef;
 str joinPathRef;
 str joinRef;
 str jsonRef;
-str kdifferenceRef;
 str languageRef;
 str leftfetchjoinPathRef;
 str leftfetchjoinRef;
@@ -2448,6 +2448,7 @@ str putName(const char *nme, size_t len)
 str putRef;
 str queryRef;
 str querylogRef;
+str rankRef;
 str rapiRef;
 int readConsole(Client cntxt);
 MalStkPtr reallocGlobalStack(MalStkPtr s, int cnt);
@@ -2478,6 +2479,7 @@ int resolveType(int dsttype, int srctype
 str resultSetRef;
 str reuseRef;
 malType reverseBatType(malType v);
+str row_numberRef;
 int rowsProp;
 str rpcRef;
 str rsColumnRef;
@@ -2488,7 +2490,6 @@ str runMALDebugger(Client cntxt, Symbol 
 str runMALdataflow(Client cntxt, MalBlkPtr mb, int startpc, int stoppc, 
MalStkPtr stk);
 str runMALsequence(Client cntxt, MalBlkPtr mb, int startpc, int stoppc, 
MalStkPtr stk, MalStkPtr env, InstrPtr pcicaller);
 str runScenario(Client c);
-int runonceProp;
 void runtimeProfileBegin(Client cntxt, MalBlkPtr mb, MalStkPtr 

MonetDB: default - Approve output

[Martin Kersten]

Changeset: b3a59e2c533d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b3a59e2c533d
Modified Files:
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out
sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out.single
sql/test/mergetables/Tests/mergequery.stable.out
sql/test/remote/Tests/partition_elim.stable.out
Branch: default
Log Message:

Approve output


diffs (truncated from 1178 to 300 lines):

diff --git a/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out 
b/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
--- a/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
+++ b/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
@@ -44,7 +44,7 @@ Ready.
 % mal # name
 % clob # type
 % 206 # length
-function user.s5_1{autoCommit=true}(A0:timestamp,A1:timestamp,A2:void):void;
+function user.s5_1(A0:timestamp,A1:timestamp,A2:void):void;
 X_55:void := querylog.define("explain select (t-(select timestamp 
\\'1970-1-1\\')),v from foo_nil_2dec union all select (t-(select timestamp 
\\'1970-1-1\\')),null from foo_nil_2dec;","default_pipe",74);
 barrier X_111 := language.dataflow();
 X_33 := bat.new(nil:oid,nil:str);
@@ -62,27 +62,27 @@ barrier X_111 := language.dataflow();
 X_39 := bat.new(nil:oid,nil:int);
 X_48 := bat.append(X_39,0);
 X_54 := bat.append(X_48,9);
-X_6:bat[:oid,:lng]  := bat.new(nil:oid,nil:lng);
-X_5 := sql.mvc();
-X_64:bat[:oid,:oid] := sql.tid(X_5,"sys","foo_nil_2dec",0,2);
-X_66:bat[:oid,:timestamp] := sql.bind(X_5,"sys","foo_nil_2dec","t",0,0,2);
-(X_68:bat[:oid,:oid],X_69:bat[:oid,:timestamp]) := 
sql.bind(X_5,"sys","foo_nil_2dec","t",2,0,2);
+X_5:bat[:oid,:lng] := bat.new(nil:oid,nil:lng);
+X_4 := sql.mvc();
+X_64:bat[:oid,:oid] := sql.tid(X_4,"sys","foo_nil_2dec",0,2);
+X_66:bat[:oid,:timestamp] := sql.bind(X_4,"sys","foo_nil_2dec","t",0,0,2);
+(X_68:bat[:oid,:oid],X_69:bat[:oid,:timestamp]) := 
sql.bind(X_4,"sys","foo_nil_2dec","t",2,0,2);
 X_78 := sql.delta(X_66,X_68,X_69);
 X_80 := algebra.leftfetchjoin(X_64,X_78);
-X_16 := calc.timestamp(A0,7);
-X_82 := algebra.project(X_80,X_16);
+X_15 := calc.timestamp(A0,7);
+X_82 := algebra.project(X_80,X_15);
 X_84 := batmtime.diff(X_80,X_82);
-X_65:bat[:oid,:oid] := sql.tid(X_5,"sys","foo_nil_2dec",1,2);
-X_67:bat[:oid,:timestamp] := sql.bind(X_5,"sys","foo_nil_2dec","t",0,1,2);
-(X_70:bat[:oid,:oid],X_71:bat[:oid,:timestamp]) := 
sql.bind(X_5,"sys","foo_nil_2dec","t",2,1,2);
-X_14:bat[:oid,:timestamp] := sql.bind(X_5,"sys","foo_nil_2dec","t",1);
-X_79 := sql.delta(X_67,X_70,X_71,X_14);
+X_65:bat[:oid,:oid] := sql.tid(X_4,"sys","foo_nil_2dec",1,2);
+X_67:bat[:oid,:timestamp] := sql.bind(X_4,"sys","foo_nil_2dec","t",0,1,2);
+(X_70:bat[:oid,:oid],X_71:bat[:oid,:timestamp]) := 
sql.bind(X_4,"sys","foo_nil_2dec","t",2,1,2);
+X_13:bat[:oid,:timestamp] := sql.bind(X_4,"sys","foo_nil_2dec","t",1);
+X_79 := sql.delta(X_67,X_70,X_71,X_13);
 X_81 := algebra.leftfetchjoin(X_65,X_79);
-X_83 := algebra.project(X_81,X_16);
+X_83 := algebra.project(X_81,X_15);
 X_85 := batmtime.diff(X_81,X_83);
 X_96 := mat.packIncrement(X_84,2);
-X_18:bat[:oid,:lng] := mat.packIncrement(X_96,X_85);
-X_19 := bat.append(X_6,X_18,true);
+X_17:bat[:oid,:lng] := mat.packIncrement(X_96,X_85);
+X_18 := bat.append(X_5,X_17,true);
 X_20 := calc.timestamp(A1,7);
 X_86 := algebra.project(X_80,X_20);
 X_88 := batmtime.diff(X_80,X_86);
@@ -90,15 +90,15 @@ barrier X_111 := language.dataflow();
 X_89 := batmtime.diff(X_81,X_87);
 X_99 := mat.packIncrement(X_88,2);
 X_21:bat[:oid,:lng] := mat.packIncrement(X_99,X_89);
-X_22 := bat.append(X_19,X_21,true);
+X_22 := bat.append(X_18,X_21,true);
 X_23:bat[:oid,:lng] := bat.new(nil:oid,nil:lng);
-X_72:bat[:oid,:lng] := sql.bind(X_5,"sys","foo_nil_2dec","v",0,0,2);
-(X_74:bat[:oid,:oid],X_75:bat[:oid,:lng]) := 
sql.bind(X_5,"sys","foo_nil_2dec","v",2,0,2);
+X_72:bat[:oid,:lng] := sql.bind(X_4,"sys","foo_nil_2dec","v",0,0,2);
+(X_74:bat[:oid,:oid],X_75:bat[:oid,:lng]) := 
sql.bind(X_4,"sys","foo_nil_2dec","v",2,0,2);
 X_90 := sql.delta(X_72,X_74,X_75);
 X_92 := algebra.leftfetchjoin(X_64,X_90);
-X_73:bat[:oid,:lng] := sql.bind(X_5,"sys","foo_nil_2dec","v",0,1,2);
-(X_76:bat[:oid,:oid],X_77:bat[:oid,:lng]) := 
sql.bind(X_5,"sys","foo_nil_2dec","v",2,1,2);
-X_25:bat[:oid,:lng] := sql.bind(X_5,"sys","foo_nil_2dec","v",1);
+X_73:bat[:oid,:lng] := sql.bind(X_4,"sys","foo_nil_2dec","v",0,1,2);
+(X_76:bat[:oid,:oid],X_77:bat[:oid,:lng]) := 
sql.bind(X_4,"sys","foo_nil_2dec","v",2,1,2);
+X_25:bat[:oid,:lng] := sql.bind(X_4,"sys","foo_nil_2dec","v",1);
 X_91 := sql.delta(X_73,X_76,X_77,X_25);
 X_93 := algebra.left

MonetDB: default - Approve output

[Martin Kersten]

Changeset: 2143121d13ab for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2143121d13ab
Modified Files:
monetdb5/mal/Tests/tst275.stable.out
Branch: default
Log Message:

Approve output


diffs (122 lines):

diff --git a/monetdb5/mal/Tests/tst275.stable.out 
b/monetdb5/mal/Tests/tst275.stable.out
--- a/monetdb5/mal/Tests/tst275.stable.out
+++ b/monetdb5/mal/Tests/tst275.stable.out
@@ -54,8 +54,8 @@ end user.main;
 # tt   t  # name
 # void str str  # type
 #--#
-[ 0@0, "batId","tmp_525"  ]
-[ 1@0, "batCacheid",   "341"  ]
+[ 0@0, "batId","tmp_461"  ]
+[ 1@0, "batCacheid",   "305"  ]
 [ 2@0,   "hparentid","0" ]
 [ 3@0,   "tparentid","0" ]
 [ 4@0,   "batSharecnt",  "0" ]
@@ -71,57 +71,56 @@ end user.main;
 [ 14@0,"hsorted",  "1"  ]
 [ 15@0,"hrevsorted",   "1"  ]
 [ 16@0,"hident",   "h"  ]
-[ 17@0,"hdense",   "1"  ]
-[ 18@0,"hseqbase", "0@0"  ]
-[ 19@0,"hkey", "1"  ]
-[ 20@0,"hvarsized","1"  ]
-[ 21@0,"halign",   "0"  ]
-[ 22@0,"hnosorted","0"  ]
-[ 23@0,"hnorevsorted", "0"  ]
-[ 24@0,"hnodense", "0"  ]
-[ 25@0,"hnokey[0]","0"  ]
-[ 26@0,"hnokey[1]","0"  ]
-[ 27@0,"hnonil",   "1"  ]
-[ 28@0,"hnil", "0"  ]
-[ 29@0,"tident",   "t"  ]
-[ 30@0,"tdense",   "0"  ]
-[ 31@0,"tseqbase", "0@0"  ]
-[ 32@0,"tsorted",  "1"  ]
-[ 33@0,"trevsorted",   "1"  ]
-[ 34@0,"tkey", "1"  ]
-[ 35@0,"tvarsized","0"  ]
-[ 36@0,"talign",   "2001"  ]
-[ 37@0,"tnosorted","0"  ]
-[ 38@0,"tnorevsorted", "0"  ]
-[ 39@0,"tnodense", "0"  ]
-[ 40@0,"tnokey[0]","0"  ]
-[ 41@0,"tnokey[1]","0"  ]
-[ 42@0,"tnonil",   "1"  ]
-[ 43@0,"tnil", "0"  ]
-[ 44@0,"batInserted",  "0"  ]
-[ 45@0,"batDeleted",   "0"  ]
-[ 46@0,"batFirst", "0"  ]
-[ 47@0,"htop", "0"  ]
-[ 48@0,"ttop", "0"  ]
-[ 49@0,"batStamp", "152"  ]
-[ 50@0,"lastUsed", "1117"  ]
-[ 51@0,"curStamp", "154"  ]
-[ 52@0,"batCopiedtodisk",  "0"  ]
-[ 53@0,"batDirtydesc", "dirty"  ]
-[ 54@0,"H->heap.dirty","clean"  ]
-[ 55@0,"T->heap.dirty","clean"  ]
-[ 56@0,"head.free","0"  ]
-[ 57@0,"head.size","0"  ]
-[ 58@0,"head.storage", "absent"  ]
-[ 59@0,"head.newstorage",  "malloced"  ]
-[ 60@0,"head.filename","no file"  ]
-[ 61@0,"tail.free","0"  ]
-[ 62@0,"tail.size","1024"  ]
-[ 63@0,"tail.storage", "malloced"  ]
-[ 64@0,"tail.newstorage",  "malloced"  ]
-[ 65@0,"tail.filename","05/525.tail"  ]
-[ 66@0,"H->vheap->dirty",  "clean"  ]
-[ 67@0,"T->vheap->dirty",  "clean"  ]
+[ 17@0,"hseqbase", "0@0"  ]
+[ 18@0,"hkey", "1"  ]
+[ 19@0,"hvarsized","1"  ]
+[ 20@0,"halign",   "0"  ]
+[ 21@0,"hnosorted","0"  ]
+[ 22@0,"hnorevsorted", "0"  ]
+[ 23@0,"hnodense", "0"  ]
+[ 24@0,"hnokey[0]","0"  ]
+[ 25@0,"hnokey[1]","0"  ]
+[ 26@0,"hnonil",   "1"  ]
+[ 27@0,"hnil", "0"  ]
+[ 28@0,"tident",   "t"  ]
+[ 29@0,"tdense",   "0"  ]
+[ 30@0,"tseqbase", "0@0"  ]
+[ 31@0,"tsorted",  "1"  ]
+[ 32@0,"trevsorted",   "1"  ]
+[ 33@0,"tkey", "1"  ]
+[ 34@0,"tvarsized","0"  ]
+[ 35@0,"talign",   "2001"  ]
+[ 36@0,"tnosorted","0"  ]
+[ 37@0,"tnorevsorted", "0"  ]
+[ 38@0,"tnodense", "0"  ]
+[ 39@0,"tnokey[0]","0"  ]
+[ 40@0,"tnokey[1]","0"  ]
+[ 41@0,"tnonil",   "1"  ]
+[ 42@0,"tnil", "0"  ]
+[ 43@0,"batInserted",  "0"  ]
+[ 44@0,"batDeleted",   "0"  ]
+[ 45@0,"batFirst", "0"  ]
+[ 46@0,"htop", "0"  ]
+[ 47@0,"ttop", "0"  ]
+[ 48@0,"batStamp", "535"  ]
+[ 49@0,"lastUsed", "45504"  ]
+[ 50@0,"curStamp", "537"  ]
+[ 51@0,"batCopiedtodisk",  "0"  ]
+[ 52@0,"batDirtydesc", "dirty"  ]
+[ 53@0,"H->heap.dirty","clean"  ]
+[ 54@0,"T->heap.dirty","clean"  ]
+[ 55@0,"head.free","0"  ]
+[ 56@0,"head.size","0"  ]
+[ 57@0,"head.storage", "absent"  ]
+[ 58@0,"head.newstorage",  "malloced"  ]
+[ 59@0,"head.filename","no file"  ]
+[ 60@0,"tail.free","0"  ]
+[ 61@0,"tail.size","1024"  ]
+[ 62@0,"tail.storage", "malloced"  ]
+[ 63@0,"tail.newstorage",  "malloced"  ]
+[ 64@0,"tail.filena

MonetDB: default - Approve output

[Martin Kersten]

Changeset: 21e8b6e351db for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=21e8b6e351db
Modified Files:
clients/Tests/exports.stable.out
Branch: default
Log Message:

Approve output


diffs (11 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
@@ -2448,7 +2448,6 @@ str recycleRef;
 str reenterMAL(Client cntxt, MalBlkPtr mb, int startpc, int stoppc, MalStkPtr 
stk);
 str refineRef;
 str registerRef;
-void register_http_handler(http_request_handler handler);
 void releaseBAT(MalBlkPtr mb, MalStkPtr stk, int bid);
 str remapRef;
 str remoteRef;
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approve output

[Martin Kersten]

Changeset: 66325b2a7b74 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=66325b2a7b74
Modified Files:
monetdb5/mal/Tests/tst105a.malC
monetdb5/mal/Tests/tst105a.stable.err
monetdb5/mal/Tests/tst105a.stable.out
monetdb5/mal/Tests/tst1150.stable.out
monetdb5/mal/Tests/tst120a.stable.out
monetdb5/mal/Tests/tst120b.stable.out
monetdb5/mal/Tests/tst1225.stable.out
monetdb5/mal/Tests/tst1500.stable.out
monetdb5/mal/Tests/tst1502.stable.out
monetdb5/mal/Tests/tst1503.stable.out
monetdb5/mal/Tests/tst1504.stable.out
monetdb5/mal/Tests/tst1505.stable.out
monetdb5/mal/Tests/tst1506.stable.out
monetdb5/mal/Tests/tst1602.stable.out
monetdb5/mal/Tests/tst1604.stable.out
Branch: default
Log Message:

Approve output


diffs (truncated from 1115 to 300 lines):

diff --git a/monetdb5/mal/Tests/tst105a.malC b/monetdb5/mal/Tests/tst105a.malC
--- a/monetdb5/mal/Tests/tst105a.malC
+++ b/monetdb5/mal/Tests/tst105a.malC
@@ -1,7 +1,6 @@
 # check classification of functions in the proper module
 
 module bbp;
-command new(t:any_2):bat[:oid,:any_2]
-address GDKbatnew;
+command new(t:any_2):bat[:oid,:any_2] address GDKbatnew;
 
 b:= bbp.new(:int);
diff --git a/monetdb5/mal/Tests/tst105a.stable.err 
b/monetdb5/mal/Tests/tst105a.stable.err
--- a/monetdb5/mal/Tests/tst105a.stable.err
+++ b/monetdb5/mal/Tests/tst105a.stable.err
@@ -1,1 +1,41 @@
 stderr of test 'tst105a` in directory 'monetdb5/mal` itself:
+
+
+# 15:56:09 >  
+# 15:56:09 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=34844" "--set" 
"mapi_usock=/var/tmp/mtest-21504/.s.monetdb.34844" "--set" "monet_prompt=" 
"--forcemito" "--set" "mal_listing=2" 
"--dbpath=/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_mal" 
"--set" "mal_listing=2" "--set" "embedded_r=yes"
+# 15:56:09 >  
+
+# builtin opt  gdk_dbpath = 
/export/scratch1/mk/default//Linux/var/monetdb5/dbfarm/demo
+# builtin opt  gdk_debug = 0
+# builtin opt  gdk_vmtrim = no
+# builtin opt  monet_prompt = >
+# builtin opt  monet_daemon = no
+# builtin opt  mapi_port = 5
+# builtin opt  mapi_open = false
+# builtin opt  mapi_autosense = false
+# builtin opt  sql_optimizer = default_pipe
+# builtin opt  sql_debug = 0
+# cmdline opt  gdk_nr_threads = 0
+# cmdline opt  mapi_open = true
+# cmdline opt  mapi_port = 34844
+# cmdline opt  mapi_usock = /var/tmp/mtest-21504/.s.monetdb.34844
+# cmdline opt  monet_prompt = 
+# cmdline opt  mal_listing = 2
+# cmdline opt  gdk_dbpath = 
/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_mal
+# cmdline opt  mal_listing = 2
+# cmdline opt  embedded_r = yes
+# cmdline opt  gdk_debug = 536870922
+
+# 15:56:09 >  
+# 15:56:09 >  "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-21504" "--port=34844"
+# 15:56:09 >  
+
+MAPI  = (monetdb) /var/tmp/mtest-21504/.s.monetdb.34844
+QUERY = b:= bbp.new(:int);
+ERROR = !TypeException:user.main[1]:object code for command bbp.new missing
+!TypeException:user.main[1]:'bbp.new' undefined in: 
b:bat[:oid,:int] := bbp.new(:int);
+
+# 15:56:09 >  
+# 15:56:09 >  "Done."
+# 15:56:09 >  
+
diff --git a/monetdb5/mal/Tests/tst105a.stable.out 
b/monetdb5/mal/Tests/tst105a.stable.out
--- a/monetdb5/mal/Tests/tst105a.stable.out
+++ b/monetdb5/mal/Tests/tst105a.stable.out
@@ -19,15 +19,16 @@ stdout of test 'tst105a` in directory 'm
 # Finished reading the write-ahead log 'sql_logs/sql/log.4'
 # Finished processing logs sql/sql_logs
 # MonetDB/SQL module loaded
-command bbp.new(t:any_2):bat[:oid,:any_2] address GDKbatnew;
-!TypeException:user.main[2]:object code for command bbp.new missing
-!TypeException:user.main[2]:'bbp.new' undefined in: b:bat[:oid,:int] := 
bbp.new(:int);
-function user.main():void;
-# check classification of functions in the proper module 
-b := bbp.new(:int);
-end user.main;
+# MonetDB/R   module loaded
 
-# 07:58:57 >  
-# 07:58:57 >  Done.
-# 07:58:57 >  
+Ready.
 
+# 15:56:09 >  
+# 15:56:09 >  "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-21504" "--port=34844"
+# 15:56:09 >  
+
+
+# 15:56:09 >  
+# 15:56:09 >  "Done."
+# 15:56:09 >  
+
diff --git a/monetdb5/mal/Tests/tst1150.stable.out 
b/monetdb5/mal/Tests/tst1150.stable.out
--- a/monetdb5/mal/Tests/tst1150.stable.out
+++ b/monetdb5/mal/Tests/tst1150.stable.out
@@ -5,48 +5,31 @@ stdout of test 'tst1150` in directory 'm
 # 07:59:00 >  Mtimeout -timeout 60 Mserver 
"--config=/ufs/mk/monet5/Linux/etc/MonetDB5.conf" --debug=10 --set 
"monet_mod_path=/ufs/mk/monet5/Linux/lib/MonetDB5:/ufs/mk/opensource/MonetDB/Linux/lib/MonetDB"
 --set "gdk_dbfarm=/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm" --set 
"sql_logdir=/ufs/mk/monet5/Linux/var/MonetDB5/log" --set mapi_port=42158 --set 
sql_port=55708 --set monet_prompt= --trace 
"--config=/ufs/mk/monet5/src/mal/Tests/All.conf" --dbname=mTests_src_mal  
tst1150.mal   
 
-

MonetDB: default - Approve output

[Martin Kersten]

Changeset: c7a1259b8ae5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c7a1259b8ae5
Removed Files:
monetdb5/optimizer/Tests/tst4602.malC
monetdb5/optimizer/Tests/tst4602.stable.err
monetdb5/optimizer/Tests/tst4602.stable.out
Modified Files:
monetdb5/optimizer/Tests/All
monetdb5/optimizer/Tests/DCexample2.stable.out
monetdb5/optimizer/Tests/FTexample.malC
monetdb5/optimizer/Tests/GCexample01.stable.out
monetdb5/optimizer/Tests/JPexample.stable.out
monetdb5/optimizer/Tests/inline07.stable.out
monetdb5/optimizer/Tests/inline09.stable.out
monetdb5/optimizer/Tests/inline10.stable.out
monetdb5/optimizer/Tests/inlineFunction.malC
monetdb5/optimizer/Tests/inlineFunction1.stable.out
monetdb5/optimizer/Tests/joinchain.stable.out
monetdb5/optimizer/Tests/remap.malC
monetdb5/optimizer/Tests/tst4000.malC
monetdb5/optimizer/Tests/tst4000.stable.out
monetdb5/optimizer/Tests/tst4003.malC
monetdb5/optimizer/Tests/tst4003.stable.out
monetdb5/optimizer/Tests/tst4004.stable.out
monetdb5/optimizer/Tests/tst4010.malC
monetdb5/optimizer/Tests/tst4010.stable.out
monetdb5/optimizer/Tests/tst4030.malC
monetdb5/optimizer/Tests/tst4030.stable.out
monetdb5/optimizer/Tests/tst4601.stable.out
Branch: default
Log Message:

Approve output


diffs (truncated from 974 to 300 lines):

diff --git a/monetdb5/optimizer/Tests/All b/monetdb5/optimizer/Tests/All
--- a/monetdb5/optimizer/Tests/All
+++ b/monetdb5/optimizer/Tests/All
@@ -7,7 +7,6 @@ tst4005
 tst4010
 tst4030
 tst4601
-tst4602
 tst4630
 #tst4700 no compiler
 #tst4701
diff --git a/monetdb5/optimizer/Tests/DCexample2.stable.out 
b/monetdb5/optimizer/Tests/DCexample2.stable.out
--- a/monetdb5/optimizer/Tests/DCexample2.stable.out
+++ b/monetdb5/optimizer/Tests/DCexample2.stable.out
@@ -5,30 +5,48 @@ stdout of test 'DCexample2` in directory
 # 22:31:27 >  Mtimeout -timeout 60 mserver5 
"--config=/ufs/mk/monet5/Linux/etc/monetdb5.conf" --debug=10 --set 
"monet_mod_path=/ufs/mk/monet5//Linux/lib/MonetDB5:/ufs/mk/monet5//Linux/lib/MonetDB5/lib:/ufs/mk/monet5//Linux/lib/MonetDB5/bin"
 --set "gdk_dbfarm=/ufs/mk/monet5//Linux/var/MonetDB5/dbfarm" --set 
"sql_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/sql_logs" --set 
"xquery_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/xquery_logs" --set 
mapi_port=34030 --set xrpc_port=44388 --set monet_prompt= --trace 
--dbname=mTests_src_optimizer  DCexample2.mal < /dev/null
 # 22:31:27 >  
 
-# MonetDB Server v5.0.0_beta2_1
-# Copyright (c) 1993-2007 CWI, all rights reserved
-# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs dynamically linked
-# dbname:mTests_src_optimizer
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:32348/
-function user.main():void;
-b := bat.new(:oid,:int);
-bat.append(b,2);
-bat.append(b,5);
-bat.append(b,3);
-b := algebra.subsort(b,false,false);
-mdb.List();
-end user.main;
-function user.main():void; #[0]  0 
-b:bat[:oid,:int] := bat.new(:oid,:int);#[1] CMDBATnew 2 <- 3 4 
-bat.append(b:bat[:oid,:int],2:int);#[2] BKCappend_val_wrap 5 <- 2 
6 
-bat.append(b:bat[:oid,:int],5:int);#[3] BKCappend_val_wrap 7 <- 2 
8 
-bat.append(b:bat[:oid,:int],3:int);#[4] BKCappend_val_wrap 9 <- 2 
10 
-b:bat[:oid,:int] := algebra.subsort(b:bat[:oid,:int],false:bit,false:bit); 
#[5] ALGsubsort11 2 <- 2 11 12 
-mdb.List();#[6] MDBlistDetail 15 
-end user.main; #[7]  
+# MonetDB 5 server v11.22.0
+# This is an unreleased version
+# Serving database 'mTests_monetdb5_optimizer', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit 
integers dynamically linked
+# Found 15.589 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://vienna.da.cwi.nl:33343/
+# Listening for UNIX domain connection requests on 
mapi:monetdb:///var/tmp/mtest-8837/.s.monetdb.33343
+# MonetDB/GIS module loaded
+# Start processing logs sql/sql_logs version 52200
+# Start reading the write-ahead log 'sql_logs/sql/log.4'
+# Finished reading the write-ahead log 'sql_logs/sql/log.4'
+# Finished processing logs sql/sql_logs
+# MonetDB/SQL module loaded
+# MonetDB/R   module loaded
 
-# 22:31:27 >  
-# 22:31:27 >  Done.
-# 22:31:27 >  
+Ready.
 
+# 06:41:04 >  
+# 06:41:04 >  "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-8837" "--port=33343"
+# 06:41:04 >  
+
+#mdb.List("user","foo");
+function user.foo():void;  #[0]  0 
+b:bat[:oid,:int] := bat.new(:oid,:int

MonetDB: default - Approve output

[Martin Kersten]

Changeset: 9aab37a15bc6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9aab37a15bc6
Modified Files:
monetdb5/mal/Tests/flowchk.stable.err
monetdb5/mal/Tests/flowchk.stable.out
Branch: default
Log Message:

Approve output


diffs (66 lines):

diff --git a/monetdb5/mal/Tests/flowchk.stable.err 
b/monetdb5/mal/Tests/flowchk.stable.err
--- a/monetdb5/mal/Tests/flowchk.stable.err
+++ b/monetdb5/mal/Tests/flowchk.stable.err
@@ -65,7 +65,15 @@ stderr of test 'flowchk` in directory 'm
 #warning: please don't forget to set your vault key!
 #(see /ufs/mk/monet5//Linux/etc/monetdb5.conf)
 
-# 20:45:09 >  
-# 20:45:09 >  Done.
-# 20:45:09 >  
+# 07:33:12 >  
+# 07:33:12 >  "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-15547" "--port=37088"
+# 07:33:12 >  
 
+MAPI  = (monetdb) /var/tmp/mtest-15547/.s.monetdb.37088
+QUERY = end tst;
+
+
+# 07:33:12 >  
+# 07:33:12 >  "Done."
+# 07:33:12 >  
+
diff --git a/monetdb5/mal/Tests/flowchk.stable.out 
b/monetdb5/mal/Tests/flowchk.stable.out
--- a/monetdb5/mal/Tests/flowchk.stable.out
+++ b/monetdb5/mal/Tests/flowchk.stable.out
@@ -9,19 +9,26 @@ stdout of test 'flowchk` in directory 'm
 # Serving database 'mTests_src_mal', using 4 threads
 # Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically 
linked
 # Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008-2009 MonetDB B.V., all rights reserved
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:32709/
-!TypeException:user.tst[5]:'a' may not be used before being initialized
-function user.tst():void;
-barrier go := true;
-a := bat.new(:oid,:int);
-io.print(a);
-exit go;
-c := a;
-end user.tst;
+# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://vienna.da.cwi.nl:37088/
+# Listening for UNIX domain connection requests on 
mapi:monetdb:///var/tmp/mtest-15547/.s.monetdb.37088
+# MonetDB/GIS module loaded
+# Start processing logs sql/sql_logs version 52200
+# Start reading the write-ahead log 'sql_logs/sql/log.4'
+# Finished reading the write-ahead log 'sql_logs/sql/log.4'
+# Finished processing logs sql/sql_logs
+# MonetDB/SQL module loaded
+# MonetDB/R   module loaded
 
-# 20:45:09 >  
-# 20:45:09 >  Done.
-# 20:45:09 >  
+Ready.
 
+# 07:33:12 >  
+# 07:33:12 >  "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-15547" "--port=37088"
+# 07:33:12 >  
+
+
+# 07:33:12 >  
+# 07:33:12 >  "Done."
+# 07:33:12 >  
+
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approve output.

[Martin van Dinther]

Changeset: 477932282ab6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=477932282ab6
Modified Files:

sql/test/SQLite_regress/sqllogictest/Tests/select3.test.stable.out.int128
Branch: default
Log Message:

Approve output.


diffs (truncated from 763 to 300 lines):

diff --git 
a/sql/test/SQLite_regress/sqllogictest/Tests/select3.test.stable.out.int128 
b/sql/test/SQLite_regress/sqllogictest/Tests/select3.test.stable.out.int128
--- a/sql/test/SQLite_regress/sqllogictest/Tests/select3.test.stable.out.int128
+++ b/sql/test/SQLite_regress/sqllogictest/Tests/select3.test.stable.out.int128
@@ -61109,7 +61109,6 @@ Ready.
 [ 685, 229 ]
 [ 698, 234 ]
 [ 711, 239 ]
-[ 723, 243 ]
 [ 743, 245 ]
 #SELECT a+b*2,
 #   abs(a)
@@ -61137,7 +61136,6 @@ Ready.
 [ 685, 229 ]
 [ 698, 234 ]
 [ 711, 239 ]
-[ 723, 243 ]
 [ 743, 245 ]
 #SELECT (SELECT count(*) FROM t1 AS x WHERE x.b(SELECT avg(c) FROM t1) THEN a*2 ELSE b*10 END,
 #   CASE WHEN ab-2 AND ahttps://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - approve output

[Niels Nes]

Changeset: 35e28172407d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=35e28172407d
Added Files:
sql/test/BugTracker-2015/Tests/constant-random.Bug-3836.stable.err
sql/test/BugTracker-2015/Tests/constant-random.Bug-3836.stable.out
sql/test/BugTracker-2015/Tests/missed-error.Bug-3842.stable.err
sql/test/BugTracker-2015/Tests/missed-error.Bug-3842.stable.out
Branch: default
Log Message:

approve output


diffs (287 lines):

diff --git a/sql/test/BugTracker-2015/Tests/constant-random.Bug-3836.stable.err 
b/sql/test/BugTracker-2015/Tests/constant-random.Bug-3836.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/constant-random.Bug-3836.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'constant-random.Bug-3836` in directory 
'sql/test/BugTracker-2015` itself:
+
+
+# 17:48:01 >  
+# 17:48:01 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=31631" "--set" 
"mapi_usock=/var/tmp/mtest-18246/.s.monetdb.31631" "--set" "monet_prompt=" 
"--forcemito" "--set" "mal_listing=2" 
"--dbpath=/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015"
 "--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 17:48:01 >  
+
+# builtin opt  gdk_dbpath = 
/home/niels/scratch/monetdb/Linux-x86_64/var/monetdb5/dbfarm/demo
+# builtin opt  gdk_debug = 0
+# builtin opt  gdk_vmtrim = no
+# builtin opt  monet_prompt = >
+# builtin opt  monet_daemon = no
+# builtin opt  mapi_port = 5
+# builtin opt  mapi_open = false
+# builtin opt  mapi_autosense = false
+# builtin opt  sql_optimizer = default_pipe
+# builtin opt  sql_debug = 0
+# cmdline opt  gdk_nr_threads = 0
+# cmdline opt  mapi_open = true
+# cmdline opt  mapi_port = 31631
+# cmdline opt  mapi_usock = /var/tmp/mtest-18246/.s.monetdb.31631
+# cmdline opt  monet_prompt = 
+# cmdline opt  mal_listing = 2
+# cmdline opt  gdk_dbpath = 
/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015
+# cmdline opt  mal_listing = 0
+# cmdline opt  embedded_r = yes
+# cmdline opt  gdk_debug = 536870922
+
+# 17:48:01 >  
+# 17:48:01 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-18246" "--port=31631"
+# 17:48:01 >  
+
+
+# 17:48:01 >  
+# 17:48:01 >  "Done."
+# 17:48:01 >  
+
diff --git a/sql/test/BugTracker-2015/Tests/constant-random.Bug-3836.stable.out 
b/sql/test/BugTracker-2015/Tests/constant-random.Bug-3836.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/constant-random.Bug-3836.stable.out
@@ -0,0 +1,85 @@
+stdout of test 'constant-random.Bug-3836` in directory 
'sql/test/BugTracker-2015` itself:
+
+
+# 17:48:01 >  
+# 17:48:01 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=31631" "--set" 
"mapi_usock=/var/tmp/mtest-18246/.s.monetdb.31631" "--set" "monet_prompt=" 
"--forcemito" "--set" "mal_listing=2" 
"--dbpath=/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015"
 "--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 17:48:01 >  
+
+# MonetDB 5 server v11.22.0
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2015', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit 
integers dynamically linked
+# Found 7.333 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://localhost.nes.nl:31631/
+# Listening for UNIX domain connection requests on 
mapi:monetdb:///var/tmp/mtest-18246/.s.monetdb.31631
+# MonetDB/GIS module loaded
+# Start processing logs sql/sql_logs version 52200
+# Start reading the write-ahead log 'sql_logs/sql/log.55'
+# Finished reading the write-ahead log 'sql_logs/sql/log.55'
+# Finished processing logs sql/sql_logs
+# MonetDB/SQL module loaded
+# MonetDB/R   module loaded
+
+Ready.
+
+# 17:48:01 >  
+# 17:48:01 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-18246" "--port=31631"
+# 17:48:01 >  
+
+#create table tr(a int);
+#insert into tr values (1), (1);
+[ 2]
+#select a + rand() from tr;
+% sys.L # table_name
+% sql_add_a # name
+% bigint # type
+% 10 # length
+[ 2024039433   ]
+[ 61050385 ]
+#create table trand (a int, b int default rand());
+#insert into trand(a) values (1);
+[ 1]
+#insert into trand(a) values (2);
+[ 1]
+#insert into trand(a) values (3);
+[ 1]
+#alter table trand add column c int default rand();
+#alter table trand add column d int default null;
+#select * from trand;
+% sys.trand,   sys.trand,  sys.trand,  sys.trand # table_name
+% a,   b,  c,  d # name
+% int, int,int,int # type
+% 1,   10, 10, 1 # length
+[ 1,   1608666431, 2022107617, NULL]
+[ 2,   1889558987, 237295360,  NULL

MonetDB: default - Approve output

[Martin Kersten]

Changeset: 7337849bc476 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7337849bc476
Modified Files:
monetdb5/optimizer/Tests/FTexample.stable.out
Branch: default
Log Message:

Approve output


diffs (60 lines):

diff --git a/monetdb5/optimizer/Tests/FTexample.stable.out 
b/monetdb5/optimizer/Tests/FTexample.stable.out
--- a/monetdb5/optimizer/Tests/FTexample.stable.out
+++ b/monetdb5/optimizer/Tests/FTexample.stable.out
@@ -5,23 +5,39 @@ stdout of test 'FTexample` in directory 
 # 23:53:03 >  Mtimeout -timeout 60 Mserver 
"--config=/ufs/mk/monet5/src/mal/Tests/All.conf" --debug=10 --set 
"monet_mod_path=/ufs/mk/monet5/Linux/lib/MonetDB5:/ufs/mk/opensource/MonetDB/Linux/lib/MonetDB"
 --set "gdk_dbfarm=/ufs/mk/opensource/MonetDB/Linux/var/MonetDB5/dbfarm" --set 
"sql_logdir=/ufs/mk/opensource/MonetDB/Linux/var/MonetDB5/log" --set 
mapi_port=39352 --set sql_port=45171 --set xquery_port=52900 --set 
monet_prompt= --trace --dbname=mTests_src_optimizer  FTexample.mal   
 
-# MonetDB server v5.7.0, based on kernel v1.25.0
-# Serving database 'mTests_src_optimizer', using 4 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically 
linked
-# Copyright (c) 1993-2008 CWI, all rights reserved
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:32348/
-function user.test(s:str):wrd;
-b := bat.new(:oid,:str);
-bat.append(b,"hello");
-z := algebra.subselect(b,s,s,true,true,false);
-i := aggr.count(z);
-return test := i;
-end user.test;
-function user.main():void;
-#Code factorization 
-mdb.List("user","test");
-end user.main;
+# MonetDB 5 server v11.22.0
+# This is an unreleased version
+# Serving database 'mTests_monetdb5_optimizer', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit 
integers dynamically linked
+# Found 15.589 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://vienna.da.cwi.nl:33204/
+# Listening for UNIX domain connection requests on 
mapi:monetdb:///var/tmp/mtest-32050/.s.monetdb.33204
+# MonetDB/GIS module loaded
+# Start processing logs sql/sql_logs version 52200
+# Start reading the write-ahead log 'sql_logs/sql/log.4'
+# Finished reading the write-ahead log 'sql_logs/sql/log.4'
+# Finished processing logs sql/sql_logs
+# MonetDB/SQL module loaded
+# MonetDB/R   module loaded
+
+Ready.
+
+# 23:59:48 >  
+# 23:59:48 >  "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-32050" "--port=33204"
+# 23:59:48 >  
+
+#mdb.List("user","test");
+function user.test(s:str):wrd; #[0]  0 <- 1 
+b:bat[:oid,:str] := bat.new(:oid,:str);#[1] CMDBATnew 2 <- 3 4 
+bat.append(b:bat[:oid,:str],"hello":str);  #[2] BKCappend_val_wrap 5 <- 2 
6 
+z:bat[:oid,:oid] := 
algebra.subselect(b:bat[:oid,:str],s:str,s:str,true:bit,true:bit,false:bit);   
#[3] ALGsubselect1 7 <- 2 1 1 8 9 10 
+i:wrd := aggr.count(z:bat[:oid,:oid]); #[4] ALGcount_bat 11 <- 7 
+return test:wrd := i:wrd;  #[5]  0 <- 11 
+end user.test; #[6]  
+#mdb.List("user","test");
 factory user.test(s:str):wrd;  #[0]  0 <- 1 
 b:bat[:oid,:str] := bat.new(:oid,:str);#[1] CMDBATnew 2 <- 3 4 
 bat.append(b:bat[:oid,:str],"hello":str);  #[2] BKCappend_val_wrap 5 <- 2 
6 
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approve output

[Martin Kersten]

Changeset: db0e8e6b550b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=db0e8e6b550b
Modified Files:
monetdb5/extras/rapi/Tests/rapi07.stable.err
monetdb5/extras/rapi/Tests/rapi07.stable.out
monetdb5/mal/Tests/All
monetdb5/mal/Tests/dynamicload.stable.err
monetdb5/mal/Tests/flowchk.stable.err
monetdb5/mal/Tests/parseErrors.stable.err
monetdb5/mal/Tests/parseErrors.stable.out
monetdb5/mal/Tests/pithole.stable.err
monetdb5/mal/Tests/recycle01.stable.out
monetdb5/mal/Tests/recycle02.stable.out
monetdb5/mal/Tests/tst002.stable.err
monetdb5/mal/Tests/tst003.stable.err
monetdb5/mal/Tests/tst007.stable.err
monetdb5/mal/Tests/tst007.stable.out
monetdb5/mal/Tests/tst008.stable.err
monetdb5/mal/Tests/tst010.stable.err
monetdb5/mal/Tests/tst013.stable.err
monetdb5/mal/Tests/tst019.stable.err
monetdb5/mal/Tests/tst019.stable.out
monetdb5/mal/Tests/tst027.stable.err
monetdb5/mal/Tests/tst027.stable.out
monetdb5/mal/Tests/tst036.stable.err
monetdb5/mal/Tests/tst036.stable.out
monetdb5/mal/Tests/tst038.stable.err
monetdb5/mal/Tests/tst050.malC
monetdb5/mal/Tests/tst050.stable.err
monetdb5/mal/Tests/tst054.stable.err
monetdb5/mal/Tests/tst058.stable.err
monetdb5/mal/Tests/tst070.stable.err
monetdb5/mal/Tests/tst071.stable.err
monetdb5/mal/Tests/tst071.stable.out
monetdb5/mal/Tests/tst102.stable.err
monetdb5/mal/Tests/tst104.stable.err
monetdb5/mal/Tests/tst105.stable.err
monetdb5/mal/Tests/tst105a.stable.err
monetdb5/mal/Tests/tst106.stable.err
monetdb5/mal/Tests/tst108.stable.err
monetdb5/mal/Tests/tst109.stable.err
monetdb5/mal/Tests/tst115.stable.err
monetdb5/mal/Tests/tst150.stable.err
monetdb5/mal/Tests/tst1500.stable.err
monetdb5/mal/Tests/tst1500.stable.out
monetdb5/mal/Tests/tst161.stable.err
monetdb5/mal/Tests/tst163.stable.err
monetdb5/mal/Tests/tst163.stable.out
monetdb5/mal/Tests/tst200.stable.err
monetdb5/mal/Tests/tst200.stable.out
monetdb5/mal/Tests/tst201.malC
monetdb5/mal/Tests/tst201.stable.out
monetdb5/mal/Tests/tst272.stable.err
monetdb5/mal/Tests/tst272.stable.out
monetdb5/mal/Tests/tst275.stable.err
monetdb5/mal/Tests/tst275.stable.out
monetdb5/mal/Tests/tst302.stable.err
monetdb5/mal/Tests/tst303.stable.err
monetdb5/mal/Tests/tst305.stable.err
monetdb5/mal/Tests/tst611.stable.err
monetdb5/mal/Tests/tst660.stable.err
monetdb5/mal/Tests/tst755.stable.err
monetdb5/mal/Tests/tst760.stable.err
monetdb5/mal/Tests/tst804.stable.err
monetdb5/mal/Tests/tst840.stable.err
monetdb5/mal/Tests/tst840.stable.out
monetdb5/mal/Tests/tst850.malC
monetdb5/mal/Tests/tst900.stable.err
monetdb5/mal/Tests/tst903.stable.out
monetdb5/mal/Tests/tst904.malC
monetdb5/mal/Tests/tst905.malC
monetdb5/mal/Tests/tst907.malC
monetdb5/optimizer/Tests/ARexample.stable.out
monetdb5/optimizer/Tests/All
monetdb5/optimizer/Tests/CXexample.stable.out
monetdb5/optimizer/Tests/DCexample.stable.out
monetdb5/optimizer/Tests/JPexample.stable.out
monetdb5/optimizer/Tests/ifthencst.stable.out
monetdb5/optimizer/Tests/inline04.malC
monetdb5/optimizer/Tests/inline05.malC
monetdb5/optimizer/Tests/inline06.malC
monetdb5/optimizer/Tests/inline07.malC
monetdb5/optimizer/Tests/inline08.malC
monetdb5/optimizer/Tests/inline09.malC
monetdb5/optimizer/Tests/inline10.malC
monetdb5/optimizer/Tests/inlineCst.malC
monetdb5/optimizer/Tests/inlineFunction1.stable.out
monetdb5/optimizer/Tests/joinchain.stable.out
monetdb5/optimizer/Tests/manifold2.stable.out
monetdb5/optimizer/Tests/reorder00.stable.out
monetdb5/optimizer/Tests/tst4001.stable.out
monetdb5/optimizer/Tests/tst4004.stable.out
Branch: default
Log Message:

Approve output


diffs (truncated from 3366 to 300 lines):

diff --git a/monetdb5/extras/rapi/Tests/rapi07.stable.err 
b/monetdb5/extras/rapi/Tests/rapi07.stable.err
--- a/monetdb5/extras/rapi/Tests/rapi07.stable.err
+++ b/monetdb5/extras/rapi/Tests/rapi07.stable.err
@@ -1,11 +1,11 @@
 stderr of test 'rapi07` in directory 'monetdb5/extras/rapi` itself:
 
 
-# 20:20:45 >  
-# 20:20:45 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=38117" "--set" 
"mapi_usock=/var/tmp/mtest-2827/.s.monetdb.38117" "--set" "monet_prompt=" 
"--forcemito" "--set" "mal_listing=2" 
"--dbpath=/ufs/manegold/_/Monet/HG/Oct2014/prefix/--disable-debug_--enable-assert_--enable-optimize/var/MonetDB/mTests_mone

MonetDB: default - Approve output

[Martin Kersten]

Changeset: a387d75a4436 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a387d75a4436
Modified Files:
monetdb5/extras/rapi/Tests/rapi01.stable.err
monetdb5/extras/rapi/Tests/rapi01.stable.out
monetdb5/mal/Tests/recycle01.stable.err
monetdb5/mal/Tests/recycle01.stable.out
monetdb5/mal/Tests/recycle02.stable.err
monetdb5/mal/Tests/recycle02.stable.out
monetdb5/mal/Tests/tst1002.malC
monetdb5/mal/Tests/tst1002.stable.err
monetdb5/mal/Tests/tst1002.stable.out
monetdb5/mal/Tests/tst102.stable.err
monetdb5/mal/Tests/tst102.stable.out
monetdb5/mal/Tests/tst108.stable.err
monetdb5/mal/Tests/tst108.stable.out
monetdb5/mal/Tests/tst109.stable.err
monetdb5/mal/Tests/tst109.stable.out
monetdb5/mal/Tests/tst1200.stable.out
monetdb5/mal/Tests/tst1203.stable.out
monetdb5/mal/Tests/tst1500.stable.out
monetdb5/mal/Tests/tst670.malC
monetdb5/mal/Tests/tst670.stable.err
monetdb5/mal/Tests/tst670.stable.out
monetdb5/optimizer/Tests/inline02.stable.out
monetdb5/optimizer/Tests/inline03.stable.out
monetdb5/optimizer/Tests/inline08.malC
monetdb5/optimizer/Tests/inline09.malC
monetdb5/optimizer/Tests/inlineIfthen.stable.out
monetdb5/optimizer/opt_inline.c
Branch: default
Log Message:

Approve output


diffs (truncated from 1444 to 300 lines):

diff --git a/monetdb5/extras/rapi/Tests/rapi01.stable.err 
b/monetdb5/extras/rapi/Tests/rapi01.stable.err
--- a/monetdb5/extras/rapi/Tests/rapi01.stable.err
+++ b/monetdb5/extras/rapi/Tests/rapi01.stable.err
@@ -30,26 +30,37 @@ stderr of test 'rapi01` in directory 'mo
 # 11:17:47 >  "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-13991" "--port=31221"
 # 11:17:47 >  
 
-MAPI  = (monetdb) /var/tmp/mtest-13991/.s.monetdb.31221
-QUERY = r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"someresult <- 
Re(fft(somevalue));",b);
+MAPI  = (monetdb) /var/tmp/mtest-23471/.s.monetdb.34866
+QUERY = # Error handling tests
+b:= bat.new(:oid,:int);
+bat.append(b,1804289383);
+bat.append(b,846930886);
+bat.append(b,1681692777);
+bat.append(b,1714636915);
+bat.append(b,1957747793);
+bat.append(b,424238335);
+bat.append(b,719885386);
+bat.append(b,1649760492);
+bat.append(b,596516649);
+bat.append(b,1189641421);
+
+io.print(b);
+
+# illegal variables being used
+
+r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"someresult <- 
Re(fft(somevalue));",b);
+r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"someresult <- 
Re(fft(arg2));",b);
+r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"ret0 <- Re(fft(somevalue));",b);
+r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"ret1 <- Re(fft(arg2));",b);
+r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"ret0 <- Re(fft(arg5));",b);
+
+# illegal R expressions
+r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"ret0 <- Re(fft(arg2)  )  );",b);
+
+io.print(r);
 ERROR = !MALException:rapi.eval:Error running R expression: Error in 
fft(somevalue) : object 'somevalue' not found Calls: as.data.frame -> 
 -> fft 
-MAPI  = (monetdb) /var/tmp/mtest-13991/.s.monetdb.31221
-QUERY = r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"someresult <- 
Re(fft(arg2));",b);
-ERROR = !MALException:rapi.eval:Error running R expression: Error in fft(arg2) 
: object 'arg2' not found Calls: as.data.frame ->  -> fft 
-MAPI  = (monetdb) /var/tmp/mtest-13991/.s.monetdb.31221
-QUERY = r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"ret0 <- Re(fft(somevalue));",b);
-ERROR = !MALException:rapi.eval:Error running R expression: Error in 
fft(somevalue) : object 'somevalue' not found Calls: as.data.frame -> 
 -> fft 
-MAPI  = (monetdb) /var/tmp/mtest-13991/.s.monetdb.31221
-QUERY = r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"ret1 <- Re(fft(arg2));",b);
-ERROR = !MALException:rapi.eval:Error running R expression: Error in fft(arg2) 
: object 'arg2' not found Calls: as.data.frame ->  -> fft 
-MAPI  = (monetdb) /var/tmp/mtest-13991/.s.monetdb.31221
-QUERY = r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"ret0 <- Re(fft(arg5));",b);
-ERROR = !MALException:rapi.eval:Error running R expression: Error in fft(arg5) 
: object 'arg5' not found Calls: as.data.frame ->  -> fft 
-MAPI  = (monetdb) /var/tmp/mtest-13991/.s.monetdb.31221
-QUERY = r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"ret0 <- Re(fft(arg2)  )  );",b);
-ERROR = !MALException:rapi.eval:Error parsing R expression 'ret0 <- 
Re(fft(arg2)  )  );'. 
 
-# 11:17:47 >  
-# 11:17:47 >  "Done."
-# 11:17:47 >  
+# 20:42:39 >  
+# 20:42:39 >  "Done."
+# 20:42:39 >  
 
diff --git a/monetdb5/extras/rapi/Tests/rapi01.stable.out 
b/monetdb5/extras/rapi/Tests/rapi01.stable.out
--- a/monetdb5/extras/rapi/Tests/rapi01.stable.out
+++ b/monetdb5/extras/rapi/Tests/rapi01.stable.out
@@ -39,8 +39,6 @@ Ready.
 [ 7@0, 1649760492

MonetDB: default - Approve output

[Martin Kersten]

Changeset: 8648c37526ef for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8648c37526ef
Added Files:
monetdb5/mal/Tests/tst005.malC
monetdb5/mal/Tests/tst005.stable.err
monetdb5/mal/Tests/tst022.stable.err
monetdb5/mal/Tests/tst022.stable.out
monetdb5/mal/Tests/tst116.malC
monetdb5/mal/Tests/tst116.stable.err
monetdb5/mal/Tests/tst116.stable.out
monetdb5/mal/Tests/tst237.malC
monetdb5/mal/Tests/tst237.stable.err
monetdb5/mal/Tests/tst237.stable.out
Removed Files:
monetdb5/mal/Tests/tst040.mal
Modified Files:
monetdb5/mal/Tests/All
monetdb5/mal/Tests/tst005.stable.out
Branch: default
Log Message:

Approve output


diffs (truncated from 579 to 300 lines):

diff --git a/monetdb5/mal/Tests/All b/monetdb5/mal/Tests/All
--- a/monetdb5/mal/Tests/All
+++ b/monetdb5/mal/Tests/All
@@ -3,6 +3,7 @@ tst001
 tst002
 tst003
 tst004
+tst005
 tst006
 tst007
 tst008
@@ -35,7 +36,6 @@ tst036
 tst037
 tst038
 tst039
-tst040
 tst041
 tst042
 tst043
@@ -80,6 +80,7 @@ tst108
 tst109
 tst110
 tst115
+tst116
 tst1150
 #tst120files are not located in module and paths are runtime dependent
 tst1200
@@ -114,6 +115,7 @@ tst232
 tst233
 tst234
 tst235
+tst237
 tst250
 tst2500
 tst2501
diff --git a/monetdb5/mal/Tests/tst005.malC b/monetdb5/mal/Tests/tst005.malC
new file mode 100644
--- /dev/null
+++ b/monetdb5/mal/Tests/tst005.malC
@@ -0,0 +1,23 @@
+# test proper exists
+function foo();
+   i:= 1;
+   j:= 2;
+barrier v:=i;
+   io.print("entered");
+   io.print(v);
+   redo v:= iterator.next(-1,0);
+exit   v;
+   io.print("doubles");
+   i:= 1;
+barrier (v,w):=(i,j);
+   io.print("entered2");
+   io.print(v);
+   v:= v-1;
+   barrier b:= v == 0;
+   leave (v,w);
+   exit b;
+   redo (v,w):= (v,w);
+exit   (v,w);
+   io.print("finished");
+end foo;
+user.foo();
diff --git a/monetdb5/mal/Tests/tst005.stable.err 
b/monetdb5/mal/Tests/tst005.stable.err
new file mode 100644
--- /dev/null
+++ b/monetdb5/mal/Tests/tst005.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'tst005` in directory 'monetdb5/mal` itself:
+
+
+# 08:15:16 >  
+# 08:15:16 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=32746" "--set" 
"mapi_usock=/var/tmp/mtest-26338/.s.monetdb.32746" "--set" "monet_prompt=" 
"--forcemito" "--set" "mal_listing=2" 
"--dbpath=/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_mal" 
"--set" "mal_listing=2" "--set" "embedded_r=yes"
+# 08:15:16 >  
+
+# builtin opt  gdk_dbpath = 
/export/scratch1/mk/default//Linux/var/monetdb5/dbfarm/demo
+# builtin opt  gdk_debug = 0
+# builtin opt  gdk_vmtrim = no
+# builtin opt  monet_prompt = >
+# builtin opt  monet_daemon = no
+# builtin opt  mapi_port = 5
+# builtin opt  mapi_open = false
+# builtin opt  mapi_autosense = false
+# builtin opt  sql_optimizer = default_pipe
+# builtin opt  sql_debug = 0
+# cmdline opt  gdk_nr_threads = 0
+# cmdline opt  mapi_open = true
+# cmdline opt  mapi_port = 32746
+# cmdline opt  mapi_usock = /var/tmp/mtest-26338/.s.monetdb.32746
+# cmdline opt  monet_prompt = 
+# cmdline opt  mal_listing = 2
+# cmdline opt  gdk_dbpath = 
/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_mal
+# cmdline opt  mal_listing = 2
+# cmdline opt  embedded_r = yes
+# cmdline opt  gdk_debug = 536870922
+
+# 08:15:16 >  
+# 08:15:16 >  "mclient" "-lmal" "-ftest" "-Eutf-8" 
"--host=/var/tmp/mtest-26338" "--port=32746"
+# 08:15:16 >  
+
+
+# 08:15:16 >  
+# 08:15:16 >  "Done."
+# 08:15:16 >  
+
diff --git a/monetdb5/mal/Tests/tst005.stable.out 
b/monetdb5/mal/Tests/tst005.stable.out
--- a/monetdb5/mal/Tests/tst005.stable.out
+++ b/monetdb5/mal/Tests/tst005.stable.out
@@ -1,52 +1,37 @@
-# Monet Database Server V4.5.0
-# Copyright (c) 1993-2004, CWI. All rights reserved.
-# Compiled for i686-redhat-linux-gnu/32bit; dynamically linked.
-# config:/ufs/mk/monet5/src/mal/Tests/All.conf
-# dbfarm:/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm
-# dbname:demo
-# Visit http://monetdb.cwi.nl for further information.
-## test proper exists
-#  i:= 1;
-#  j:= 2;
-#barrier v:=i;
-#  print("entered");
-#  print(v);
-#  redo v:= v -1;
-#exit  v;
-#  print("doubles");
-#barrier (v,w):=(i,j);
-#  print("entered");
-#  print(v);
-#  v:= v-1;
-#  redo (v,w):= (v,w);
-#exit  (v,w);
-#
-#  print("finished");
-#
-function Admin.main():int; # 0  (main:int)
-i := 1;# 1  (i:int)<-($2:int)
-j := 2;# 2  (j:int)<-($4:int)
-barrier v := i;# 3  (v:int)<-(i:int) jump 7
-io.print("entered");   # 4 IOprint_val ($6:int)<-($7:str)
-io.print(v);   # 5 IOprint_val ($8:int)<-(v:int)
-redo v := calc.-(v,1); # 6 CALCbinarySUBintint 
(v:int)<-(v:int)($2:int) jump 4
-exit v;# 7  (v:int)
-io.print("doubles");   # 8 IOprint_val ($9:int)<-($10:str)
-barrier (v,w):= (i,j

MonetDB: default - Approve output

[Martin Kersten]

Changeset: 614c5863fc83 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=614c5863fc83
Added Files:
sql/backends/monet5/Tests/simpleSQL.malC
sql/backends/monet5/vaults/Tests/vault00.malC
Removed Files:
sql/backends/monet5/Tests/simpleSQL.mal
sql/backends/monet5/vaults/Tests/vault00.mal
sql/test/BugTracker-2009/Tests/union_leak.SF-2540169.2.mal
Modified Files:
sql/backends/monet5/Tests/prepare.mal
sql/backends/monet5/Tests/simpleSQL.stable.err
sql/backends/monet5/Tests/simpleSQL.stable.out
sql/test/BugTracker-2009/Tests/All
Branch: default
Log Message:

Approve output


diffs (160 lines):

diff --git a/sql/backends/monet5/Tests/prepare.mal 
b/sql/backends/monet5/Tests/prepare.mal
--- a/sql/backends/monet5/Tests/prepare.mal
+++ b/sql/backends/monet5/Tests/prepare.mal
@@ -1,4 +1,5 @@
 #execute simple SQL queries from MAL 
+function foo();
 sql.init();
 
 sql.prepare("myqry","select 2;");
@@ -13,3 +14,6 @@ select * from sys.prepared();
 
 sql.deallocate("myqry");
 sql.deallocate("myqry2");
+end foo;
+mdb.list("user","foo");
+user.foo();
diff --git a/sql/backends/monet5/Tests/simpleSQL.mal 
b/sql/backends/monet5/Tests/simpleSQL.malC
rename from sql/backends/monet5/Tests/simpleSQL.mal
rename to sql/backends/monet5/Tests/simpleSQL.malC
--- a/sql/backends/monet5/Tests/simpleSQL.mal
+++ b/sql/backends/monet5/Tests/simpleSQL.malC
@@ -1,4 +1,5 @@
 #execute simple SQL queries from MAL 
+function foo();
 sql.init();
 sql.eval("select 1;",true);
 
@@ -11,3 +12,6 @@ sql.eval("drop table simpleT;");
 
 #cause an error
 sql.eval("select 1;",false);
+end foo;
+mdb.list("user","foo");
+user.foo();
diff --git a/sql/backends/monet5/Tests/simpleSQL.stable.err 
b/sql/backends/monet5/Tests/simpleSQL.stable.err
--- a/sql/backends/monet5/Tests/simpleSQL.stable.err
+++ b/sql/backends/monet5/Tests/simpleSQL.stable.err
@@ -24,7 +24,31 @@ stderr of test 'simpleSQL` in directory 
 # cmdline opt  gdk_dbpath = 
/export/scratch1/mk/default//Linux/var/MonetDB/mTests_sql_backends_monet5
 # cmdline opt  gdk_debug = 536870922
 
-# 23:37:35 >  
-# 23:37:35 >  "Done."
-# 23:37:35 >  
+# 13:03:24 >  
+# 13:03:24 >  "mclient" "-lmal" "-ftest" "-Eutf-8" 
"--host=/var/tmp/mtest-21282" "--port=38130"
+# 13:03:24 >  
 
+MAPI  = (monetdb) /var/tmp/mtest-21282/.s.monetdb.38130
+QUERY = #execute simple SQL queries from MAL 
+function foo();
+sql.init();
+sql.eval("select 1;",true);
+
+sql.eval("create table simpleT(i integer);");
+sql.eval("insert into simpleT values(123);");
+
+sql.eval("select * from simpleT;");
+sql.eval("select * from simpleT;",false);
+sql.eval("drop table simpleT;");
+
+#cause an error
+sql.eval("select 1;",false);
+end foo;
+mdb.list("user","foo");
+user.foo();
+ERROR = !SQLException:sql.exportValue:failed
+
+# 13:03:24 >  
+# 13:03:24 >  "Done."
+# 13:03:24 >  
+
diff --git a/sql/backends/monet5/Tests/simpleSQL.stable.out 
b/sql/backends/monet5/Tests/simpleSQL.stable.out
--- a/sql/backends/monet5/Tests/simpleSQL.stable.out
+++ b/sql/backends/monet5/Tests/simpleSQL.stable.out
@@ -17,8 +17,15 @@ stdout of test 'simpleSQL` in directory 
 # Listening for UNIX domain connection requests on 
mapi:monetdb:///var/tmp/mtest-28801/.s.monetdb.30175
 # MonetDB/GIS module loaded
 # MonetDB/SQL module loaded
-function user.main():void;
-#execute simple SQL queries from MAL  
+# MonetDB/R   module loaded
+
+Ready.
+
+# 13:03:24 >  
+# 13:03:24 >  "mclient" "-lmal" "-ftest" "-Eutf-8" 
"--host=/var/tmp/mtest-21282" "--port=38130"
+# 13:03:24 >  
+
+function user.foo():void;
 sql.init();
 sql.eval("select 1;",true);
 sql.eval("create table simpleT(i integer);");
@@ -28,28 +35,23 @@ function user.main():void;
 sql.eval("drop table simpleT;");
 #cause an error 
 sql.eval("select 1;",false);
-end user.main;
-&1 0 1 1 1
+end user.foo;
 % .L # table_name
 % single_value # name
 % tinyint # type
 % 1 # length
 [ 1]
-&2 1 -1
-&1 0 1 1 1
+[ 1]
 % sys.simplet # table_name
 % i # name
 % int # type
 % 3 # length
 [ 123  ]
-&1 0 1 1 1
 % sys.simplet # table_name
 % i # name
 % int # type
 % 3 # length
 [ 123  ]
-!SQLException:sql.exportValue:failed
-
 
 # 23:37:35 >  
 # 23:37:35 >  "Done."
diff --git a/sql/backends/monet5/vaults/Tests/vault00.mal 
b/sql/backends/monet5/vaults/Tests/vault00.malC
rename from sql/backends/monet5/vaults/Tests/vault00.mal
rename to sql/backends/monet5/vaults/Tests/vault00.malC
--- a/sql/backends/monet5/vaults/Tests/vault00.mal
+++ b/sql/backends/monet5/vaults/Tests/vault00.malC
@@ -1,3 +1,5 @@
-
+function foo();
 s:= vault.getdirectory();
 io.print(s);
+end foo;
+user.foo();
diff --git a/sql/test/BugTracker-2009/Tests/All 
b/sql/test/BugTracker-2009/Tests/All
--- a/sql/test/BugTracker-2009/Tests/All
+++ b/sql/test/BugTracker-2009/Tests/All
@@ -9,7 +9,6 @@ incomplete.SF.2536893
 subquer

MonetDB: default - Approve output

[Martin Kersten]

Changeset: bc99ac396d18 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bc99ac396d18
Modified Files:
monetdb5/modules/mal/Tests/remote03.stable.err
monetdb5/modules/mal/Tests/remote03.stable.out.int128
monetdb5/optimizer/Tests/dataflow4.stable.out
Branch: default
Log Message:

Approve output


diffs (247 lines):

diff --git a/monetdb5/modules/mal/Tests/remote03.stable.err 
b/monetdb5/modules/mal/Tests/remote03.stable.err
--- a/monetdb5/modules/mal/Tests/remote03.stable.err
+++ b/monetdb5/modules/mal/Tests/remote03.stable.err
@@ -1,14 +1,96 @@
 stderr of test 'remote03` in directory 'monetdb5/modules/mal` itself:
 
 
-# 15:28:56 >  
-# 15:28:56 >  Mtimeout -timeout 60  mserver5 
"--config=/ufs/fabian/scratch/monetdb/current/program-x86_64/etc/monetdb5.conf" 
--debug=10 --set 
"monet_mod_path=/ufs/fabian/scratch/monetdb/current/program-x86_64/lib64/MonetDB5:/ufs/fabian/scratch/monetdb/current/program-x86_64/lib64/MonetDB5/lib:/ufs/fabian/scratch/monetdb/current/program-x86_64/lib64/MonetDB5/bin"
 --set 
"gdk_dbfarm=/net/pegasus.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-current-pegasus.ins.cwi.nl/five/dbfarm"
 --set 
"sql_logdir=/net/pegasus.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-current-pegasus.ins.cwi.nl/five/sqllog"
 --set 
"xquery_logdir=/net/pegasus.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-current-pegasus.ins.cwi.nl/five/xquerylog"
 --set mapi_open=true --set mapi_port=34439 --set xrpc_port=43409 --set 
monet_prompt= --trace --dbname=mTests_src_modules_mal  remote03.mal
-# 15:28:56 >  
+# 23:12:08 >  
+# 23:12:08 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=30565" "--set" 
"mapi_usock=/var/tmp/mtest-23626/.s.monetdb.30565" "--set" "monet_prompt=" 
"--forcemito" "--set" "mal_listing=2" 
"--dbpath=/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_modules_mal"
 "--set" "mal_listing=2" "--set" "embedded_r=yes"
+# 23:12:08 >  
 
-#warning: please don't forget to set your vault key!
-#(see /ufs/fabian/scratch/monetdb/current/program-x86_64/etc/monetdb5.conf)
+# builtin opt  gdk_dbpath = 
/export/scratch1/mk/default//Linux/var/monetdb5/dbfarm/demo
+# builtin opt  gdk_debug = 0
+# builtin opt  gdk_vmtrim = no
+# builtin opt  monet_prompt = >
+# builtin opt  monet_daemon = no
+# builtin opt  mapi_port = 5
+# builtin opt  mapi_open = false
+# builtin opt  mapi_autosense = false
+# builtin opt  sql_optimizer = default_pipe
+# builtin opt  sql_debug = 0
+# cmdline opt  gdk_nr_threads = 0
+# cmdline opt  mapi_open = true
+# cmdline opt  mapi_port = 30565
+# cmdline opt  mapi_usock = /var/tmp/mtest-23626/.s.monetdb.30565
+# cmdline opt  monet_prompt = 
+# cmdline opt  mal_listing = 2
+# cmdline opt  gdk_dbpath = 
/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_modules_mal
+# cmdline opt  mal_listing = 2
+# cmdline opt  embedded_r = yes
+# cmdline opt  gdk_debug = 536870922
 
-# 15:28:56 >  
-# 15:28:56 >  Done.
-# 15:28:56 >  
+# 23:12:08 >  
+# 23:12:08 >  "mclient" "-lmal" "-ftest" "-Eutf-8" 
"--host=/var/tmp/mtest-23626" "--port=30565"
+# 23:12:08 >  
 
+MAPI  = (monetdb) /var/tmp/mtest-23626/.s.monetdb.30565
+QUERY = # let connect figure out itself how to connect to the running db
+uri := sabaoth.getLocalConnectionURI();
+conn:str := remote.connect(uri, "monetdb", "monetdb");
+
+# this is invalid, as io.print is an invalid module, and bla will be
+# taken as function
+res:str := remote.put(conn,:void);
+res := remote.exec(conn, "io.print", "bla");
+catch SyntaxException:str;
+   io.print("Received first error from the remote site");
+   io.printf("!%s\n", SyntaxException);
+exit SyntaxException;
+
+# now do it with a function that returns something (a BAT in this case)
+bn:= bat.new(:oid,:str);
+b := remote.put(conn,bn);
+catch MALException:str;
+   io.print("Received second init error from the remote site");
+   io.printf("!%s\n", MALException);
+exit MALException;
+io.print(b);
+b := remote.exec(conn, "inspect", "getAtomNames");
+catch MALException:str;
+   io.print("Received second error from the remote site");
+   io.printf("!%s\n", MALException);
+exit MALException;
+io.print(b);
+
+c:bat[:oid,:str] := remote.get(conn, b);
+io.print(c);
+catch MALException:str;
+   io.print("Received third error from the remote site");
+   io.printf("!%s\n", MALException);
+exit MALException;
+
+# io.print only outputs things, but returns nothing
+ah:str := remote.put(conn,:void);
+io.print(ah);
+ah:str := remote.exec(conn, "io", "print", b);
+catch MALException:str;
+   io.print("Received fourth error from the remote site");
+   

MonetDB: default - Approve output

[Martin Kersten]

Changeset: 5817dd6b6654 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5817dd6b6654
Modified Files:
clients/Tests/exports.stable.out
Branch: default
Log Message:

Approve output


diffs (59 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
@@ -2005,7 +2005,6 @@ void deriveModule(Module scope, str nme)
 malType destinationType(MalBlkPtr mb, InstrPtr p);
 str diffRef;
 str disconnectRef;
-void displayVolume(Client cntxt, lng vol);
 str divRef;
 void dumpExceptionsToStream(stream *out, str msg);
 void dumpHelpTable(stream *f, Module s, str text, int flag);
@@ -2135,7 +2134,6 @@ str io_stderr(Client cntxt, MalBlkPtr mb
 str io_stdin(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
 str io_stdout(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
 int isAllScalar(MalBlkPtr mb, InstrPtr p);
-int isAmbiguousType(int type);
 int isBlocking(InstrPtr p);
 int isDelta(InstrPtr q);
 int isDependent(InstrPtr p, InstrPtr q);
@@ -2164,7 +2162,6 @@ int isSubJoin(InstrPtr q);
 int isSubSelect(InstrPtr q);
 int isTmpName(const char *n);
 int isTopn(InstrPtr q);
-int isTypeName(str n);
 int isUnsafeFunction(InstrPtr q);
 int isUnsafeInstruction(InstrPtr q);
 int isUpdateInstruction(InstrPtr p);
@@ -2282,7 +2279,6 @@ InstrPtr newStmt(MalBlkPtr mb, char *mod
 InstrPtr newStmt1(MalBlkPtr mb, str module, char *name);
 InstrPtr newStmt2(MalBlkPtr mb, str module, char *name);
 Symbol newSymbol(str nme, int kind);
-str newTmpName(char tag, int i);
 int newTmpSink(MalBlkPtr mb, malType type);
 int newTmpVariable(MalBlkPtr mb, malType type);
 int newTypeVariable(MalBlkPtr mb, malType type);
@@ -2365,7 +2361,6 @@ str rankRef;
 str rapiRef;
 int readConsole(Client cntxt);
 MalStkPtr reallocGlobalStack(MalStkPtr s, int cnt);
-MalStkPtr reallocStack(MalStkPtr s, int cnt);
 str reconnectRef;
 MalBlkPtr recycleBlk;
 int recycleCacheLimit;
@@ -2432,7 +2427,6 @@ void showException(stream *out, enum mal
 void showFlowGraph(MalBlkPtr mb, MalStkPtr stk, str fname);
 void showHelp(Module m, str txt, stream *fs);
 void showMalBlkHistory(stream *out, MalBlkPtr mb);
-void showModuleStatistics(stream *f, Module s);
 void showOptimizerHistory(void);
 void showOptimizerStep(str fnme, int i, int flg);
 void showScenario(stream *f, Scenario s);
@@ -2508,7 +2502,6 @@ void unloadLibraries(void);
 str unlockRef;
 str unpackRef;
 str unpinRef;
-void updateFootPrint(MalBlkPtr mb, MalStkPtr stk, int varid);
 str updateRef;
 void updateScenario(str scen, str nme, MALfcn fcn);
 str userRef;
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approve output

[Martin Kersten]

Changeset: 4e9b1355f5d7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4e9b1355f5d7
Modified Files:
clients/Tests/exports.stable.out
monetdb5/mal/Tests/tst611.stable.err
Branch: default
Log Message:

Approve output


diffs (36 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
@@ -2368,7 +2368,6 @@ str recycleRef;
 str reenterMAL(Client cntxt, MalBlkPtr mb, int startpc, int stoppc, MalStkPtr 
stk);
 str refineRef;
 str registerRef;
-void releaseBAT(MalBlkPtr mb, MalStkPtr stk, int bid);
 str remapRef;
 str remoteRef;
 void removeDataflow(MalBlkPtr mb);
@@ -2400,7 +2399,6 @@ void runtimeProfileBegin(Client cntxt, M
 void runtimeProfileExit(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci, RuntimeProfile prof);
 void runtimeProfileFinish(Client cntxt, MalBlkPtr mb);
 void runtimeProfileInit(Client cntxt, MalBlkPtr mb, MalStkPtr stk);
-str safeguardStack(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
 int safetyBarrier(InstrPtr p, InstrPtr q);
 str schedulerRef;
 str selectNotNilRef;
diff --git a/monetdb5/mal/Tests/tst611.stable.err 
b/monetdb5/mal/Tests/tst611.stable.err
--- a/monetdb5/mal/Tests/tst611.stable.err
+++ b/monetdb5/mal/Tests/tst611.stable.err
@@ -30,11 +30,11 @@ stderr of test 'tst611` in directory 'mo
 # 09:29:46 >  "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-25470" "--port=39422"
 # 09:29:46 >  
 
-MAPI  = (monetdb) /var/tmp/mtest-3713/.s.monetdb.31932
+MAPI  = (monetdb) /var/tmp/mtest-7956/.s.monetdb.39940
 QUERY = # initialization of BATs on the stack
 # caused a problem when executed in interactve mode
 function foo();
-RKA:= bat.new(:int,1048576);
+RKA:bat[:int]:= bat.new(:int,1048576);
 bat.append(RKA,360:int);
 io.print(RKA);
 
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approve output

[Martin Kersten]

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.

MonetDB: default - Approve output

[Martin Kersten]

Changeset: 68efe36f2e71 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=68efe36f2e71
Modified Files:
clients/Tests/exports.stable.out
Branch: default
Log Message:

Approve output


diffs (12 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
@@ -1251,7 +1251,7 @@ str MALpass(Client cntxt, MalBlkPtr mb, 
 str MALpipeline(Client c);
 str MALreader(Client c);
 void MALresourceFairness(lng usec);
-int MALrunningThreads(void);
+size_t 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);
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approve output

[Martin Kersten]

Changeset: ec55a3bda374 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ec55a3bda374
Modified Files:
monetdb5/optimizer/Tests/JPexample.stable.out
monetdb5/optimizer/Tests/projectionchain.stable.out
sql/benchmarks/ssbm/Tests/04-explain.stable.out
sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/05-explain.stable.out
sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/06-explain.stable.out
sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/07-explain.stable.out
sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/08-explain.stable.out
sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/09-explain.stable.out
sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/11-explain.stable.out
sql/benchmarks/ssbm/Tests/11-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/12-explain.stable.out
sql/benchmarks/ssbm/Tests/12-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/13-explain.stable.out
sql/benchmarks/ssbm/Tests/13-explain.stable.out.int128
sql/benchmarks/tpch/Tests/05-explain.stable.out
sql/benchmarks/tpch/Tests/05-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/05-explain.stable.out.int128
sql/benchmarks/tpch/Tests/07-explain.stable.out
sql/benchmarks/tpch/Tests/07-explain.stable.out.int128
sql/benchmarks/tpch/Tests/08-explain.stable.out
sql/benchmarks/tpch/Tests/08-explain.stable.out.int128
sql/benchmarks/tpch/Tests/09-explain.stable.out
sql/benchmarks/tpch/Tests/09-explain.stable.out.int128
sql/benchmarks/tpch/Tests/15-explain.stable.out
sql/benchmarks/tpch/Tests/15-explain.stable.out.int128
sql/benchmarks/tpch/Tests/16-explain.stable.out
sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/17-explain.stable.out
sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
sql/benchmarks/tpch/Tests/18-explain.stable.out
sql/benchmarks/tpch/Tests/18-explain.stable.out.int128
sql/benchmarks/tpch/Tests/19-explain.stable.out
sql/benchmarks/tpch/Tests/19-explain.stable.out.int128
sql/benchmarks/tpch/Tests/20-explain.stable.out
sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/20-explain.stable.out.int128
sql/benchmarks/tpch/Tests/21-explain.stable.out
sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/22-explain.stable.out
sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/22-explain.stable.out.int128
Branch: default
Log Message:

Approve output


diffs (truncated from 1651 to 300 lines):

diff --git a/monetdb5/optimizer/Tests/JPexample.stable.out 
b/monetdb5/optimizer/Tests/JPexample.stable.out
--- a/monetdb5/optimizer/Tests/JPexample.stable.out
+++ b/monetdb5/optimizer/Tests/JPexample.stable.out
@@ -36,11 +36,12 @@ function user.foo():void;   
 c:bat[:oid] := bat.new(:oid,:oid); #[3] CMDBATnew 4 <- 2 2 
 d:bat[:oid] := bat.new(:oid,:oid); #[4] CMDBATnew 5 <- 2 2 
 j1:bat[:oid] := algebra.projection(a:bat[:oid],b:bat[:oid]);   #[5] 
ALGprojection 6 <- 1 3 
-j2:bat[:oid] := 
algebra.projectionpath(a:bat[:oid],b:bat[:oid],c:bat[:oid]);   #[6] 
ALGprojectionpath 7 <- 1 3 4 
-j3:bat[:any] := 
algebra.projectionpath(a:bat[:oid],b:bat[:oid],c:bat[:oid],d:bat[:oid]);   #[7] 
ALGprojectionpath 8 <- 1 3 4 5 
-j4:bat[:any] := 
algebra.projectionpath(a:bat[:oid],b:bat[:oid],c:bat[:oid]);   #[8] 
ALGprojectionpath 9 <- 1 3 4 
-j5:bat[:oid] := 
algebra.projectionpath(a:bat[:oid],b:bat[:oid],c:bat[:oid],b:bat[:oid]);   #[9] 
ALGprojectionpath 10 <- 1 3 4 3 
-end user.foo;  #[10]  
+X_11:bat[:oid] := 
algebra.projectionpath(a:bat[:oid],b:bat[:oid],c:bat[:oid]); #[6] 
ALGprojectionpath 11 <- 1 3 4 
+j2:bat[:oid] := X_11:bat[:oid];#[7]  7 <- 11 
+j3:bat[:any] := algebra.projectionpath(X_11:bat[:oid],d:bat[:oid]);
#[8] ALGprojectionpath 8 <- 11 5 
+j4:bat[:any] := X_11:bat[:oid];#[9]  9 <- 11 
+j5:bat[:oid] := algebra.projectionpath(X_11:bat[:oid],b:bat[:oid]);
#[10] ALGprojectionpath 10 <- 11 3 
+end user.foo;  #[11]  
 
 # 06:41:06 >  
 # 06:41:06 >  "Done."
diff --git a/monetdb5/optimizer/Tests/projectionchain.stable.out 
b/monetdb5/optimizer/Tests/projectionchain.stable.out
--- a/monetdb5/optimizer/Tests/projectionchain.stable.out
+++ b/monetdb5/optimizer/Tests/projectionchain.stable.out
@@ -64,25 +64,28 @@ function user.qry():void;
 bat.append(k,8);
 b

MonetDB: default - Approve output

[Martin Kersten]

Changeset: bef1d50c4c34 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bef1d50c4c34
Modified Files:
monetdb5/mal/Tests/dynamicload.stable.err
Branch: default
Log Message:

Approve output


diffs (12 lines):

diff --git a/monetdb5/mal/Tests/dynamicload.stable.err 
b/monetdb5/mal/Tests/dynamicload.stable.err
--- a/monetdb5/mal/Tests/dynamicload.stable.err
+++ b/monetdb5/mal/Tests/dynamicload.stable.err
@@ -80,7 +80,7 @@ stderr of test 'dynamicload` in director
 # 13:21:38 >  "mclient" "-lmal" "-ftest" "-Eutf-8" 
"--host=/var/tmp/mtest-18020" "--port=37961"
 # 13:21:38 >  
 
-MAPI  = (monetdb) /var/tmp/mtest-7978/.s.monetdb.32278
+MAPI  = (monetdb) /var/tmp/mtest-6360/.s.monetdb.38700
 QUERY = # examples of non-bindable instructions
 
 #load unknown library
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approve output

[Martin Kersten]

Changeset: d05b8549226a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d05b8549226a
Modified Files:
monetdb5/optimizer/Tests/JPexample.stable.out
monetdb5/optimizer/Tests/projectionchain.stable.out
sql/benchmarks/ssbm/Tests/04-explain.stable.out
sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/05-explain.stable.out
sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/06-explain.stable.out
sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/07-explain.stable.out
sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/08-explain.stable.out
sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/09-explain.stable.out
sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/10-explain.stable.out
sql/benchmarks/ssbm/Tests/10-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/11-explain.stable.out
sql/benchmarks/ssbm/Tests/11-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/12-explain.stable.out
sql/benchmarks/ssbm/Tests/12-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/13-explain.stable.out
sql/benchmarks/ssbm/Tests/13-explain.stable.out.int128
sql/benchmarks/tpch/Tests/02-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out.int128
sql/benchmarks/tpch/Tests/05-explain.stable.out
sql/benchmarks/tpch/Tests/05-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/05-explain.stable.out.int128
sql/benchmarks/tpch/Tests/07-explain.stable.out
sql/benchmarks/tpch/Tests/07-explain.stable.out.int128
sql/benchmarks/tpch/Tests/08-explain.stable.out
sql/benchmarks/tpch/Tests/08-explain.stable.out.int128
sql/benchmarks/tpch/Tests/09-explain.stable.out
sql/benchmarks/tpch/Tests/09-explain.stable.out.int128
sql/benchmarks/tpch/Tests/10-explain.stable.out
sql/benchmarks/tpch/Tests/10-explain.stable.out.int128
sql/benchmarks/tpch/Tests/15-explain.stable.out
sql/benchmarks/tpch/Tests/15-explain.stable.out.int128
sql/benchmarks/tpch/Tests/16-explain.stable.out
sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/17-explain.stable.out
sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
sql/test/leaks/Tests/check1.stable.out.int128
sql/test/leaks/Tests/check2.stable.out.int128
sql/test/leaks/Tests/check3.stable.out.int128
sql/test/leaks/Tests/check4.stable.out.int128
sql/test/leaks/Tests/check5.stable.out.int128
Branch: default
Log Message:

Approve output


diffs (truncated from 1962 to 300 lines):

diff --git a/monetdb5/optimizer/Tests/JPexample.stable.out 
b/monetdb5/optimizer/Tests/JPexample.stable.out
--- a/monetdb5/optimizer/Tests/JPexample.stable.out
+++ b/monetdb5/optimizer/Tests/JPexample.stable.out
@@ -31,7 +31,16 @@ Ready.
 
 #mdb.List("user","foo");
 function user.foo():void;  #[0]  0 
-end user.foo;  #[1]  
+a:bat[:oid] := bat.new(:oid,:oid); #[1] CMDBATnew 1 <- 2 2 
+b:bat[:oid] := bat.new(:oid,:oid); #[2] CMDBATnew 3 <- 2 2 
+c:bat[:oid] := bat.new(:oid,:oid); #[3] CMDBATnew 4 <- 2 2 
+d:bat[:oid] := bat.new(:oid,:oid); #[4] CMDBATnew 5 <- 2 2 
+j1:bat[:oid] := algebra.projection(a:bat[:oid],b:bat[:oid]);   #[5] 
ALGprojection 6 <- 1 3 
+j2:bat[:oid] := 
algebra.projectionpath(a:bat[:oid],b:bat[:oid],c:bat[:oid]);   #[6] 
ALGprojectionpath 7 <- 1 3 4 
+j3:bat[:any] := 
algebra.projectionpath(a:bat[:oid],b:bat[:oid],c:bat[:oid],d:bat[:oid]);   #[7] 
ALGprojectionpath 8 <- 1 3 4 5 
+j4:bat[:any] := 
algebra.projectionpath(a:bat[:oid],b:bat[:oid],c:bat[:oid]);   #[8] 
ALGprojectionpath 9 <- 1 3 4 
+j5:bat[:oid] := 
algebra.projectionpath(a:bat[:oid],b:bat[:oid],c:bat[:oid],b:bat[:oid]);   #[9] 
ALGprojectionpath 10 <- 1 3 4 3 
+end user.foo;  #[10]  
 
 # 06:41:06 >  
 # 06:41:06 >  "Done."
diff --git a/monetdb5/optimizer/Tests/projectionchain.stable.out 
b/monetdb5/optimizer/Tests/projectionchain.stable.out
--- a/monetdb5/optimizer/Tests/projectionchain.stable.out
+++ b/monetdb5/optimizer/Tests/projectionchain.stable.out
@@ -63,17 +63,26 @@ function user.qry():void;
 bat.append(k,7);
 bat.append(k,8);
 bat.append(k,9);
-X_89:bat[:oid] := algebra.projectionpath(a,b,c);
-f:bat[:oid] := X_89;
+e := algebra.projection(a,b);
+f:bat[:oid] := algebra.projectionpath(a,b,c);
 g := alg

MonetDB: default - Approve output

[Martin Kersten]

Changeset: c9ab8de25201 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c9ab8de25201
Modified Files:
sql/benchmarks/tpch/Tests/18-explain.stable.out.int128
sql/benchmarks/tpch/Tests/19-explain.stable.out.int128
sql/benchmarks/tpch/Tests/20-explain.stable.out.int128
sql/benchmarks/tpch/Tests/21-explain.stable.out
sql/benchmarks/tpch/Tests/22-explain.stable.out.int128
Branch: default
Log Message:

Approve output


diffs (226 lines):

diff --git a/sql/benchmarks/tpch/Tests/18-explain.stable.out.int128 
b/sql/benchmarks/tpch/Tests/18-explain.stable.out.int128
--- a/sql/benchmarks/tpch/Tests/18-explain.stable.out.int128
+++ b/sql/benchmarks/tpch/Tests/18-explain.stable.out.int128
@@ -64,7 +64,7 @@ Ready.
 % clob # type
 % 515 # length
 function user.s2_1(A0:sht):void;
-X_177:void := querylog.define("explain select\n c_name,\n c_custkey,\n 
o_orderkey,\n o_orderdate,\n o_totalprice,\n sum(l_quantity)\nfrom\n 
customer,\n orders,\n lineitem\nwhere\n o_orderkey in (\n select\n l_orderkey\n 
from\n lineitem\n group by\n l_orderkey having\n sum(l_quantity) > 300\n )\n 
and c_custkey = o_custkey\n and o_orderkey = l_orderkey\ngroup by\n c_name,\n 
c_custkey,\n o_orderkey,\n o_orderdate,\n o_totalprice\norder by\n o_totalprice 
desc,\n o_orderdate\nlimit 100;","sequential_pipe",121);
+X_177:void := querylog.define("explain select\n c_name,\n c_custkey,\n 
o_orderkey,\n o_orderdate,\n o_totalprice,\n sum(l_quantity)\nfrom\n 
customer,\n orders,\n lineitem\nwhere\n o_orderkey in (\n select\n l_orderkey\n 
from\n lineitem\n group by\n l_orderkey having\n sum(l_quantity) > 300\n )\n 
and c_custkey = o_custkey\n and o_orderkey = l_orderkey\ngroup by\n c_name,\n 
c_custkey,\n o_orderkey,\n o_orderdate,\n o_totalprice\norder by\n o_totalprice 
desc,\n o_orderdate\nlimit 100;","sequential_pipe",117);
 X_128 := bat.new(nil:oid,nil:str);
 X_136 := bat.append(X_128,"sys.customer");
 X_144 := bat.append(X_136,"sys.customer");
@@ -150,17 +150,16 @@ function user.s2_1(A0:sht):void;
 X_124:bat[:lng] := algebra.projectionpath(X_61,r1_62,X_25);
 X_125:bat[:hge] := aggr.subsum(X_124,X_75,r1_90,true,true);
 (X_82,r1_117) := algebra.subjoin(X_81,X_15,nil:BAT,nil:BAT,false,nil:lng);
-X_189:bat[:oid] := algebra.projection(r1_117,C_3);
 X_84:bat[:date] := sql.bind(X_2,"sys","orders","o_orderdate",0);
 (C_86,r1_121) := sql.bind(X_2,"sys","orders","o_orderdate",2);
 X_88:bat[:date] := sql.bind(X_2,"sys","orders","o_orderdate",1);
 X_89 := sql.delta(X_84,C_86,r1_121,X_88);
-X_90:bat[:date] := algebra.projection(X_189,X_89);
+X_90:bat[:date] := algebra.projectionpath(r1_117,C_3,X_89);
 X_91:bat[:lng] := sql.bind(X_2,"sys","orders","o_totalprice",0);
 (C_93,r1_129) := sql.bind(X_2,"sys","orders","o_totalprice",2);
 X_95:bat[:lng] := sql.bind(X_2,"sys","orders","o_totalprice",1);
 X_96 := sql.delta(X_91,C_93,r1_129,X_95);
-X_97:bat[:lng] := algebra.projection(X_189,X_96);
+X_97:bat[:lng] := algebra.projectionpath(r1_117,C_3,X_96);
 (C_100,r1_140) := algebra.firstn(X_97,100,false,false);
 C_102 := algebra.firstn(X_90,C_100,r1_140,100,true,false);
 X_103 := algebra.projection(C_102,X_90);
@@ -174,14 +173,11 @@ function user.s2_1(A0:sht):void;
 X_117:bat[:str] := 
algebra.projectionpath(r1_153,C_102,X_82,r1_101,C_59,X_116);
 X_118 := algebra.subslice(X_117,0,99:wrd);
 X_119 := algebra.projection(X_118,X_117);
-X_190:bat[:oid] := algebra.projection(X_118,r1_153);
-X_188:bat[:oid] := algebra.projectionpath(X_190,C_102,X_82);
-X_187:bat[:oid] := algebra.projection(X_188,X_79);
-X_120:bat[:int] := algebra.projection(X_187,X_78);
-X_121:bat[:int] := algebra.projection(X_188,X_81);
-X_122:bat[:date] := algebra.projection(X_190,X_103);
-X_123:bat[:lng] := algebra.projection(X_190,X_104);
-X_126:bat[:hge] := algebra.projection(X_187,X_125);
+X_120:bat[:int] := 
algebra.projectionpath(X_118,r1_153,C_102,X_82,X_79,X_78);
+X_121:bat[:int] := algebra.projectionpath(X_118,r1_153,C_102,X_82,X_81);
+X_122:bat[:date] := algebra.projectionpath(X_118,r1_153,X_103);
+X_123:bat[:lng] := algebra.projectionpath(X_118,r1_153,X_104);
+X_126:bat[:hge] := 
algebra.projectionpath(X_118,r1_153,C_102,X_82,X_79,X_125);
 
sql.resultSet(X_170,X_172,X_174,X_175,X_176,X_119,X_120,X_121,X_122,X_123,X_126);
 end user.s2_1;
 
diff --git a/sql/benchmarks/tpch/Tests/19-explain.stable.out.int128 
b/sql/benchmarks/tpch/Tests/19-explain.stable.out.int128
--- a/sql/benchmarks/tpch/Tests/19-explain.stable.out.int128
+++ b/sql/benchmarks/tpch/Tests/19-explain.stable.out.int128
@@ -52,7 +52,7 @@ Ready.
 % clob # type
 % 1117 # length
 function 
user.s2_1(A0:bte,A1:str,A2:str,A3:str,A4:str,A5:str,A6:bte,A7:sht,A8:sht,A9:int,A10:int,A11:str,A12:str,A13:str,A14:str,A15:str,A16:str,A17:str,A18:str,A19:bte,A20:sht,A21:sht,A22:int,A23:int,A24:str,A25:str,A26:str,A27:str,A28:str,

MonetDB: default - Approve output

[Martin Kersten]

Changeset: ed14cf65817b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ed14cf65817b
Modified Files:
sql/test/BugTracker/Tests/caching.SF-1651599.stable.out
sql/test/BugTracker/Tests/insert_not_exists.SF-1380287.stable.out
Branch: default
Log Message:

Approve output


diffs (36 lines):

diff --git a/sql/test/BugTracker/Tests/caching.SF-1651599.stable.out 
b/sql/test/BugTracker/Tests/caching.SF-1651599.stable.out
--- a/sql/test/BugTracker/Tests/caching.SF-1651599.stable.out
+++ b/sql/test/BugTracker/Tests/caching.SF-1651599.stable.out
@@ -2353,9 +2353,9 @@ Ready.
 % .cache,  .cache # table_name
 % query,   count # name
 % clob,int # type
-% 130, 1 # length
+% 118, 4 # length
 [ "select * from querycache() cache;", 1   ]
-[ "insert into foo (foo1,foo2,foo3,foo4,foo5,foo6,foo7) select 
2543.5363,9249.8762,9081.9249,5363.9249,8762.9081,8516.5131,5131.8516;",
1   ]
+[ "insert into foo (foo1,foo2,foo3,foo4,foo5,foo6,foo7) select 
3869.3905,null,9208.3881,null,9725.9208,435.9519,9519.435;",2000]
 #drop table foo;
 #commit;
 
diff --git a/sql/test/BugTracker/Tests/insert_not_exists.SF-1380287.stable.out 
b/sql/test/BugTracker/Tests/insert_not_exists.SF-1380287.stable.out
--- a/sql/test/BugTracker/Tests/insert_not_exists.SF-1380287.stable.out
+++ b/sql/test/BugTracker/Tests/insert_not_exists.SF-1380287.stable.out
@@ -109,7 +109,7 @@ Ready.
 % .L # table_name
 % single_value # name
 % char # type
-% 15 # length
+% 31 # length
 [ "dropping kwTemp"]
 #DROP TABLE kwTemp;
 #COMMIT;
@@ -131,7 +131,7 @@ Ready.
 % .L # table_name
 % single_value # name
 % char # type
-% 16 # length
+% 27 # length
 [ "dropping kwmTemp"   ]
 #DROP TABLE kwmTemp;
 #COMMIT;
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approve output

[Martin Kersten]

Changeset: 6b7b984e43bf for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6b7b984e43bf
Modified Files:
clients/mapiclient/Tests/tomograph--help.stable.err
Branch: default
Log Message:

Approve output


diffs (14 lines):

diff --git a/clients/mapiclient/Tests/tomograph--help.stable.err 
b/clients/mapiclient/Tests/tomograph--help.stable.err
--- a/clients/mapiclient/Tests/tomograph--help.stable.err
+++ b/clients/mapiclient/Tests/tomograph--help.stable.err
@@ -19,9 +19,7 @@ tomograph [options]
   -T | --title=
   -r | --range=-[ms,s] 
   -i | --input= 
-  -o | --output= (default 'tomograph'
-  -c | --cache=
-  -s | --system=# (on= 1(default) off=0
+  -o | --output= (default 'cache/'
   -b | --beat= in milliseconds (default 5000)
   -A | --atlas= maximum number of queries (default 1)
   -D | --debug
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approve output

[Martin Kersten]

Changeset: 1edfd3c36057 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1edfd3c36057
Modified Files:
clients/mapiclient/Tests/mclient--help.stable.err
clients/mapiclient/Tests/mclient--help.stable.err.Windows
Branch: default
Log Message:

Approve output


diffs (24 lines):

diff --git a/clients/mapiclient/Tests/mclient--help.stable.err 
b/clients/mapiclient/Tests/mclient--help.stable.err
--- a/clients/mapiclient/Tests/mclient--help.stable.err
+++ b/clients/mapiclient/Tests/mclient--help.stable.err
@@ -21,7 +21,7 @@ Options are:
  -E charset  | --encoding=charset specify encoding (character set) of the 
terminal
  -f kind | --format=kind  specify output format {csv,tab,raw,sql,xml}
  -H  | --history load/save cmdline history (default off)
- -i  | --interactive[=tm] interpret \ commands on stdin, use time 
formatting {ms,s,m}
+ -i  | --interactive[=tm] interpret `\' commands on stdin, use time 
formatting {ms,s,m}
  -l language | --language=lang{sql,mal}
  -L logfile  | --log=logfile save client/server interaction
  -s stmt | --statement=stmt  run single statement
diff --git a/clients/mapiclient/Tests/mclient--help.stable.err.Windows 
b/clients/mapiclient/Tests/mclient--help.stable.err.Windows
--- a/clients/mapiclient/Tests/mclient--help.stable.err.Windows
+++ b/clients/mapiclient/Tests/mclient--help.stable.err.Windows
@@ -21,7 +21,7 @@ Options are:
  -E charset  | --encoding=charset specify encoding (character set) of the 
terminal
  -f kind | --format=kind  specify output format {csv,tab,raw,sql,xml}
  -H  | --history load/save cmdline history (default off)
- -i  | --interactive[=tm] interpret \ commands on stdin, use time 
formatting {ms,s,m}
+ -i  | --interactive[=tm] interpret `\' commands on stdin, use time 
formatting {ms,s,m}
  -l language | --language=lang{sql,mal}
  -L logfile  | --log=logfile save client/server interaction
  -s stmt | --statement=stmt  run single statement
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - approve output

[Niels Nes]

Changeset: 8bd66f3f610a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8bd66f3f610a
Modified Files:
sql/test/Users/Tests/grantRole.Bug-3772.SQL.py
sql/test/Users/Tests/grantRole.Bug-3772.stable.err
sql/test/Users/Tests/grantRole.Bug-3772.stable.out
Branch: default
Log Message:

approve output


diffs (72 lines):

diff --git a/sql/test/Users/Tests/grantRole.Bug-3772.SQL.py 
b/sql/test/Users/Tests/grantRole.Bug-3772.SQL.py
--- a/sql/test/Users/Tests/grantRole.Bug-3772.SQL.py
+++ b/sql/test/Users/Tests/grantRole.Bug-3772.SQL.py
@@ -4,9 +4,7 @@
 
 from util import sql_test_client
 
-sql_client = os.getenv('SQL_CLIENT')
-
-client('monetdb', 'monetdb', input = """\
+sql_test_client('monetdb', 'monetdb', input = """\
 CREATE SCHEMA s1;
 CREATE USER bruce WITH PASSWORD 'bruce' name 'willis' schema s1;
 CREATE TABLE s1.test(d int);
@@ -15,7 +13,7 @@ GRANT ALL ON s1.test to role1;
 """)
 
 
-client('bruce', 'bruce', input = """\
+sql_test_client('bruce', 'bruce', input = """\
 GRANT role1 to bruce;
 SET role role1;
 select * from test;
diff --git a/sql/test/Users/Tests/grantRole.Bug-3772.stable.err 
b/sql/test/Users/Tests/grantRole.Bug-3772.stable.err
--- a/sql/test/Users/Tests/grantRole.Bug-3772.stable.err
+++ b/sql/test/Users/Tests/grantRole.Bug-3772.stable.err
@@ -1,4 +1,4 @@
-stderr of test 'grantRole` in directory 'sql/test/Users` itself:
+stderr of test 'grantRole.Bug-3772` in directory 'sql/test/Users` itself:
 
 
 # 22:31:48 >  
@@ -26,15 +26,21 @@ stderr of test 'grantRole` in directory 
 # cmdline opt  embedded_r = yes
 # cmdline opt  gdk_debug = 536870922
 
-# 22:31:49 >  
-# 22:31:49 >  "/usr/bin/python2" "grantRole.SQL.py" "grantRole"
-# 22:31:49 >  
+# 22:00:19 >  
+# 22:00:19 >  "/usr/bin/python2" "grantRole.Bug-3772.SQL.py" 
"grantRole.Bug-3772"
+# 22:00:19 >  
 
-#GRANT role1 to bruce;
-# I imaine the error message should be something like this...
-GRANT: cannot grant ROLE 'role1' to ROLE/USER 'bruce'
+MAPI  = (bruce) /var/tmp/mtest-16480/.s.monetdb.37363
+QUERY = GRANT role1 to bruce;
+ERROR = !GRANT: insufficient privileges to grant ROLE 'role1'
+MAPI  = (bruce) /var/tmp/mtest-16480/.s.monetdb.37363
+QUERY = SET role role1;
+ERROR = !Role (role1) missing
+MAPI  = (bruce) /var/tmp/mtest-16480/.s.monetdb.37363
+QUERY = select * from test;
+ERROR = !SELECT: access denied for bruce to table 's1.test'
 
-# 22:31:49 >  
-# 22:31:49 >  "Done."
-# 22:31:49 >  
+# 22:00:20 >  
+# 22:00:20 >  "Done."
+# 22:00:20 >  
 
diff --git a/sql/test/Users/Tests/grantRole.Bug-3772.stable.out 
b/sql/test/Users/Tests/grantRole.Bug-3772.stable.out
--- a/sql/test/Users/Tests/grantRole.Bug-3772.stable.out
+++ b/sql/test/Users/Tests/grantRole.Bug-3772.stable.out
@@ -1,4 +1,4 @@
-stdout of test 'grantRole` in directory 'sql/test/Users` itself:
+stdout of test 'grantRole.Bug-3772` in directory 'sql/test/Users` itself:
 
 
 # 22:31:48 >  
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approve output

[Martin Kersten]

Changeset: f59d31a05ed9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f59d31a05ed9
Modified Files:

monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/multiplex_nil.SF-1153664.stable.out
Branch: default
Log Message:

Approve output


diffs (11 lines):

diff --git 
a/monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/multiplex_nil.SF-1153664.stable.out
 
b/monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/multiplex_nil.SF-1153664.stable.out
--- 
a/monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/multiplex_nil.SF-1153664.stable.out
+++ 
b/monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/multiplex_nil.SF-1153664.stable.out
@@ -32,6 +32,7 @@ end user.main;
 #-#
 [ 0@0,   2,  4   ]
 [ 1@0,   3,  9   ]
+!GDKerror:!ERROR: Columns must be the same size
 
 
 
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approve output

[Martin Kersten]

Changeset: 7dd5531d5258 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7dd5531d5258
Modified Files:
monetdb5/mal/Tests/tst025.stable.out
monetdb5/mal/Tests/tst032.stable.out
monetdb5/mal/Tests/tst201.stable.out
monetdb5/mal/Tests/tst810.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.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 (197 lines):

diff --git a/monetdb5/mal/Tests/tst025.stable.out 
b/monetdb5/mal/Tests/tst025.stable.out
--- a/monetdb5/mal/Tests/tst025.stable.out
+++ b/monetdb5/mal/Tests/tst025.stable.out
@@ -50,7 +50,7 @@ end user.main;
 # void int  # type
 #--#
 [ 0@0, 5140046  ]
-[ 2@0, 5645862  ]
+[ 1@0, 5645862  ]
 #--#
 # tt  # name
 # void int  # type
diff --git a/monetdb5/mal/Tests/tst032.stable.out 
b/monetdb5/mal/Tests/tst032.stable.out
--- a/monetdb5/mal/Tests/tst032.stable.out
+++ b/monetdb5/mal/Tests/tst032.stable.out
@@ -57,7 +57,7 @@ end user.main;
 # oid  int  # type
 #--#
 [ 0@0, 0  ]
-[ 2@0, 2  ]
+[ 1@0, 2  ]
 
 # 22:30:08 >  
 # 22:30:08 >  Done.
diff --git a/monetdb5/mal/Tests/tst201.stable.out 
b/monetdb5/mal/Tests/tst201.stable.out
--- a/monetdb5/mal/Tests/tst201.stable.out
+++ b/monetdb5/mal/Tests/tst201.stable.out
@@ -87,10 +87,10 @@ end user.main;
 # ht  # name
 # oid  str  # type
 #--#
-[ 10@0,""  ]
+[ 0@0, ""  ]
 [ 1@0, "quick"  ]
 [ 2@0, "brown"  ]
-[ 11@0,nil  ]
+[ 3@0, nil  ]
 [ 4@0, "jumps"  ]
 [ 5@0, "over"  ]
 [ 6@0, "lazy"  ]
@@ -101,49 +101,49 @@ end user.main;
 # th  # name
 # void str  # type
 #--#
-[ 2@0, "brown"  ]
+[ 0@0, "brown"  ]
 #--#
 # th  # name
 # void str  # type
 #--#
-[ 10@0,""  ]
-[ 11@0,nil  ]
-[ 7@0, "dog"  ]
-[ 8@0, nil  ]
-[ 12@0,"fox"  ]
-[ 13@0,"the"  ]
-[ 14@0,"."  ]
+[ 0@0, ""  ]
+[ 1@0, nil  ]
+[ 2@0, "dog"  ]
+[ 3@0, nil  ]
+[ 4@0, "fox"  ]
+[ 5@0, "the"  ]
+[ 6@0, "."  ]
 #--#
 # tt  # name
 # void str  # type
 #--#
-[ 10@0,""  ]
+[ 0@0, ""  ]
 [ 1@0,   "quick" ]
 [ 2@0,   "brown" ]
-[ 11@0,nil  ]
+[ 3@0, nil  ]
 [ 4@0,   "jumps" ]
 [ 5@0,   "over"  ]
 [ 6@0,   "lazy"  ]
 [ 7@0,   "dog"   ]
 [ 8@0,   nil ]
-[ 12@0,"fox"  ]
-[ 13@0,"the"  ]
-[ 14@0,"."  ]
+[ 9@0, "fox"  ]
+[ 10@0,"the"  ]
+[ 11@0,"."  ]
 #--#
 # tt  # name
 # void str  # type
 #--#
-[ 12@0,"fox"  ]
+[ 0@0, "fox"  ]
 #--#
 # ht # name
 # oid  str  # type
 #--#
-[ 12@0,"fox"  ]
+[ 0@0, "fox"  ]
 #--#
 # ht # name
 # oid  str   # type
 #--#
-[ 12@0,"fox"  ]
+[ 0@0, "fox"  ]
 #--#
 # ht  # name
 # oid  str  # type
diff --git a/monetdb5/mal/Tests/tst810.stable.out 
b/monetdb5/mal/Tests/tst810.stable.out
--- a/monetdb5/mal/Tests/tst810.stable.out
+++ b/monetdb5/mal/Tests/tst810.stable.out
@@ -59,11 +59,11 @@ end user.main;
 # th # name
 # void int   # type
 #--#
-[ 4@0, 5  ]
-[ 5@0, 6  ]
-[ 6@0, 7  ]
-[ 7@0, 8  ]
-[ 8@0, 9  ]
+[ 0@0, 5  ]
+[ 1@0, 6  ]
+[ 2@0, 7  ]
+[ 3@0, 8  ]
+[ 4@0, 9  ]
 
 # 16:18:09 >  
 # 16:18:09 >  "Done."
diff --git a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out 
b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
--- a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
+++ b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
@@ -54,12 +54,12 @@ Operation successful
 | X_2 := sql.mvc();   |
 | X_9:bat[:oid,:sht]  := sql.bind(X_2,"sys","_tables","type",0);  |
 | X_6:bat[:oid,:oid]  := sql.tid(X_2,"sys","_tables");|
-| X_55 := algebra.subselect(X_9,X_6,2,2,true,true,true);   
|
+| X_57 := algebra.subselect(X_9,X_6,2,2,true,true,true);   
|
 | (X_12,r1_12) := sql.bind(X_2,"sys","_tables","type",2); |
-| X_56 := algebra.subselect(r1_12,nil:bat[:oid,:oid],2,2,true,true,true);  
|
+| X_58 := algebra.subselect(r1_12,nil:bat[:oid,:oid],2,2,true,true,true);  
|
 | X_15:bat[:oid,:sht]  := sql.bind(X_2,"sys","_tables","type",1);  
   |
-| X_58 := algebra.subselect(X_15,X_6,2,2,true,true,true);  
|
-| X_18 := sql.subdelta(X_55,X_6,

MonetDB: default - Approve output

[Martin Kersten]

Changeset: 37ffa144978f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=37ffa144978f
Modified Files:
monetdb5/modules/mal/Tests/remote12.stable.out
Branch: default
Log Message:

Approve output


diffs (29 lines):

diff --git a/monetdb5/modules/mal/Tests/remote12.stable.out 
b/monetdb5/modules/mal/Tests/remote12.stable.out
--- a/monetdb5/modules/mal/Tests/remote12.stable.out
+++ b/monetdb5/modules/mal/Tests/remote12.stable.out
@@ -16,16 +16,21 @@ stdout of test 'remote12` in directory '
 # Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:33456/
 # MonetDB/GIS module loaded
 # MonetDB/SQL module loaded
-# SQLException:mvc:SQL module not initialized
+!SyntaxException:parseError:e := nil:BAT;
+!SyntaxException:parseError:   ^ expected
+!SyntaxException:parseError:m:str := remote.put(conn, e);
+!SyntaxException:parseError:^operator expected
+!SyntaxException:parseError:v:BAT := remote.get(conn,m);
+!SyntaxException:parseError: ^ expected
+!SyntaxException:parseError:io.print(v);
+!SyntaxException:parseError:^';' expected
 function user.main():void;
 #causing a sigfault  
 uri := sabaoth.getLocalConnectionURI();
 conn:str  := remote.connect(uri,"monetdb","monetdb");
 e := nil:BAT;
-m:str  := remote.put(conn,e);
 io.print(m);
-v:BAT  := remote.get(conn,m);
-io.print(v);
+v:BAT;
 mdb.var();
 end user.main;
 
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approve output

[Martin Kersten]

Changeset: 10a7f31ca5fa for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=10a7f31ca5fa
Modified Files:
monetdb5/modules/mal/Tests/mapi07.stable.out
monetdb5/modules/mal/Tests/remote12.stable.out
monetdb5/modules/mal/mal_mapi.c
Branch: default
Log Message:

Approve output


diffs (57 lines):

diff --git a/monetdb5/modules/mal/Tests/mapi07.stable.out 
b/monetdb5/modules/mal/Tests/mapi07.stable.out
--- a/monetdb5/modules/mal/Tests/mapi07.stable.out
+++ b/monetdb5/modules/mal/Tests/mapi07.stable.out
@@ -39,7 +39,7 @@ end user.main;
 # tt  # name
 # void int  # type
 #--#
-[ 2@0, nil  ]
+[ 0@0, nil  ]
 
 # 09:12:08 >  
 # 09:12:08 >  Done.
diff --git a/monetdb5/modules/mal/Tests/remote12.stable.out 
b/monetdb5/modules/mal/Tests/remote12.stable.out
--- a/monetdb5/modules/mal/Tests/remote12.stable.out
+++ b/monetdb5/modules/mal/Tests/remote12.stable.out
@@ -16,25 +16,20 @@ stdout of test 'remote12` in directory '
 # Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:33456/
 # MonetDB/GIS module loaded
 # MonetDB/SQL module loaded
-!SyntaxException:parseError:e := nil:BAT;
-!SyntaxException:parseError:   ^ expected
-!SyntaxException:parseError:m:str := remote.put(conn, e);
-!SyntaxException:parseError:^operator expected
-!SyntaxException:parseError:v:BAT := remote.get(conn,m);
-!SyntaxException:parseError: ^ expected
-!SyntaxException:parseError:io.print(v);
-!SyntaxException:parseError:^';' expected
 function user.main():void;
 #causing a sigfault  
 uri := sabaoth.getLocalConnectionURI();
 conn:str  := remote.connect(uri,"monetdb","monetdb");
 e := nil:BAT;
+m:str := remote.put(conn,e);
 io.print(m);
-v:BAT;
+v:BAT := remote.get(conn,m);
+io.print(v);
 mdb.var();
 end user.main;
 
 
+
 # 20:06:20 >  
 # 20:06:20 >  Done.
 # 20:06:20 >  
diff --git a/monetdb5/modules/mal/mal_mapi.c b/monetdb5/modules/mal/mal_mapi.c
--- a/monetdb5/modules/mal/mal_mapi.c
+++ b/monetdb5/modules/mal/mal_mapi.c
@@ -1603,7 +1603,7 @@ SERVERmapi_rpc_bat(Client cntxt, MalBlkP
throw(MAL,"mapi.rpc",MAL_MALLOC_FAIL);
BATseqbase(b,0);
while( mapi_fetch_row(hdl)){
-   fld2= mapi_fetch_field(hdl,0);
+   fld2= mapi_fetch_field(hdl,1);
SERVERfieldAnalysis(fld2, tt, &tval);
BUNappend(b,VALptr(&tval), FALSE);
}
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approve output.

[Sjoerd Mullender]

Changeset: f620a88e6838 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f620a88e6838
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
Branch: default
Log Message:

Approve output.


diffs (24 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
@@ -31415,7 +31415,7 @@ command bbp.getName(b:bat[:oid,:any_1]):
 address CMDbbpName;
 comment Map a BAT into its internal name
 
-command bbp.get() 
(id:bat[:oid,:int],ns:bat[:oid,:str],ht:bat[:oid,:str],tt:bat[:oid,:str],cnt:bat[:oid,:lng],refcnt:bat[:oid,:int],lrefcnt:bat[:oid,:int],location:bat[:oid,:str],heat:bat[:oid,:int],dirty:bat[:oid,:str],status:bat[:oid,:str],kind:bat[:oid,:str])
 
+command bbp.get() 
(id:bat[:oid,:int],ns:bat[:oid,:str],tt:bat[:oid,:str],cnt:bat[:oid,:lng],refcnt:bat[:oid,:int],lrefcnt:bat[:oid,:int],location:bat[:oid,:str],heat:bat[:oid,:int],dirty:bat[:oid,:str],status:bat[:oid,:str],kind:bat[:oid,:str])
 
 address CMDbbp;
 comment bpp
 
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
@@ -40460,7 +40460,7 @@ command bbp.getName(b:bat[:oid,:any_1]):
 address CMDbbpName;
 comment Map a BAT into its internal name
 
-command bbp.get() 
(id:bat[:oid,:int],ns:bat[:oid,:str],ht:bat[:oid,:str],tt:bat[:oid,:str],cnt:bat[:oid,:lng],refcnt:bat[:oid,:int],lrefcnt:bat[:oid,:int],location:bat[:oid,:str],heat:bat[:oid,:int],dirty:bat[:oid,:str],status:bat[:oid,:str],kind:bat[:oid,:str])
 
+command bbp.get() 
(id:bat[:oid,:int],ns:bat[:oid,:str],tt:bat[:oid,:str],cnt:bat[:oid,:lng],refcnt:bat[:oid,:int],lrefcnt:bat[:oid,:int],location:bat[:oid,:str],heat:bat[:oid,:int],dirty:bat[:oid,:str],status:bat[:oid,:str],kind:bat[:oid,:str])
 
 address CMDbbp;
 comment bpp
 
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - approve output

[Niels Nes]

Changeset: 4d2f0aaa57f1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4d2f0aaa57f1
Modified Files:
sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out

sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out

sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
Branch: default
Log Message:

approve output


diffs (72 lines):

diff --git a/sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out 
b/sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
--- a/sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
+++ b/sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
@@ -27,7 +27,7 @@ Ready.
 % .explain # table_name
 % mal # name
 % clob # type
-% 85 # length
+% 84 # length
 function user.s0_1{autoCommit=true}(A0:dbl):void;
 X_3 := sql.mvc();
 X_4:bat[:oid,:oid]  := sql.tid(X_3,"sys","sf_2596114");
@@ -46,7 +46,7 @@ end s0_1;
 % .explain # table_name
 % mal # name
 % clob # type
-% 78 # length
+% 77 # length
 function user.s1_1{autoCommit=true}():void;
 X_2 := sql.mvc();
 X_3:bat[:oid,:oid]  := sql.tid(X_2,"sys","sf_2596114");
diff --git 
a/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out 
b/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
--- a/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
+++ b/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
@@ -170,7 +170,7 @@ end s2_1;
 % .explain # table_name
 % mal # name
 % clob # type
-% 78 # length
+% 77 # length
 function user.s3_1{autoCommit=true}():void;
 X_2 := sql.mvc();
 X_3:bat[:oid,:oid]  := sql.tid(X_2,"sys","oblo");
@@ -242,7 +242,7 @@ end s5_1;
 % .explain # table_name
 % mal # name
 % clob # type
-% 81 # length
+% 80 # length
 function user.s6_1{autoCommit=true}():void;
 X_2 := sql.mvc();
 X_3:bat[:oid,:oid]  := sql.tid(X_2,"sys","oblo");
@@ -262,7 +262,7 @@ end s6_1;
 % .explain # table_name
 % mal # name
 % clob # type
-% 90 # length
+% 89 # length
 function user.s7_1{autoCommit=true}():void;
 X_2 := sql.mvc();
 X_3:bat[:oid,:oid]  := sql.tid(X_2,"sys","oblo");
@@ -321,7 +321,7 @@ end s8_1;
 % .explain # table_name
 % mal # name
 % clob # type
-% 98 # length
+% 97 # length
 function user.s9_1{autoCommit=true}():void;
 X_2 := sql.mvc();
 X_3:bat[:oid,:oid]  := sql.tid(X_2,"sys","oblo");
diff --git 
a/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out 
b/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
--- a/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
+++ b/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
@@ -38,7 +38,7 @@ Ready.
 % .explain # table_name
 % mal # name
 % clob # type
-% 98 # length
+% 97 # length
 function user.s2_1{autoCommit=true}():void;
 X_2 := sql.mvc();
 X_3:bat[:oid,:oid]  := sql.tid(X_2,"sys","t2564");
___
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approve output

[Martin Kersten]

Changeset: eda6d9abf947 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=eda6d9abf947
Added Files:
sql/test/json/Tests/pgexample.stable.err
sql/test/json/Tests/pgexample.stable.out
Branch: default
Log Message:

Approve output


diffs (115 lines):

diff --git a/sql/test/json/Tests/pgexample.stable.err 
b/sql/test/json/Tests/pgexample.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/json/Tests/pgexample.stable.err
@@ -0,0 +1,35 @@
+stderr of test 'pgexample` in directory 'sql/test/json` itself:
+
+
+# 02:53:37 >  
+# 02:53:37 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=37692" "--set" 
"mapi_usock=/var/tmp/mtest-30874/.s.monetdb.37692" "--set" "monet_prompt=" 
"--forcemito" "--set" "mal_listing=2" 
"--dbpath=/export/scratch1/mk/current//Linux/var/MonetDB/mTests_sql_test_json" 
"--set" "mal_listing=0"
+# 02:53:37 >  
+
+# builtin opt  gdk_dbpath = 
/export/scratch1/mk/current//Linux/var/monetdb5/dbfarm/demo
+# builtin opt  gdk_debug = 0
+# builtin opt  gdk_vmtrim = yes
+# builtin opt  monet_prompt = >
+# builtin opt  monet_daemon = no
+# builtin opt  mapi_port = 5
+# builtin opt  mapi_open = false
+# builtin opt  mapi_autosense = false
+# builtin opt  sql_optimizer = default_pipe
+# builtin opt  sql_debug = 0
+# cmdline opt  gdk_nr_threads = 0
+# cmdline opt  mapi_open = true
+# cmdline opt  mapi_port = 37692
+# cmdline opt  mapi_usock = /var/tmp/mtest-30874/.s.monetdb.37692
+# cmdline opt  monet_prompt = 
+# cmdline opt  mal_listing = 2
+# cmdline opt  gdk_dbpath = 
/export/scratch1/mk/current//Linux/var/MonetDB/mTests_sql_test_json
+# cmdline opt  mal_listing = 0
+
+# 02:53:37 >  
+# 02:53:37 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-30874" "--port=37692"
+# 02:53:37 >  
+
+
+# 02:53:37 >  
+# 02:53:37 >  "Done."
+# 02:53:37 >  
+
diff --git a/sql/test/json/Tests/pgexample.stable.out 
b/sql/test/json/Tests/pgexample.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/json/Tests/pgexample.stable.out
@@ -0,0 +1,70 @@
+stdout of test 'pgexample` in directory 'sql/test/json` itself:
+
+
+# 02:53:37 >  
+# 02:53:37 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=37692" "--set" 
"mapi_usock=/var/tmp/mtest-30874/.s.monetdb.37692" "--set" "monet_prompt=" 
"--forcemito" "--set" "mal_listing=2" 
"--dbpath=/export/scratch1/mk/current//Linux/var/MonetDB/mTests_sql_test_json" 
"--set" "mal_listing=0"
+# 02:53:37 >  
+
+# MonetDB 5 server v11.16.0
+# This is an unreleased version
+# Serving database 'mTests_sql_test_json', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically 
linked
+# Found 15.629 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2013 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://vienna.ins.cwi.nl:37692/
+# Listening for UNIX domain connection requests on 
mapi:monetdb:///var/tmp/mtest-30874/.s.monetdb.37692
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 02:53:37 >  
+# 02:53:37 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-30874" "--port=37692"
+# 02:53:37 >  
+
+#CREATE TABLE jsonTbl (a int, b json);
+#INSERT INTO jsonTbl  VALUES (1, '{"f1":1,"f2":true,"f3":"Hi I''m 
\\"Daisy\\""}');
+[ 1]
+#INSERT INTO jsonTbl VALUES (2, '{"f1":{"f11":11,"f12":12},"f2":2}');
+[ 1]
+#INSERT INTO jsonTbl VALUES (3, '{"f1":[1,"Robert 
\\"M\\"",true],"f2":[2,"Kevin \\"K\\"",false]}');
+[ 1]
+#SELECT  json_path(b,'f1') AS f1, json_path(b,'f3') FROM jsonTbl WHERE a =1;
+% sys.L,   sys.L # table_name
+% f1,  json_path_b # name
+% json,json # type
+% 3,   20 # length
+[ "[1]",   "[\"Hi I'm \\\"Daisy\\\"\"]"]
+#SELECT json_path(b,'f1.f12') AS f12 FROM jsonTbl WHERE a = 2;
+% sys.L # table_name
+% f12 # name
+% json # type
+% 4 # length
+[ "[12]"   ]
+#SELECT json_path(b,'f1[0]') as f1_0 FROM jsonTbl WHERE a = 3;
+% sys.L # table_name
+% f1_0 # name
+% json # type
+% 25 # length
+[ "[[1,\"Robert \\\"M\\\"\",true]]"]
+#SELECT  json_path(b,'f3') AS f1, json_text(b,'f3') FROM jsonTbl WHERE a =1;
+% sys.L,   sys.L # table_name
+% f1,  json_text_b # name
+% json,clob # type
+% 20,  16 # length
+[ "[\"Hi I'm \\\"Daisy\\\"\"]"," Hi I'm \"Daisy\" "]
+#SELECT json_path(b,'f1[0]') as f1_0 , json_text(b,'f1[0]')FROM jsonTbl WHERE 
a = 3;
+% sys.L,   sys.L # table_name
+% f1_0,json_text_b # name
+% json,clob # type
+% 25,  17 # length
+[ "[[1,\"Robert \\\"M\\\"\",true]]",   "1 Robert \"M\" true"   ]
+#drop table jsonTbl;
+
+# 02:53:37 >  
+# 02:53:37 >  "Done."
+# 02:53:37 >  
+
___
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/m

MonetDB: default - Approve output

[Martin Kersten]

Changeset: bf81b282ec37 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bf81b282ec37
Modified Files:
monetdb5/modules/atoms/Tests/json02.stable.out
monetdb5/modules/atoms/Tests/json03.stable.out
monetdb5/modules/atoms/Tests/json04.stable.out
Branch: default
Log Message:

Approve output


diffs (190 lines):

diff --git a/monetdb5/modules/atoms/Tests/json02.stable.out 
b/monetdb5/modules/atoms/Tests/json02.stable.out
--- a/monetdb5/modules/atoms/Tests/json02.stable.out
+++ b/monetdb5/modules/atoms/Tests/json02.stable.out
@@ -147,7 +147,7 @@ end main;
 # void str   # type
 #-#
 [ 0@0,   "\"\\/\""   ]
-[ 1@0,   "2 "]
+[ 1@0, "2"  ]
 
 # 22:41:31 >  
 # 22:41:31 >  "Done."
diff --git a/monetdb5/modules/atoms/Tests/json03.stable.out 
b/monetdb5/modules/atoms/Tests/json03.stable.out
--- a/monetdb5/modules/atoms/Tests/json03.stable.out
+++ b/monetdb5/modules/atoms/Tests/json03.stable.out
@@ -64,49 +64,49 @@ end main;
 [ 0@0,   "category", "\"reference\"" ]
 [ 1@0,   "author",   "\"Nigel Rees\""]
 [ 2@0,   "title","\"Sayings of the Century\""]
-[ 3@0,   "price","8.95 " ]
+[ 3@0, "price","8.95"  ]
 [ 4@0,   "category", "\"fiction\""   ]
 [ 5@0,   "author",   "\"Evelyn Waugh\""  ]
 [ 6@0,   "title","\"Sword of Honour\""   ]
-[ 7@0,   "price","12.99 "]
+[ 7@0, "price","12.99"  ]
 [ 8@0,   "category", "\"fiction\""   ]
 [ 9@0,   "author",   "\"Herman Melville\""   ]
 [ 10@0,  "title","\"Moby Dick\"" ]
 [ 11@0,  "isbn", "\"0-553-21311-3\"" ]
-[ 12@0,  "price","8.99 " ]
+[ 12@0,"price","8.99"  ]
 [ 13@0,  "category", "\"fiction\""   ]
 [ 14@0,  "author",   "\"J. R. R. Tolkien\""  ]
 [ 15@0,  "title","\"The Lord of the Rings\"" ]
 [ 16@0,  "isbn", "\"0-395-19395-8\"" ]
-[ 17@0,  "price","22.99 "]
+[ 17@0,"price","22.99"  ]
 [ 18@0,  "color","\"red\""   ]
-[ 19@0,  "price","19.95 "]
-[ "[{\"category\":\"reference\",\"author\":\"Nigel Rees\",\"title\":\"Sayings 
of the Century\",\"price\":.9\",\"category\":\"fiction\",\"author\":\"Evelyn 
Waugh\",\"title\":\"Sword of 
Honour\",\"price\":2.9\",\"category\":\"fiction\",\"author\":\"Herman 
Melville\",\"title\":\"Moby 
Dick\",\"isbn\":\"0-553-21311-3\",\"price\":.9\",\"category\":\"fiction\",\"author\":\"J.
 R. R. Tolkien\",\"title\":\"The Lord of the 
Rings\",\"isbn\":\"0-395-19395-8\",\"price\":2.9\",\"color\":\"red\",\"price\":9.9\"}]"
 ]
-#-#
+[ 19@0,"price","19.95"  ]
+[ "[{\"category\":\"reference\",\"author\":\"Nigel Rees\",\"title\":\"Sayings 
of the Century\",\"price\":.\",\"category\":\"fiction\",\"author\":\"Evelyn 
Waugh\",\"title\":\"Sword of 
Honour\",\"price\":2.\",\"category\":\"fiction\",\"author\":\"Herman 
Melville\",\"title\":\"Moby 
Dick\",\"isbn\":\"0-553-21311-3\",\"price\":.\",\"category\":\"fiction\",\"author\":\"J.
 R. R. Tolkien\",\"title\":\"The Lord of the 
Rings\",\"isbn\":\"0-395-19395-8\",\"price\":2.\",\"color\":\"red\",\"price\":9.\"}]"
 ]
+#--#
 # ht   t   t # name
 # void oid str json  # type
 #-#
 [ 0@0,   0@0,"category", "\"reference\"" ]
 [ 1@0,   0@0,"author",   "\"Nigel Rees\""]
 [ 2@0,   0@0,"title","\"Sayings of the Century\""]
-[ 3@0,   0@0,"price","8.95 " ]
+[ 3@0, 0@0,"price","8.95"  ]
 [ 4@0,   1@0,"category", "\"fiction\""   ]
 [ 5@0,   1@0,"author",   "\"Evelyn Waugh\""  ]
 [ 6@0,   1@0,"title","\"Sword of Honour\""   ]
-[ 7@0,   1@0,"price","12.99 "]
+[ 7@0, 1@0,"price","12.99"  ]
 [ 8@0,   2@0,"category", "\"fiction\""   ]
 [ 9@0,   2@0,"author",   "\"Herman Melville\""   ]
 [ 10@0,  2@0,"title","\"Moby Dick\"" ]
 [ 11@0,  2@0,"isbn", "\"0-553-21311-3\"" ]
-[ 12@0,  2@0,"price","8.99 " ]
+[ 12@0,2@0,"price","8.99"  ]
 [ 13@0,  3@0,"category", "\"fiction\""   ]
 [ 14@0,  3@0,"author",   "

MonetDB: default - Approve output

[Martin Kersten]

Changeset: 0d86a048c454 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0d86a048c454
Modified Files:
sql/test/Tests/systemfunctions.stable.out
Branch: default
Log Message:

Approve output


diffs (13 lines):

diff --git a/sql/test/Tests/systemfunctions.stable.out 
b/sql/test/Tests/systemfunctions.stable.out
--- a/sql/test/Tests/systemfunctions.stable.out
+++ b/sql/test/Tests/systemfunctions.stable.out
@@ -248,6 +248,9 @@ Ready.
 [ "sys",   "json_path",0,  "json", "-- a simple path 
extractor\ncreate function sys.json_path(js json, e string)\nreturns json 
external name json.path;"   ]
 [ "sys",   "json_path",1,  "json", ""  ]
 [ "sys",   "json_path",2,  "clob", ""  ]
+[ "sys",   "json_text",0,  "clob", "-- a simple path extractor as 
plain text\ncreate function sys.json_text(js json, e string)\nreturns string 
external name json.text;"   ]
+[ "sys",   "json_text",1,  "json", ""  ]
+[ "sys",   "json_text",2,  "clob", ""  ]
 [ "sys",   "length",   0,  "double",   "create function 
length(g geometry) returns float external name geom.\"Length\";"   ]
 [ "sys",   "length",   1,  "geometry", ""  ]
 [ "sys",   "like", 0,  "clob", "create filter function \"like\"(val 
string, pat string, esc string) external name algebra.likesubselect;"  ]
___
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list