Changeset: d5255d2d66c7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d5255d2d66c7
Removed Files:
sql/test/rdf/Tests/q8_v_small.reqtests
sql/test/rdf/Tests/q8_v_small.sql
sql/test/rdf/Tests/q8_v_small.stable.err
sql/test/rdf/Tests/q8_v_small.stable.out
Modified Files:
sql/test/rdf/Tests/All
sql/test/rdf/Tests/q8_v.stable.err
sql/test/rdf/Tests/q8_v.stable.out
sql/test/rdf/Tests/q8_v.timeout
Branch: Nov2019
Log Message:
Enabled q8_v test and reduced the timeout factor.
Removed q8_v_small test as it was a smaller version of the full q8_v test.
diffs (truncated from 1373 to 300 lines):
diff --git a/sql/test/rdf/Tests/All b/sql/test/rdf/Tests/All
--- a/sql/test/rdf/Tests/All
+++ b/sql/test/rdf/Tests/All
@@ -23,7 +23,6 @@ q6_v
q7_t
q7_v
q8_t
-#q8_v
-q8_v_small
+q8_v
drop_tables_t
drop_tables_v
diff --git a/sql/test/rdf/Tests/q8_v.stable.err
b/sql/test/rdf/Tests/q8_v.stable.err
--- a/sql/test/rdf/Tests/q8_v.stable.err
+++ b/sql/test/rdf/Tests/q8_v.stable.err
@@ -1,82 +1,12 @@
stderr of test 'q8_v` in directory 'sql/test/rdf` itself:
-# 23:44:34 >
-# 23:44:34 > mserver5
"--config=/ufs/goncalve/scratch/MonetDB/stable/debug/MonetDB5/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/goncalve/scratch/MonetDB/stable/debug/MonetDB5/lib/MonetDB5:/ufs/goncalve/scratch/MonetDB/stable/debug/MonetDB5/lib/MonetDB5/lib:/ufs/goncalve/scratch/MonetDB/stable/debug/MonetDB5/lib/MonetDB5/bin"
--set
"gdk_dbfarm=/ufs/goncalve/scratch/MonetDB/stable/debug/MonetDB5/var/MonetDB5/dbfarm"
--set mapi_open=true --set xrpc_open=true --set mapi_port=37896 --set
xrpc_port=41021 --set monet_prompt= --trace "--dbname=mTests_src_test_rdf"
--set mal_listing=0 "--dbinit= include sql;" ; echo ; echo Over..
-# 23:44:34 >
-
-# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
-# builtin opt gdk_version = 1.34.4
-# builtin opt prefix = /ufs/goncalve/scratch/MonetDB/stable/debug/MonetDB
-# builtin opt exec_prefix = ${prefix}
-# builtin opt gdk_dbname = tst
-# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB
-# builtin opt gdk_debug = 8
-# builtin opt gdk_alloc_map = yes
-# 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 = yes
-# builtin opt host = localhost
-# builtin opt mapi_port = 50000
-# builtin opt mapi_noheaders = no
-# builtin opt mapi_debug = 0
-# builtin opt mapi_clients = 2
-# builtin opt sql_debug = 0
-# builtin opt standoff_ns = http://monetdb.cwi.nl/standoff
-# builtin opt standoff_start = start
-# builtin opt standoff_end = end
-# config opt prefix = /ufs/goncalve/scratch/MonetDB/stable/debug/MonetDB5
-# config opt config = ${prefix}/etc/monetdb5.conf
-# config opt prefix = /ufs/goncalve/scratch/MonetDB/stable/debug/MonetDB5
-# config opt exec_prefix = ${prefix}
-# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
-# config opt gdk_dbname = demo
-# config opt gdk_alloc_map = no
-# config opt gdk_embedded = no
-# config opt gdk_debug = 0
-# config opt monet_mod_path =
${exec_prefix}/lib/MonetDB5:${exec_prefix}/lib/MonetDB5/lib:${exec_prefix}/lib/MonetDB5/bin
-# config opt monet_daemon = no
-# config opt monet_welcome = yes
-# config opt mero_msglog = ${prefix}/var/log/MonetDB/merovingian.log
-# config opt mero_errlog = ${prefix}/var/log/MonetDB/merovingian.log
-# config opt mero_pidfile = ${prefix}/var/run/MonetDB/merovingian.pid
-# config opt mero_controlport = 50001
-# config opt mal_init = ${exec_prefix}/lib/MonetDB5/mal_init.mal
-# config opt mal_listing = 2
-# config opt mapi_port = 50000
-# config opt mapi_autosense = false
-# config opt mapi_open = false
-# config opt sql_optimizer = default_pipe
-# config opt default_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,garbageCollector,dataflow,history,multiplex
-# config opt replication_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,garbageCollector,dataflow,history,replication,multiplex
-# config opt accumulator_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,accumulators,garbageCollector,dataflow,history,multiplex
-# config opt recycler_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,deadcode,recycle,reduce,garbageCollector,dataflow,history,multiplex
-# config opt cracker_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,selcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,garbageCollector,dataflow,history,multiplex
-# config opt octopus_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,mitosis,aliases,mergetable,deadcode,constants,commonTerms,joinPath,octopus,deadcode,reduce,garbageCollector,dataflow,history,multiplex
-# config opt mitosis_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,mitosis,aliases,mergetable,deadcode,constants,commonTerms,joinPath,reorder,deadcode,reduce,garbageCollector,dataflow,history,multiplex
-# cmdline opt config =
/ufs/goncalve/scratch/MonetDB/stable/debug/MonetDB5/etc/monetdb5.conf
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt monet_mod_path =
/ufs/goncalve/scratch/MonetDB/stable/debug/MonetDB5/lib/MonetDB5:/ufs/goncalve/scratch/MonetDB/stable/debug/MonetDB5/lib/MonetDB5/lib:/ufs/goncalve/scratch/MonetDB/stable/debug/MonetDB5/lib/MonetDB5/bin
-# cmdline opt gdk_dbfarm =
/ufs/goncalve/scratch/MonetDB/stable/debug/MonetDB5/var/MonetDB5/dbfarm
-# cmdline opt mapi_open = true
-# cmdline opt xrpc_open = true
-# cmdline opt mapi_port = 37896
-# cmdline opt xrpc_port = 41021
-# cmdline opt monet_prompt =
-# cmdline opt gdk_dbname = mTests_src_test_rdf
-# cmdline opt mal_listing = 0
-#warning: please don't forget to set your vault key!
-#(see /ufs/goncalve/scratch/MonetDB/stable/debug/MonetDB5/etc/monetdb5.conf)
-
-# 23:44:34 >
-# 23:44:34 > mclient -lsql -i -umonetdb -Pmonetdb --host=alviss --port=37896
-# 23:44:34 >
+# 14:45:50 >
+# 14:45:50 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-996554" "--port=33768"
+# 14:45:50 >
-# 23:44:37 >
-# 23:44:37 > Done.
-# 23:44:37 >
+# 14:45:57 >
+# 14:45:57 > "Done."
+# 14:45:57 >
diff --git a/sql/test/rdf/Tests/q8_v.stable.out
b/sql/test/rdf/Tests/q8_v.stable.out
--- a/sql/test/rdf/Tests/q8_v.stable.out
+++ b/sql/test/rdf/Tests/q8_v.stable.out
@@ -1,35 +1,30 @@
stdout of test 'q8_v` in directory 'sql/test/rdf` itself:
-# 23:44:34 >
-# 23:44:34 > mserver5
"--config=/ufs/goncalve/scratch/MonetDB/stable/debug/MonetDB5/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/goncalve/scratch/MonetDB/stable/debug/MonetDB5/lib/MonetDB5:/ufs/goncalve/scratch/MonetDB/stable/debug/MonetDB5/lib/MonetDB5/lib:/ufs/goncalve/scratch/MonetDB/stable/debug/MonetDB5/lib/MonetDB5/bin"
--set
"gdk_dbfarm=/ufs/goncalve/scratch/MonetDB/stable/debug/MonetDB5/var/MonetDB5/dbfarm"
--set mapi_open=true --set xrpc_open=true --set mapi_port=37896 --set
xrpc_port=41021 --set monet_prompt= --trace "--dbname=mTests_src_test_rdf"
--set mal_listing=0 "--dbinit= include sql;" ; echo ; echo Over..
-# 23:44:34 >
+# 14:45:50 >
+# 14:45:50 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-996554" "--port=33768"
+# 14:45:50 >
-# MonetDB server v5.16.4, based on kernel v1.34.4
-# Serving database 'mTests_src_test_rdf', using 4 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Detected 7.753 GiB (8324337664 bytes) main-memory.
-# 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://alviss.ins.cwi.nl:37896/
-# MonetDB/SQL module v2.34.4 loaded
-
-#function user.main():void;
-# clients.quit();
-#end main;
-
-
-# 23:44:34 >
-# 23:44:34 > mclient -lsql -i -umonetdb -Pmonetdb --host=alviss --port=37896
-# 23:44:34 >
-
+#with A as (
+# (select subj, obj FROM prop14657240_pso where subj = 12854543)
+# UNION ALL
+# (select subj, obj FROM prop14660343_pso where subj = 12854543)
+# UNION ALL
+# (select subj, obj FROM prop17582582_pso where subj = 12854543)
+# UNION ALL
+# (select subj, obj FROM prop14657202_pso where subj = 12854543)
+# UNION ALL
+# (select subj, obj FROM prop14657244_pso where subj = 12854543)
+# UNION ALL
+# (select subj, obj FROM prop14657245_pso where subj = 12854543)
+# UNION ALL
+# (select subj, obj FROM prop14660087_pso where subj = 12854543)
% .trip # table_name
% subj # name
% int # type
% 1 # length
-# 23:44:37 >
-# 23:44:37 > Done.
-# 23:44:37 >
+# 14:45:57 >
+# 14:45:57 > "Done."
+# 14:45:57 >
diff --git a/sql/test/rdf/Tests/q8_v.timeout b/sql/test/rdf/Tests/q8_v.timeout
--- a/sql/test/rdf/Tests/q8_v.timeout
+++ b/sql/test/rdf/Tests/q8_v.timeout
@@ -1,1 +1,1 @@
-50
+2
diff --git a/sql/test/rdf/Tests/q8_v_small.reqtests
b/sql/test/rdf/Tests/q8_v_small.reqtests
deleted file mode 100644
--- a/sql/test/rdf/Tests/q8_v_small.reqtests
+++ /dev/null
@@ -1,1 +0,0 @@
-create_tables_v
diff --git a/sql/test/rdf/Tests/q8_v_small.sql
b/sql/test/rdf/Tests/q8_v_small.sql
deleted file mode 100644
--- a/sql/test/rdf/Tests/q8_v_small.sql
+++ /dev/null
@@ -1,1100 +0,0 @@
-with A as (
- (select subj, obj FROM prop14657240_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop14660343_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop17582582_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop14657202_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop14657244_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop14657245_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop14660087_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop14660290_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop14660329_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop14660333_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop14659612_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop14659802_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop14659801_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop14657234_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop14659613_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop14659939_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop14660254_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop14659603_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop14659615_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop14657207_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop14657217_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop14659708_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop14660306_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop14657206_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop14657208_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop14657221_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop14657249_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop14659533_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop14660330_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop17302406_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop14660321_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop11121625_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop14659714_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop14657215_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop14660308_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop14657214_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop14657200_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop14657213_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop14657220_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop14657016_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop17302355_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop17302445_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop17302397_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop17302372_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop17302421_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop17302393_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop14657017_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop14657219_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop17302388_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop17302389_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop17302454_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop17302479_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop17302441_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop17302416_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop17302469_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop17302376_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop17302517_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop17302367_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop17302512_pso where subj = 12854543)
- UNION ALL
- (select subj, obj FROM prop14659709_pso where subj = 12854543)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
