Changeset: 383a00ae3261 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=383a00ae3261
Modified Files:
Branch: default
Log Message:
Merge with Oct2010 branch.
Test that an empty database is also empty according to msqldump.
This is also a test for bug 2620.
diffs (143 lines):
diff -r 2f4ec55e6902 -r 383a00ae3261 sql/src/test/Dump/Tests/All
--- a/sql/src/test/Dump/Tests/All Wed Sep 08 10:26:59 2010 +0200
+++ b/sql/src/test/Dump/Tests/All Wed Sep 08 10:56:05 2010 +0200
@@ -1,3 +1,4 @@
+dump-empty
load
dump
clean
diff -r 2f4ec55e6902 -r 383a00ae3261 sql/src/test/Dump/Tests/dump-empty.SQL.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/src/test/Dump/Tests/dump-empty.SQL.py Wed Sep 08 10:56:05 2010 +0200
@@ -0,0 +1,6 @@
+import sys
+from MonetDBtesting import process
+
+p = process.client('sqldump', stdout = process.PIPE)
+dump, err = p.communicate()
+sys.stdout.write(dump)
diff -r 2f4ec55e6902 -r 383a00ae3261
sql/src/test/Dump/Tests/dump-empty.stable.err
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/src/test/Dump/Tests/dump-empty.stable.err Wed Sep 08 10:56:05
2010 +0200
@@ -0,0 +1,80 @@
+stderr of test 'dump-empty` in directory 'src/test/Dump` itself:
+
+
+# 10:50:27 >
+# 10:50:27 > mserver5
"--config=/ufs/sjoerd/Monet-virgin-candidate/etc/monetdb5.conf" --debug=10
--set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/sjoerd/Monet-virgin-candidate/lib64/MonetDB5:/ufs/sjoerd/Monet-virgin-candidate/lib64/MonetDB5/lib:/ufs/sjoerd/Monet-virgin-candidate/lib64/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/sjoerd/Monet-virgin-candidate/var/MonetDB5/dbfarm"
--set mapi_open=true --set xrpc_open=true --set mapi_port=37881 --set
xrpc_port=47331 --set monet_prompt= --set mal_listing=2 --trace
"--dbname=mTests_src_test_Dump" --set mal_listing=0 ; echo ; echo Over..
+# 10:50:27 >
+
+# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
+# builtin opt gdk_version = 1.40.0
+# builtin opt prefix = /ufs/sjoerd/Monet-virgin-candidate
+# 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 = ${prefix}/lib64/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/sjoerd/Monet-virgin-candidate
+# config opt config = ${prefix}/etc/monetdb5.conf
+# config opt prefix = /ufs/sjoerd/Monet-virgin-candidate
+# config opt exec_prefix = ${prefix}
+# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
+# config opt monet_mod_path =
${prefix}/lib64/MonetDB5:${prefix}/lib64/MonetDB5/lib:${prefix}/lib64/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 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 datacell_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,datacell,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,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/sjoerd/Monet-virgin-candidate/etc/monetdb5.conf
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt monet_mod_path =
/ufs/sjoerd/Monet-virgin-candidate/lib64/MonetDB5:/ufs/sjoerd/Monet-virgin-candidate/lib64/MonetDB5/lib:/ufs/sjoerd/Monet-virgin-candidate/lib64/MonetDB5/bin
+# cmdline opt gdk_dbfarm =
/ufs/sjoerd/Monet-virgin-candidate/var/MonetDB5/dbfarm
+# cmdline opt mapi_open = true
+# cmdline opt xrpc_open = true
+# cmdline opt mapi_port = 37881
+# cmdline opt xrpc_port = 47331
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_src_test_Dump
+# cmdline opt mal_listing = 0
+#warning: please don't forget to set your vault key!
+#(see /ufs/sjoerd/Monet-virgin-candidate/etc/monetdb5.conf)
+
+# 10:50:27 >
+# 10:50:27 > /usr/bin/python dump-empty.SQL.py dump-empty
+# 10:50:27 >
+
+
+# 10:50:28 >
+# 10:50:28 > Done.
+# 10:50:28 >
+
diff -r 2f4ec55e6902 -r 383a00ae3261
sql/src/test/Dump/Tests/dump-empty.stable.out
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/src/test/Dump/Tests/dump-empty.stable.out Wed Sep 08 10:56:05
2010 +0200
@@ -0,0 +1,37 @@
+stdout of test 'dump-empty` in directory 'src/test/Dump` itself:
+
+
+# 10:50:27 >
+# 10:50:27 > mserver5
"--config=/ufs/sjoerd/Monet-virgin-candidate/etc/monetdb5.conf" --debug=10
--set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/sjoerd/Monet-virgin-candidate/lib64/MonetDB5:/ufs/sjoerd/Monet-virgin-candidate/lib64/MonetDB5/lib:/ufs/sjoerd/Monet-virgin-candidate/lib64/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/sjoerd/Monet-virgin-candidate/var/MonetDB5/dbfarm"
--set mapi_open=true --set xrpc_open=true --set mapi_port=37881 --set
xrpc_port=47331 --set monet_prompt= --set mal_listing=2 --trace
"--dbname=mTests_src_test_Dump" --set mal_listing=0 ; echo ; echo Over..
+# 10:50:27 >
+
+# MonetDB server v5.22.0, based on kernel v1.40.0
+# Not released
+# Serving database 'mTests_src_test_Dump', 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-2010 MonetDB B.V., all rights reserved
+# Visit http://monetdb.cwi.nl/ for further information
+# Listening for connection requests on mapi:monetdb://ottar.ins.cwi.nl:37881/
+# MonetDB/SQL module v2.40.0 loaded
+# MonetDB/GIS module v0.20.0 loaded
+
+Ready.
+# SQL catalog created, loading sql scripts once
+
+Over..
+
+# 10:50:27 >
+# 10:50:27 > /usr/bin/python dump-empty.SQL.py dump-empty
+# 10:50:27 >
+
+#msqldump tables Wed Sep 8 10:50:27 2010
+
+START TRANSACTION;
+COMMIT;
+
+# 10:50:28 >
+# 10:50:28 > Done.
+# 10:50:28 >
+
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
