Changeset: 4d3f990e1df5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4d3f990e1df5
Removed Files:
monetdb5/mal/Tests/tst867.mal
monetdb5/mal/Tests/tst867.stable.err
monetdb5/mal/Tests/tst867.stable.out
Modified Files:
monetdb5/mal/Tests/All
monetdb5/tests/gdkTests/Tests/str_heap.mal
monetdb5/tests/gdkTests/Tests/str_heap.stable.out
Branch: default
Log Message:
Approve the output
diffs (218 lines):
diff --git a/monetdb5/mal/Tests/All b/monetdb5/mal/Tests/All
--- a/monetdb5/mal/Tests/All
+++ b/monetdb5/mal/Tests/All
@@ -183,7 +183,6 @@ tst830
tst840
tst850
tst866
-tst867
tst870
tst880
tst890
diff --git a/monetdb5/mal/Tests/tst867.mal b/monetdb5/mal/Tests/tst867.mal
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst867.mal
+++ /dev/null
@@ -1,22 +0,0 @@
-# shrink operations.
-b:= bat.new(:oid,:int);
-bat.append(b,1);
-bat.append(b,2);
-bat.append(b,3);
-bat.append(b,4);
-bat.append(b,5);
-bat.append(b,6);
-bat.append(b,7);
-bat.append(b,8);
-bat.append(b,9);
-io.print(b);
-d:= bat.new(:oid,:oid);
-bat.append(d,1@0);
-bat.append(d,2@0);
-bat.append(d,7@0);
-
-s:= bat.shrink(b,d);
-io.print(s);
-
-so:= bat.shrinkMap(b,d);
-io.print(so);
diff --git a/monetdb5/mal/Tests/tst867.stable.err
b/monetdb5/mal/Tests/tst867.stable.err
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst867.stable.err
+++ /dev/null
@@ -1,71 +0,0 @@
-stderr of test 'tst867` in directory 'monetdb5/mal` itself:
-
-
-# 17:00:21 >
-# 17:00:21 > 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=36870 --set xrpc_port=46301
--set monet_prompt= --set mal_listing=2 --trace --dbname=mTests_src_mal
tst867.mal
-# 17:00:21 >
-
-# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
-# builtin opt gdk_version = 1.39.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 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 sql_optimizer = default_pipe
-# config opt minimal_pipe = inline,remap,deadcode,multiplex,garbageCollector
-# config opt default_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,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,octopus,deadcode,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,constants,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 = 36870
-# cmdline opt xrpc_port = 46301
-# cmdline opt monet_prompt =
-# cmdline opt mal_listing = 2
-# cmdline opt gdk_dbname = mTests_src_mal
-#warning: please don't forget to set your vault key!
-#(see /ufs/mk/current//Linux/etc/monetdb5.conf)
-
-# 17:00:21 >
-# 17:00:21 > Done.
-# 17:00:21 >
-
diff --git a/monetdb5/mal/Tests/tst867.stable.out
b/monetdb5/mal/Tests/tst867.stable.out
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst867.stable.out
+++ /dev/null
@@ -1,77 +0,0 @@
-stdout of test 'tst867` in directory 'monetdb5/mal` itself:
-
-
-# 17:00:21 >
-# 17:00:21 > 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=36870 --set xrpc_port=46301
--set monet_prompt= --set mal_listing=2 --trace --dbname=mTests_src_mal
tst867.mal
-# 17:00:21 >
-
-# MonetDB server v5.21.0, based on kernel v1.39.0
-# Serving database 'mTests_src_mal', using 4 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Found 7.751 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:36870/
-# MonetDB/SQL module v2.39.0 loaded
-# MonetDB/GIS module v0.19.0 loaded
-function user.main():void;
-# shrink operations.
- b := bat.new(:oid,:int);
- bat.append(b,1);
- bat.append(b,2);
- bat.append(b,3);
- bat.append(b,4);
- bat.append(b,5);
- bat.append(b,6);
- bat.append(b,7);
- bat.append(b,8);
- bat.append(b,9);
- io.print(b);
- d := bat.new(:oid,:oid);
- bat.append(d,1@0);
- bat.append(d,2@0);
- bat.append(d,7@0);
- s := bat.shrink(b,d);
- io.print(s);
- so := bat.shrinkMap(b,d);
- io.print(so);
-end user.main;
-#--------------------------#
-# h t # name
-# void int # type
-#-----------------#
-[ 0@0, 1 ]
-[ 1@0, 2 ]
-[ 2@0, 3 ]
-[ 3@0, 4 ]
-[ 4@0, 5 ]
-[ 5@0, 6 ]
-[ 6@0, 7 ]
-[ 7@0, 8 ]
-[ 8@0, 9 ]
-#-----------------#
-# h t # name
-# void int # type
-#-----------------#
-[ 0@0, 1 ]
-[ 1@0, 4 ]
-[ 2@0, 5 ]
-[ 3@0, 6 ]
-[ 4@0, 7 ]
-[ 5@0, 9 ]
-#-----------------#
-# h t # name
-# void oid # type
-#-----------------#
-[ 0@0, 0@0 ]
-[ 1@0, 3@0 ]
-[ 2@0, 4@0 ]
-[ 3@0, 5@0 ]
-[ 4@0, 6@0 ]
-[ 5@0, 8@0 ]
-
-# 17:00:21 >
-# 17:00:21 > Done.
-# 17:00:21 >
-
diff --git a/monetdb5/tests/gdkTests/Tests/str_heap.mal
b/monetdb5/tests/gdkTests/Tests/str_heap.mal
--- a/monetdb5/tests/gdkTests/Tests/str_heap.mal
+++ b/monetdb5/tests/gdkTests/Tests/str_heap.mal
@@ -21,5 +21,5 @@ bat.load("DRUID_sample");
c:bat[:oid,:str]:= bbp.bind("DRUID_sample");
io.print(c);
-bat.setPersistent(c,false);
+bat.setTransient(c);
clients.quit();
diff --git a/monetdb5/tests/gdkTests/Tests/str_heap.stable.out
b/monetdb5/tests/gdkTests/Tests/str_heap.stable.out
--- a/monetdb5/tests/gdkTests/Tests/str_heap.stable.out
+++ b/monetdb5/tests/gdkTests/Tests/str_heap.stable.out
@@ -27,7 +27,7 @@ function user.main():void;
bat.load("DRUID_sample");
c:bat[:oid,:str] := bbp.bind("DRUID_sample");
io.print(c);
- bat.setPersistent(c,false);
+ bat.setTransient(c);
clients.quit();
end user.main;
#--------------------------#
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
