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/modules/kernel/Tests/vacuum.mal
b/monetdb5/modules/kernel/Tests/vacuum.mal
deleted file mode 100644
--- a/monetdb5/modules/kernel/Tests/vacuum.mal
+++ /dev/null
@@ -1,47 +0,0 @@
-#building blocks for SQL vacuum actions
-
-b:= bat.new(:oid,:int);
-c:= bat.new(:oid,:oid);
-
-k:= 0;
-INT_MAX := 2147483647;
-dbgmsk_restore := mdb.getDebug();
-dbgmsk_unset := 8+8388608;
-dbgmsk_keep := calc.xor(INT_MAX,dbgmsk_unset);
-dbgmsk_set := calc.and(dbgmsk_restore,dbgmsk_keep);
-mdb.setDebug(dbgmsk_set);
-barrier i:= 0:lng;
- k:= k +1;
- barrier t:= k <= 1000;
- o:= calc.oid(i);
- bat.append(c,o);
- exit t;
- bat.append(b,k);
- redo i:= iterator.next(1:lng,1000000:lng);
-exit i;
-mdb.setDebug(dbgmsk_restore);
-
-d:= algebra.copy(b);
-
-cnt:= aggr.count(b);
-io.print(cnt);
-cnt:= aggr.count(c);
-io.print(cnt);
-#s:= algebra.sample(c,20);
-#io.print(s);
-
-t0:= alarm.usec();
-x:= bat.shrink(b,c);
-t1:= alarm.usec();
-d0:= t1-t0;
-io.printf("#bat.shrink() %d\n",d0);
-cnt:= aggr.count(x);
-io.print(cnt);
-
-t0:= alarm.usec();
-y:= bat.reuse(d,c);
-t1:= alarm.usec();
-d0:= t1-t0;
-io.printf("#bat.reuse() %d\n",d0);
-cnt:= aggr.count(y);
-io.print(cnt);
diff --git a/monetdb5/modules/kernel/Tests/vacuum.stable.err
b/monetdb5/modules/kernel/Tests/vacuum.stable.err
deleted file mode 100644
--- a/monetdb5/modules/kernel/Tests/vacuum.stable.err
+++ /dev/null
@@ -1,73 +0,0 @@
-stderr of test 'vacuum` in directory 'monetdb5/modules/kernel` itself:
-
-
-# 12:11:50 >
-# 12:11:50 > mserver5 "--config=/ufs/mk/current//Linux/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/mk/current//Linux/lib/MonetDB5:/ufs/mk/current//Linux/lib/MonetDB5/lib:/ufs/mk/current//Linux/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/mk/current//Linux/var/MonetDB5/dbfarm" --set
mapi_open=true --set xrpc_open=true --set mapi_port=36446 --set xrpc_port=43827
--set monet_prompt= --trace --forcemito --set mal_listing=2
--dbname=mTests_src_modules_kernel vacuum.mal
-# 12:11:50 >
-
-# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
-# builtin opt gdk_version = 1.41.0
-# builtin opt prefix = /ufs/mk/current//Linux
-# builtin opt exec_prefix = ${prefix}
-# builtin opt gdk_dbname = demo
-# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB/dbfarm
-# builtin opt gdk_debug = 0
-# builtin opt gdk_alloc_map = no
-# builtin opt gdk_vmtrim = yes
-# builtin opt monet_admin = adm
-# builtin opt monet_prompt = >
-# builtin opt monet_welcome = yes
-# builtin opt monet_mod_path = ${exec_prefix}/lib/MonetDB
-# builtin opt monet_daemon = no
-# builtin opt host = localhost
-# builtin opt mapi_port = 50000
-# builtin opt mapi_clients = 2
-# builtin opt mapi_open = false
-# builtin opt mapi_autosense = false
-# builtin opt default_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
-# builtin opt minimal_pipe = inline,remap,deadcode,multiplex,garbageCollector
-# builtin opt sql_optimizer = default_pipe
-# builtin opt sql_debug = 0
-# builtin opt standoff_ns =
-# builtin opt standoff_start = start
-# builtin opt standoff_end = end
-# config opt prefix = /ufs/mk/current//Linux
-# config opt config = ${prefix}/etc/monetdb5.conf
-# config opt prefix = /ufs/mk/current//Linux
-# config opt exec_prefix = ${prefix}
-# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
-# config opt monet_mod_path =
${exec_prefix}/lib/MonetDB5:${exec_prefix}/lib/MonetDB5/lib:${exec_prefix}/lib/MonetDB5/bin
-# config opt mero_pidfile = ${prefix}/var/run/MonetDB/merovingian.pid
-# config opt mero_controlport = 50001
-# config opt no_mitosis_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
-# config opt sequential_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,history,multiplex,garbageCollector
-# config opt nov2009_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
-# config opt replication_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,replication,multiplex,garbageCollector
-# config opt accumulator_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,accumulators,dataflow,history,multiplex,garbageCollector
-# config opt recycler_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,deadcode,recycle,reduce,dataflow,history,multiplex,garbageCollector
-# config opt cracker_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,selcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
-# config opt sidcrack_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,sidcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
-# config opt octopus_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,octopus,reduce,dataflow,history,multiplex,garbageCollector
-# config opt mapreduce_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mapreduce,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
-# config opt datacyclotron_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,datacyclotron,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,replication,multiplex,garbageCollector
-# config opt derive_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,derivePath,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
-# config opt dictionary_pipe =
inline,remap,dictionary,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
-# config opt compression_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,compression,dataflow,history,multiplex,garbageCollector
-# cmdline opt config = /ufs/mk/current//Linux/etc/monetdb5.conf
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt monet_mod_path =
/ufs/mk/current//Linux/lib/MonetDB5:/ufs/mk/current//Linux/lib/MonetDB5/lib:/ufs/mk/current//Linux/lib/MonetDB5/bin
-# cmdline opt gdk_dbfarm = /ufs/mk/current//Linux/var/MonetDB5/dbfarm
-# cmdline opt mapi_open = true
-# cmdline opt xrpc_open = true
-# cmdline opt mapi_port = 36446
-# cmdline opt xrpc_port = 43827
-# cmdline opt monet_prompt =
-# cmdline opt mal_listing = 2
-# cmdline opt gdk_dbname = mTests_src_modules_kernel
-#warning: please don't forget to set your vault key!
-#(see /ufs/mk/current//Linux/etc/monetdb5.conf)
-
-# 12:11:52 >
-# 12:11:52 > Done.
-# 12:11:52 >
-
diff --git a/monetdb5/modules/kernel/Tests/vacuum.stable.out
b/monetdb5/modules/kernel/Tests/vacuum.stable.out
deleted file mode 100644
--- a/monetdb5/modules/kernel/Tests/vacuum.stable.out
+++ /dev/null
@@ -1,72 +0,0 @@
-stdout of test 'vacuum` in directory 'monetdb5/modules/kernel` itself:
-
-
-# 12:11:50 >
-# 12:11:50 > mserver5 "--config=/ufs/mk/current//Linux/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/mk/current//Linux/lib/MonetDB5:/ufs/mk/current//Linux/lib/MonetDB5/lib:/ufs/mk/current//Linux/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/mk/current//Linux/var/MonetDB5/dbfarm" --set
mapi_open=true --set xrpc_open=true --set mapi_port=36446 --set xrpc_port=43827
--set monet_prompt= --trace --forcemito --set mal_listing=2
--dbname=mTests_src_modules_kernel vacuum.mal
-# 12:11:50 >
-
-# MonetDB server v5.23.0, based on kernel v1.41.0
-# Not released
-# Serving database 'mTests_src_modules_kernel', using 4 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Found 7.750 GiB available main-memory.
-# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008-2015 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:36446/
-# MonetDB/SQL module v2.41.0 loaded
-# MonetDB/GIS module v0.21.0 loaded
-function user.main():void;
-#building blocks for SQL vacuum actions
- b := bat.new(:oid,:int);
- c := bat.new(:oid,:oid);
- k := 0;
- INT_MAX := 2147483647;
- dbgmsk_restore := mdb.getDebug();
- dbgmsk_unset := calc.+(8,8388608);
- dbgmsk_keep := calc.xor(INT_MAX,dbgmsk_unset);
- dbgmsk_set := calc.and(dbgmsk_restore,dbgmsk_keep);
- mdb.setDebug(dbgmsk_set);
-barrier i := 0:lng;
- k := calc.+(k,1);
-barrier t := calc.<=(k,1000);
- o := calc.oid(i);
- bat.append(c,o);
-exit t;
- bat.append(b,k);
- redo i := iterator.next(1:lng,1000000:lng);
-exit i;
- mdb.setDebug(dbgmsk_restore);
- d := algebra.copy(b);
- cnt := aggr.count(b);
- io.print(cnt);
- cnt := aggr.count(c);
- io.print(cnt);
-#s:= algebra.sample(c,20);
-#io.print(s);
- t0 := alarm.usec();
- x := bat.shrink(b,c);
- t1 := alarm.usec();
- d0 := calc.-(t1,t0);
- io.printf("#bat.shrink() %d\n",d0);
- cnt := aggr.count(x);
- io.print(cnt);
- t0 := alarm.usec();
- y := bat.reuse(d,c);
- t1 := alarm.usec();
- d0 := calc.-(t1,t0);
- io.printf("#bat.reuse() %d\n",d0);
- cnt := aggr.count(y);
- io.print(cnt);
-end user.main;
-[ 1000000 ]
-[ 1000 ]
-#bat.shrink() 7697
-[ 999000 ]
-#bat.reuse() 7789
-[ 999000 ]
-
-# 12:11:52 >
-# 12:11:52 > Done.
-# 12:11:52 >
-
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
@@ -46,17 +46,14 @@ end user.main;
[ "delete", "command", "bat", "(sz:wrd):bat[:oid,:oid] ",
"BKCdensebat;" ]
[ "delete", "command", "bat",
"(b:bat[:oid,:any_1],src:bat[:oid,:any_1]):bat[:oid,:any_1] ",
"BKCdelete_bat_bun;" ]
[ "delete", "command", "bat", "(b:bat[:oid,:any_1]):bat[:oid,:any_1]
", "BKCdelete_all;" ]
-[ "delete", "command", "bat",
"(b:bat[:oid,:any_1],h:oid):bat[:oid,:any_1] ", "BKCdelete;" ]
-[ "densebat", "command", "bat",
"(b:bat[:oid,:any_1],h:oid,t:any_1):bat[:oid,:any_1] ", "BKCdelete_bun;" ]
+[ "densebat", "command", "bat",
"(b:bat[:oid,:any_1],h:oid):bat[:oid,:any_1] ", "BKCdelete;" ]
[ "getAccess", "command", "bat", "(b:bat[:oid,:any_1]):str ",
"BKCgetBBPname;" ]
-[ "getAlpha", "command", "bat", "(b:bat[:oid,:any_1]):oid ",
"BKCgetSequenceBase;" ]
-[ "getCapacity", "command", "bat", "(b:bat[:oid,:any_1]):str ",
"BKCgetAccess;" ]
-[ "getColumnType", "command", "bat", "(bid:bat[:oid,:any_1]):str ",
"BKCgetRole;" ]
-[ "getDelta", "command", "bat", "(b:bat[:oid,:any_1]):str ",
"BKCgetColumnType;" ]
-[ "getName", "command", "bat", "(b:bat[:oid,:any_1]):lng ",
"BKCgetCapacity;" ]
-[ "getRole", "command", "bat", "(b:bat[:oid,:any_1]):lng ",
"BKCgetSize;" ]
-[ "getSequenceBase", "command", "bat",
"(b:bat[:oid,:any_1]):bat[:oid,:any_1] ", "BKCgetDelta;" ]
-[ "getSize", "command", "bat", "(b:bat[:oid,:any_1]):bat[:oid,:any_1]
", "BKCgetAlpha;" ]
+[ "getCapacity", "command", "bat", "(b:bat[:oid,:any_1]):oid ",
"BKCgetSequenceBase;" ]
+[ "getColumnType", "command", "bat", "(b:bat[:oid,:any_1]):str ",
"BKCgetAccess;" ]
+[ "getName", "command", "bat", "(bid:bat[:oid,:any_1]):str ",
"BKCgetRole;" ]
+[ "getRole", "command", "bat", "(b:bat[:oid,:any_1]):str ",
"BKCgetColumnType;" ]
+[ "getSequenceBase", "command", "bat", "(b:bat[:oid,:any_1]):lng ",
"BKCgetCapacity;" ]
+[ "getSize", "command", "bat", "(b:bat[:oid,:any_1]):lng ",
"BKCgetSize;" ]
[ "imprints", "command", "bat", "(b:bat[:oid,:hge]):lng ",
"CMDBATimprintsize;" ]
[ "imprints", "command", "bat", "(b:bat[:oid,:hge]):void ",
"CMDBATimprints;" ]
[ "imprints", "command", "bat", "(b:bat[:oid,:dbl]):lng ",
"CMDBATimprintsize;" ]
@@ -72,19 +69,13 @@ end user.main;
[ "imprintsize", "command", "bat", "(b:bat[:oid,:sht]):void ",
"CMDBATimprints;" ]
[ "imprintsize", "command", "bat", "(b:bat[:oid,:bte]):void ",
"CMDBATimprints;" ]
[ "info", "command", "bat",
"(a:bat[:oid,:oid],b:bat[:oid,:oid]):bat[:oid,:oid] ", "BKCintersectcand;" ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
