Changeset: 3783a2986caf for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3783a2986caf
Added Files:
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err.Windows
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.sql
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.err.Windows
Removed Files:
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.sql.in
Modified Files:
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.sql
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.err
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows
Branch: Feb2013
Log Message:
make tests with absolute paths work on both Unix & Windows after changeset
48104:ea5b874f5289
Windows output to be double-checked after next nightly test run
diffs (truncated from 386 to 300 lines):
diff --git a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.sql
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.sql
--- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.sql
+++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.sql
@@ -1,11 +1,15 @@
create table ttt (a int, b int, c int);
select optimizer;
select def from optimizers() where name = optimizer;
-explain copy into ttt from '/:\tmp/xyz';
+explain copy into ttt from '/tmp/xyz';
+explain copy into ttt from '\tmp/xyz';
+explain copy into ttt from 'a:\tmp/xyz';
declare opt_pipe_name string; set opt_pipe_name = ( select optimizer );
declare opt_pipe_def string; set opt_pipe_def = ( select def from
optimizers() where name = opt_pipe_name );
set optimizer =
substring(opt_pipe_def,0,length(opt_pipe_def)-length('optimizer.garbageCollector();'))
|| 'optimizer.sql_append();optimizer.garbageCollector();';
select optimizer;
select def from optimizers() where name = optimizer;
-explain copy into ttt from '/:\tmp/xyz';
+explain copy into ttt from '/tmp/xyz';
+explain copy into ttt from '\tmp/xyz';
+explain copy into ttt from 'Z:/tmp/xyz';
drop table ttt;
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
--- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
+++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
@@ -30,6 +30,18 @@ stderr of test 'opt_sql_append` in direc
# 22:58:57 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=rome"
"--port=36275"
# 22:58:57 >
+MAPI = (monetdb) /var/tmp/mtest-10831/.s.monetdb.30752
+QUERY = explain copy into ttt from '\tmp/xyz';
+ERROR = !COPY INTO: filename must have absolute path: \tmp/xyz
+MAPI = (monetdb) /var/tmp/mtest-10831/.s.monetdb.30752
+QUERY = explain copy into ttt from 'a:\tmp/xyz';
+ERROR = !COPY INTO: filename must have absolute path: a:\tmp/xyz
+MAPI = (monetdb) /var/tmp/mtest-10831/.s.monetdb.30752
+QUERY = explain copy into ttt from '\tmp/xyz';
+ERROR = !COPY INTO: filename must have absolute path: \tmp/xyz
+MAPI = (monetdb) /var/tmp/mtest-10831/.s.monetdb.30752
+QUERY = explain copy into ttt from 'Z:/tmp/xyz';
+ERROR = !COPY INTO: filename must have absolute path: Z:/tmp/xyz
# 22:58:58 >
# 22:58:58 > "Done."
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err.Windows
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err.Windows
new file mode 100644
--- /dev/null
+++
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err.Windows
@@ -0,0 +1,49 @@
+stderr of test 'opt_sql_append` in directory
'monetdb5/extras/mal_optimizer_template` itself:
+
+
+# 22:58:57 >
+# 22:58:57 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/ufs/manegold/_/Monet/HG/default/prefix/_/var/MonetDB" "--set"
"mapi_open=true" "--set" "mapi_port=36275" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2"
"--dbname=mTests_extras_mal_optimizer_template" "--set" "mal_listing=0"
+# 22:58:57 >
+
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm =
/ufs/manegold/_/Monet/HG/default/prefix/_/var/monetdb5/dbfarm
+# builtin opt gdk_debug = 0
+# builtin opt gdk_alloc_map = no
+# builtin opt gdk_vmtrim = yes
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt gdk_dbfarm =
/ufs/manegold/_/Monet/HG/default/prefix/_/var/MonetDB
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 36275
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_extras_mal_optimizer_template
+# cmdline opt mal_listing = 0
+
+# 22:58:57 >
+# 22:58:57 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=rome"
"--port=36275"
+# 22:58:57 >
+
+MAPI = (monetdb) /var/tmp/mtest-10831/.s.monetdb.30752
+QUERY = explain copy into ttt from '/tmp/xyz';
+ERROR = !COPY INTO: filename must have absolute path: /tmp/xyz
+MAPI = (monetdb) /var/tmp/mtest-10831/.s.monetdb.30752
+QUERY = explain copy into ttt from '\tmp/xyz';
+ERROR = !COPY INTO: filename must have absolute path: \tmp/xyz
+MAPI = (monetdb) /var/tmp/mtest-10831/.s.monetdb.30752
+QUERY = explain copy into ttt from '/tmp/xyz';
+ERROR = !COPY INTO: filename must have absolute path: /tmp/xyz
+MAPI = (monetdb) /var/tmp/mtest-10831/.s.monetdb.30752
+QUERY = explain copy into ttt from '\tmp/xyz';
+ERROR = !COPY INTO: filename must have absolute path: \tmp/xyz
+
+# 22:58:58 >
+# 22:58:58 > "Done."
+# 22:58:58 >
+
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
--- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
+++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
@@ -57,14 +57,14 @@ Ready.
% clob # type
% 447 # length
[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptySet();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.history();optimizer.multiplex();optimizer.garbageCollector();"
]
-#explain copy into ttt from '/:\tmp/xyz';
+#explain copy into ttt from '/tmp/xyz';
% .explain # table_name
% mal # name
% clob # type
-% 153 # length
+% 150 # length
function user.s2_1{autoCommit=true}():void;
X_2 := sql.mvc();
- (X_13:bat[:oid,:int] ,X_14:bat[:oid,:int] ,X_15:bat[:oid,:int] ) :=
sql.copy_from("sys","ttt","|","\\n",nil:str,"null","/:\\tmp/xyz",-1:lng,0:lng,0);
+ (X_13:bat[:oid,:int] ,X_14:bat[:oid,:int] ,X_15:bat[:oid,:int] ) :=
sql.copy_from("sys","ttt","|","\\n",nil:str,"null","/tmp/xyz",-1:lng,0:lng,0);
X_17 := sql.append(X_2,"sys","ttt","a",X_13);
X_19 := sql.append(X_17,"sys","ttt","b",X_14);
X_23 := sql.append(X_19,"sys","ttt","c",X_15);
@@ -85,14 +85,14 @@ end s2_1;
% clob # type
% 470 # length
[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptySet();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.history();optimizer.multiplex();optimizer.sql_append();optimizer.garbageCollector();"
]
-#explain copy into ttt from '/:\tmp/xyz';
+#explain copy into ttt from '/tmp/xyz';
% .explain # table_name
% mal # name
% clob # type
-% 153 # length
+% 150 # length
function user.s5_1{autoCommit=true}():void;
X_2 := sql.mvc();
- (X_13:bat[:oid,:int] ,X_14:bat[:oid,:int] ,X_15:bat[:oid,:int] ) :=
sql.copy_from("sys","ttt","|","\\n",nil:str,"null","/:\\tmp/xyz",-1:lng,0:lng,0);
+ (X_13:bat[:oid,:int] ,X_14:bat[:oid,:int] ,X_15:bat[:oid,:int] ) :=
sql.copy_from("sys","ttt","|","\\n",nil:str,"null","/tmp/xyz",-1:lng,0:lng,0);
X_17 := sql.append(X_2,"sys","ttt","a",X_13);
X_19 := sql.append(X_17,"sys","ttt","b",X_14);
X_24 := aggr.count(X_15);
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
new file mode 100644
--- /dev/null
+++
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
@@ -0,0 +1,109 @@
+stdout of test 'opt_sql_append` in directory
'monetdb5/extras/mal_optimizer_template` itself:
+
+
+# 22:58:57 >
+# 22:58:57 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/ufs/manegold/_/Monet/HG/default/prefix/_/var/MonetDB" "--set"
"mapi_open=true" "--set" "mapi_port=36275" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2"
"--dbname=mTests_extras_mal_optimizer_template" "--set" "mal_listing=0"
+# 22:58:57 >
+
+# MonetDB 5 server v11.8.0
+# This is an unreleased version
+# Serving database 'mTests_extras_mal_optimizer_template', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 15.630 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2013 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://rome.ins.cwi.nl:36275/
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+# SQL catalog created, loading sql scripts once
+# loading sql script: 09_like.sql
+# loading sql script: 10_math.sql
+# loading sql script: 11_times.sql
+# loading sql script: 12_url.sql
+# loading sql script: 13_date.sql
+# loading sql script: 14_inet.sql
+# loading sql script: 15_history.sql
+# loading sql script: 16_tracelog.sql
+# loading sql script: 17_compress.sql
+# loading sql script: 18_dictionary.sql
+# loading sql script: 19_cluster.sql
+# loading sql script: 20_vacuum.sql
+# loading sql script: 21_dependency_functions.sql
+# loading sql script: 22_clients.sql
+# loading sql script: 23_skyserver.sql
+# loading sql script: 24_zorder.sql
+# loading sql script: 25_debug.sql
+# loading sql script: 40_geom.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 99_system.sql
+
+# 22:58:57 >
+# 22:58:57 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=rome"
"--port=36275"
+# 22:58:57 >
+
+#create table ttt (a int, b int, c int);
+#select optimizer;
+% . # table_name
+% single_value # name
+% varchar # type
+% 12 # length
+[ "default_pipe" ]
+#select def from optimizers() where name = optimizer;
+% . # table_name
+% def # name
+% clob # type
+% 447 # length
+[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptySet();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.history();optimizer.multiplex();optimizer.garbageCollector();"
]
+#explain copy into ttt from 'a:\tmp/xyz';
+% .explain # table_name
+% mal # name
+% clob # type
+% 153 # length
+function user.s2_1{autoCommit=true}():void;
+ X_2 := sql.mvc();
+ (X_13:bat[:oid,:int] ,X_14:bat[:oid,:int] ,X_15:bat[:oid,:int] ) :=
sql.copy_from("sys","ttt","|","\\n",nil:str,"null","a:\\tmp/xyz",-1:lng,0:lng,0);
+ X_17 := sql.append(X_2,"sys","ttt","a",X_13);
+ X_19 := sql.append(X_17,"sys","ttt","b",X_14);
+ X_23 := sql.append(X_19,"sys","ttt","c",X_15);
+ X_24 := aggr.count(X_15);
+ sql.affectedRows(X_23,X_24,"");
+end s2_1;
+# optimizer.mitosis()
+# optimizer.dataflow()
+#select optimizer;
+% . # table_name
+% single_value # name
+% varchar # type
+% 6 # length
+[ "user_1" ]
+#select def from optimizers() where name = optimizer;
+% . # table_name
+% def # name
+% clob # type
+% 470 # length
+[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptySet();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.history();optimizer.multiplex();optimizer.sql_append();optimizer.garbageCollector();"
]
+#explain copy into ttt from 'Z:/tmp/xyz';
+% .explain # table_name
+% mal # name
+% clob # type
+% 152 # length
+function user.s5_1{autoCommit=true}():void;
+ X_2 := sql.mvc();
+ (X_13:bat[:oid,:int] ,X_14:bat[:oid,:int] ,X_15:bat[:oid,:int] ) :=
sql.copy_from("sys","ttt","|","\\n",nil:str,"null","Z:/tmp/xyz",-1:lng,0:lng,0);
+ X_17 := sql.append(X_2,"sys","ttt","a",X_13);
+ X_19 := sql.append(X_17,"sys","ttt","b",X_14);
+ X_24 := aggr.count(X_15);
+ X_23 := sql.append(X_19,"sys","ttt","c",X_15);
+ sql.affectedRows(X_23,X_24,"");
+end s5_1;
+# optimizer.mitosis()
+# optimizer.dataflow()
+#drop table ttt;
+
+# 22:58:58 >
+# 22:58:58 > "Done."
+# 22:58:58 >
+
diff --git
a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.sql.in
b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.sql
rename from sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.sql.in
rename to sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.sql
--- a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.sql.in
+++ b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.sql
@@ -1,3 +1,5 @@
create table cm_tmp(i int);
-plan copy into cm_tmp from '${DIRSEP}file1','${DIRSEP}file2';
+plan copy into cm_tmp from '/file1','/file2';
+plan copy into cm_tmp from '\file1','\file2';
+plan copy into cm_tmp from 'a:\file1','Z:/file2';
drop table cm_tmp;
diff --git
a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.err
b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.err
--- a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.err
+++ b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.err
@@ -76,6 +76,12 @@ stderr of test 'copy_multiple_files.SF-2
# 08:59:53 > mclient -lsql -i --host=alf --port=36694
# 08:59:53 >
+MAPI = (monetdb) /var/tmp/mtest-10609/.s.monetdb.34310
+QUERY = plan copy into cm_tmp from '\file1','\file2';
+ERROR = !COPY INTO: filename must have absolute path: \file1
+MAPI = (monetdb) /var/tmp/mtest-10609/.s.monetdb.34310
+QUERY = plan copy into cm_tmp from 'a:\file1','Z:/file2';
+ERROR = !COPY INTO: filename must have absolute path: a:\file1
# 08:59:53 >
# 08:59:53 > Done.
diff --git
a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.err.Windows
b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.err.Windows
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.err.Windows
@@ -0,0 +1,89 @@
+stderr of test 'copy_multiple_files.SF-2902320` in directory
'sql/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 >
+
+# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
+# builtin opt gdk_version = 1.34.0
+# builtin opt prefix = /ufs/niels/scratch/rc/Linux-x86_64
+# 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
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
