Changeset: f0d67bf50c3e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f0d67bf50c3e
Modified Files:
sql/src/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.sql
Branch: default
Log Message:
Merge with Oct2010 branch.
diffs (108 lines):
diff -r 2dc351726790 -r f0d67bf50c3e MonetDB4/src/modules/plain/Tests/All
--- a/MonetDB4/src/modules/plain/Tests/All Thu Dec 16 11:36:28 2010 +0100
+++ b/MonetDB4/src/modules/plain/Tests/All Thu Dec 16 11:41:22 2010 +0100
@@ -6,8 +6,6 @@
ascii_io
ascii_io2
ascii_io3
-bat
-bat2
blob
mmath
mmath_nan
@@ -27,3 +25,5 @@
HAVE_PCRE?pcre
builtin
TriBool
+bat2
+bat
diff -r 2dc351726790 -r f0d67bf50c3e
sql/src/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.sql
--- a/sql/src/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.sql
Thu Dec 16 11:36:28 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-create table cm_tmp(i int);
-plan copy into cm_tmp from '/file1','/file2';
-drop table cm_tmp;
diff -r 2dc351726790 -r f0d67bf50c3e
sql/src/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.sql.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/src/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.sql.in
Thu Dec 16 11:41:22 2010 +0100
@@ -0,0 +1,3 @@
+create table cm_tmp(i int);
+plan copy into cm_tmp from '${DIRSEP}file1','${DIRSEP}file2';
+drop table cm_tmp;
diff -r 2dc351726790 -r f0d67bf50c3e
sql/src/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++
b/sql/src/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows
Thu Dec 16 11:41:22 2010 +0100
@@ -0,0 +1,44 @@
+stdout of test 'copy_multiple_files.SF-2902320` in directory
'src/test/BugTracker-2009` itself:
+
+
+# 08:59:53 >
+# 08:59:53 > mserver5
"--config=/ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf" --debug=10
--set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/dbfarm"
--set mapi_open=true --set xrpc_open=true --set mapi_port=36694 --set
xrpc_port=47294 --set monet_prompt= --trace
"--dbname=mTests_src_test_BugTracker-2009" --set mal_listing=0 "--dbinit=
include sql;" ; echo ; echo Over..
+# 08:59:53 >
+
+# MonetDB server v5.16.0, based on kernel v1.34.0
+# Serving database 'mTests_src_test_BugTracker-2009', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Detected 7.753 GiB (8324386816 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://alf.ins.cwi.nl:36694/
+# MonetDB/SQL module v2.34.0 loaded
+
+Ready.
+#function user.main():void;
+# clients.quit();
+#end main;
+
+Over..
+
+# 08:59:53 >
+# 08:59:53 > mclient -lsql -i --host=alf --port=36694
+# 08:59:53 >
+
+% .plan # table_name
+% rel # name
+% clob # type
+% 94 # length
+insert(
+| table(sys.cm_tmp) [ cm_tmp.i, cm_tmp.%TID% NOT NULL ]
+| union (
+| | table copyfrom('sys', 'cm_tmp', '|', '\n', 'NULL', 'null', '\file1', -1,
0), [ cm_tmp.i ],
+| | table copyfrom('sys', 'cm_tmp', '|', '\n', 'NULL', 'null', '\file2', -1,
0), [ cm_tmp.i ]
+| )
+)
+
+# 08:59:53 >
+# 08:59:53 > Done.
+# 08:59:53 >
+
diff -r 2dc351726790 -r f0d67bf50c3e sql/src/test/Tests/copy_into.sql.in
--- a/sql/src/test/Tests/copy_into.sql.in Thu Dec 16 11:36:28 2010 +0100
+++ b/sql/src/test/Tests/copy_into.sql.in Thu Dec 16 11:41:22 2010 +0100
@@ -5,11 +5,11 @@
insert into copyouttest values (' Test ','');
select * from copyouttest;
-copy select * from copyouttest into '$TSTTRGBASE/mTests/x.dat' delimiters
'[]', '\n';
+copy select * from copyouttest into '$QTSTTRGBASE/mTests/x.dat' delimiters
'[]', '\n';
drop table copyouttest;
create table copyintest ( str VARCHAR(20), str2 VARCHAR(20));
-copy into copyintest from '$TSTTRGBASE/mTests/x.dat' delimiters '[]', '\n',
'"';
+copy into copyintest from '$QTSTTRGBASE/mTests/x.dat' delimiters '[]', '\n',
'"';
select * from copyintest;
drop table copyintest;
diff -r 2dc351726790 -r f0d67bf50c3e testing/src/Mtest.py.in
--- a/testing/src/Mtest.py.in Thu Dec 16 11:36:28 2010 +0100
+++ b/testing/src/Mtest.py.in Thu Dec 16 11:41:22 2010 +0100
@@ -3065,6 +3065,7 @@
vars = vars + [ 'MILCLIENT', 'MALCLIENT', 'SQLCLIENT', 'SQLDUMP',
'XQUERYCLIENT'] #, 'MONETDB_MOD_PATH' ]
env = {}
+ env['DIRSEP'] = os.sep
# most intuitive (?) default settings
dft['TSTSRCBASE'] = "GetMonetConfig(par['PACKAGE'],'--source')"
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
