Changeset: 8ae393b9de1e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8ae393b9de1e
Modified Files:
sql/src/test/BugTracker-2010/Tests/connectto.Bug-2548.stable.err.Windows
sql/src/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err.Windows
sql/src/test/BugTracker-2010/Tests/incomplete-utf8-sequence.Bug-2575.stable.err.Windows
sql/src/test/Dump/Tests/dump.stable.out.Windows
Branch: Oct2010
Log Message:
Approve Windows-specific output.
diffs (225 lines):
diff -r edbb6276531b -r 8ae393b9de1e
sql/src/test/BugTracker-2010/Tests/connectto.Bug-2548.stable.err.Windows
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/src/test/BugTracker-2010/Tests/connectto.Bug-2548.stable.err.Windows
Mon Sep 20 14:10:20 2010 +0200
@@ -0,0 +1,86 @@
+stderr of test 'connectto.Bug-2548` in directory 'src/test/BugTracker-2010`
itself:
+
+
+# 13:12:55 >
+# 13:12:55 > mserver5
"--config=/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix./etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix./lib64/MonetDB5:/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix./lib64/MonetDB5/lib:/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix./lib64/MonetDB5/bin"
--set
"gdk_dbfarm=/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix./var/MonetDB5/dbfarm"
--set mapi_open=true --set xrpc_open=true --set mapi_port=39884 --set
xrpc_port=41478 --set monet_prompt= --set mal_listing=2 --trace
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo
Over..
+# 13:12:55 >
+
+# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
+# builtin opt gdk_version = 1.38.1
+# builtin opt prefix = /ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.
+# 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}/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/manegold/_/scratch0/Monet/HG/Jun2010/prefix.
+# config opt config = ${prefix}/etc/monetdb5.conf
+# config opt prefix = /ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.
+# config opt exec_prefix = ${prefix}
+# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
+# config opt monet_mod_path =
${exec_prefix}/lib64/MonetDB5:${exec_prefix}/lib64/MonetDB5/lib:${exec_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 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 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,mergetable,deadcode,constants,commonTerms,derivePath,joinPath,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/manegold/_/scratch0/Monet/HG/Jun2010/prefix./etc/monetdb5.conf
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt monet_mod_path =
/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix./lib64/MonetDB5:/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix./lib64/MonetDB5/lib:/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix./lib64/MonetDB5/bin
+# cmdline opt gdk_dbfarm =
/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix./var/MonetDB5/dbfarm
+# cmdline opt mapi_open = true
+# cmdline opt xrpc_open = true
+# cmdline opt mapi_port = 39884
+# cmdline opt xrpc_port = 41478
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_src_test_BugTracker-2010
+# cmdline opt mal_listing = 0
+#warning: please don't forget to set your vault key!
+#(see /ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix./etc/monetdb5.conf)
+
+# 13:12:55 >
+# 13:12:55 > mclient -lsql -ftest -i -e --host=rig --port=39884
+# 13:12:55 >
+
+MAPI = mone...@lab03:39710
+QUERY = connect to default;
+ERROR = !CONNECT TO: DEFAULT is not supported!
+MAPI = mone...@lab03:39710
+QUERY = connect to 'whatever' port 50001 database 'nonexisting' USER 'monetdb'
PASSWORD 'monetdb' LANGUAGE 'mal';
+ERROR = !IOException:mapi.connect:Could not connect: getaddrinfo failed: The
requested name is valid, but no data of the requested type was found.
+MAPI = mone...@lab03:39710
+QUERY = disconnect 'whatever';
+ERROR = !DISCONNECT CATALOG: no such db_alias 'whatever'
+
+# 13:12:55 >
+# 13:12:55 > Done.
+# 13:12:55 >
+
diff -r edbb6276531b -r 8ae393b9de1e
sql/src/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err.Windows
---
a/sql/src/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err.Windows
Mon Sep 20 11:26:46 2010 +0200
+++
b/sql/src/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err.Windows
Mon Sep 20 14:10:20 2010 +0200
@@ -70,10 +70,10 @@
# 17:25:18 > mclient -lsql -ftest -i -e --host=ottar --port=38866
# 17:25:18 >
-MAPI = mone...@ottar:38866
+MAPI = mone...@lab03:39710
QUERY = COPY 2 RECORDS INTO uitspraken FROM STDIN DELIMITERS '\t', '\n' NULL
as '';
277351 AA7351 1 Rechtbank 's-Gravenhage 2000-08-04
AWB 00/6928, 00/6929, 00/6930 Arrondissementsrechtbank te
's-Gravenhage\nzittinghoudende te Haarlem\nfungerend president\nenkelvoudige
kamer voor Vreemdelingenzaken\n\nU I T S P R A A K\n\nartikel 8:81 en 8:86
Algemene Wet Bestuursrecht (Awb)\nartikel 33a, 34a en 34j Vreemdelingenwet
(Vw)\n\nreg.nr: AWB 00/6928 VRWET H (voorlopige voorziening)\nAWB 00/6929 VRWET
H (beroepszaak)\nAW
-ERROR = !SQLException:importTable:value 'Arrondissementsrechtbank te
's-Gravenhage\nzittinghoudende te Haarlem\nfungerend president\nenkelvoudige
kamer voor Vreemdelingenzaken\n\nU I T S P R A A K\n\nartikel 8:81 en 8:86
Algemene Wet Bestuursrecht (Awb)\nartikel 33a, 34a en 34j Vreemdelingenwet
(Vw)\n\nreg.nr: AWB 00/6928 VRWET H (voorlopige voorzieni...' from line 2 field
8 not inserted, expecting type str
+ERROR = !SQLException:importTable:value 'Arrondissementsrechtbank te
's-Gravenhage\nzittinghoudende te Haarlem\nfungerend president\nenkelvoudige
kamer voor Vreemdelingenzaken\n\nU I T S P R A A K\n\nartikel 8:81 en 8:86
Algemene Wet Bestuursrecht (Awb)\nartikel 33a, 34a en 34j Vreemdelingenwet
(Vw)\n\nreg.nr: AWB 00/6928 VRWET H (voorlopige voorzieni...' from line 2 field
8 not inserted, expecting type clob
!failed to import table
# 17:25:18 >
diff -r edbb6276531b -r 8ae393b9de1e
sql/src/test/BugTracker-2010/Tests/incomplete-utf8-sequence.Bug-2575.stable.err.Windows
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++
b/sql/src/test/BugTracker-2010/Tests/incomplete-utf8-sequence.Bug-2575.stable.err.Windows
Mon Sep 20 14:10:20 2010 +0200
@@ -0,0 +1,81 @@
+stderr of test 'incomplete-utf8-sequence.Bug-2575` in directory
'src/test/BugTracker-2010` itself:
+
+
+# 14:47:28 >
+# 14:47:28 > mserver5 "--config=/ufs/sjoerd/Monet-stable/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/sjoerd/Monet-stable/lib64/MonetDB5:/ufs/sjoerd/Monet-stable/lib64/MonetDB5/lib:/ufs/sjoerd/Monet-stable/lib64/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/sjoerd/Monet-stable/var/MonetDB5/dbfarm" --set
mapi_open=true --set xrpc_open=true --set mapi_port=36476 --set xrpc_port=40665
--set monet_prompt= --set mal_listing=2 --trace
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo
Over..
+# 14:47:28 >
+
+# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
+# builtin opt gdk_version = 1.38.4
+# builtin opt prefix = /ufs/sjoerd/Monet-stable
+# 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-stable
+# config opt config = ${prefix}/etc/monetdb5.conf
+# config opt prefix = /ufs/sjoerd/Monet-stable
+# 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 nov2009_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,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 derive_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,derivePath,joinPath,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-stable/etc/monetdb5.conf
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt monet_mod_path =
/ufs/sjoerd/Monet-stable/lib64/MonetDB5:/ufs/sjoerd/Monet-stable/lib64/MonetDB5/lib:/ufs/sjoerd/Monet-stable/lib64/MonetDB5/bin
+# cmdline opt gdk_dbfarm = /ufs/sjoerd/Monet-stable/var/MonetDB5/dbfarm
+# cmdline opt mapi_open = true
+# cmdline opt xrpc_open = true
+# cmdline opt mapi_port = 36476
+# cmdline opt xrpc_port = 40665
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_src_test_BugTracker-2010
+# cmdline opt mal_listing = 0
+#warning: please don't forget to set your vault key!
+#(see /ufs/sjoerd/Monet-stable/etc/monetdb5.conf)
+
+# 14:47:29 >
+# 14:47:29 > mclient -lsql -ftest -i -e --host=ottar --port=36476
+# 14:47:29 >
+
+MAPI = mone...@lab03:39710
+QUERY = copy 2 records into tbl_bug2575 from stdin using delimiters
'\t','\n','';
+ 10001160000 29 .v.
+ 10001690001 0 coÃ
+
+ERROR = !SQLException:importTable:value 'coÃ' from line 2 field 3 not
inserted, expecting type char(3)
+ !failed to import table
+
+# 14:47:29 >
+# 14:47:29 > Done.
+# 14:47:29 >
+
diff -r edbb6276531b -r 8ae393b9de1e
sql/src/test/Dump/Tests/dump.stable.out.Windows
--- a/sql/src/test/Dump/Tests/dump.stable.out.Windows Mon Sep 20 11:26:46
2010 +0200
+++ b/sql/src/test/Dump/Tests/dump.stable.out.Windows Mon Sep 20 14:10:20
2010 +0200
@@ -79,23 +79,23 @@
"blob100" BINARY LARGE OBJECT(100),
"clob" CHARACTER LARGE OBJECT,
"clob100" CHARACTER LARGE OBJECT(100),
- "character" char(1),
- "varchar100" varchar(100),
- "character10" char(10)
+ "character" CHAR(1),
+ "varchar100" VARCHAR(100),
+ "character10" CHAR(10)
);
COPY 1 RECORDS INTO "sys"."typestest" FROM stdin USING DELIMITERS
'\t','\n','"';
true 10 10000 1000000 1000000 10000000000 1e+030 1.00000002e+020
1 123456789 12345.678 3.1415000000000002 3.1415 3.1415
2009-04-15 24 18 3 1728000 108000 120000 100000 36000
6000 2000 600 100 10 1995-07-15 07:30:00.000000
1995-07-15 07:30:00.00000 1995-07-15 07:30:00.000000+00:00
1995-07-15 07:30:00.00000+00:00 07:30:00 07:30:00.00000 07:30:00+00:00
07:30:00.00000+00:00 123456 123456 "123456" "123456" "x"
"varchar" "0123456789"
CREATE TABLE "sys"."keytest1" (
- "key1" int NOT NULL,
- "key2" int NOT NULL,
+ "key1" INTEGER NOT NULL,
+ "key2" INTEGER NOT NULL,
CONSTRAINT "keytest1_key1_key2_pkey" PRIMARY KEY ("key1", "key2")
);
COPY 2 RECORDS INTO "sys"."keytest1" FROM stdin USING DELIMITERS '\t','\n','"';
0 0
0 1
CREATE TABLE "sys"."keytest2" (
- "key1" int,
- "key2" int
+ "key1" INTEGER,
+ "key2" INTEGER
);
COPY 2 RECORDS INTO "sys"."keytest2" FROM stdin USING DELIMITERS '\t','\n','"';
0 0
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
