Changeset: 8cba17ea123b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8cba17ea123b
Modified Files:
Branch: default
Log Message:
merge with Jun2010
diffs (274 lines):
diff -r 0d31e2ec9d1d -r 8cba17ea123b
pathfinder/runtime/Tests/serialization-mclient.stable.err.NoAlgebra
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pathfinder/runtime/Tests/serialization-mclient.stable.err.NoAlgebra
Fri Jul 30 10:18:15 2010 +0200
@@ -0,0 +1,40 @@
+stderr of test 'serialization-mclient` in directory 'runtime` itself:
+
+
+# 19:58:59 >
+# 19:58:59 > Mtimeout -timeout 420 Mserver
"--config=/net/corona.ins.cwi.nl/export/scratch0/manegold/Monet/Testing/Current/prefix.--enable-strict_--disable-debug_--enable-optimize/etc/MonetDB.conf"
--debug=10 --set
"monet_mod_path=/net/corona.ins.cwi.nl/export/scratch0/manegold/Monet/Testing/Current/prefix.--enable-strict_--disable-debug_--enable-optimize/lib64/MonetDB4:/net/corona.ins.cwi.nl/export/scratch0/manegold/Monet/Testing/Current/prefix.--enable-strict_--disable-debug_--enable-optimize/lib64/MonetDB4/lib:/net/corona.ins.cwi.nl/export/scratch0/manegold/Monet/Testing/Current/prefix.--enable-strict_--disable-debug_--enable-optimize/lib64/MonetDB4/bin"
--set
"gdk_dbfarm=/net/corona.ins.cwi.nl/export/scratch0/manegold/Monet/Testing/Current/prefix.--enable-strict_--disable-debug_--enable-optimize/var/MonetDB4/dbfarm"
--set
"sql_logdir=/net/corona.ins.cwi.nl/export/scratch0/manegold/Monet/Testing/Current/prefix.--enable-strict_--disable-debug_--enable-optimize/var/MonetD
B4/sql_logs" --set
"xquery_logdir=/net/corona.ins.cwi.nl/export/scratch0/manegold/Monet/Testing/Current/prefix.--enable-strict_--disable-debug_--enable-optimize/var/MonetDB4/xquery_logs"
--set mapi_open=true --set xrpc_open=true --set mapi_port=39161 --set
xrpc_port=47285 --set monet_prompt= --trace "--dbname=mTests_runtime"
--dbinit=" module(pathfinder);" ; echo ; echo Over..
+# 19:58:59 >
+
+
+# 19:59:00 >
+# 19:59:00 > Mtimeout -timeout 300 /usr/bin/python
serialization-mclient.XQUERY.py serialization-mclient
+# 19:59:00 >
+
+
+mode="xml"
+
+mode="xml-typed"
+
+mode="xml-noheader"
+
+mode="xml-noroot"
+
+mode="xml-root-name"
+
+mode="dm"
+
+mode="seq"
+
+mode="text"
+MAPI = mone...@corona:39161
+QUERY = (1, 2.3, attribute attr { "val" }, 3E1, "string",
doc("nodekinds.xml")/descendant-or-self::node())
+ERROR = !ERROR: xquery_print_result_loop: operation failed.
+
+mode="text" (w/o top-level attribute)
+
+mode="" (default)
+
+# 19:59:00 >
+# 19:59:00 > Done.
+# 19:59:00 >
+
diff -r 0d31e2ec9d1d -r 8cba17ea123b
pathfinder/runtime/Tests/serialization.stable.out.NoAlgebra
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pathfinder/runtime/Tests/serialization.stable.out.NoAlgebra Fri Jul
30 10:18:15 2010 +0200
@@ -0,0 +1,147 @@
+stdout of test 'serialization` in directory 'runtime` itself:
+
+
+# 13:48:28 >
+# 13:48:28 > Mtimeout -timeout 60 Mserver
"--config=/local_tmp/MonetDB/Linux/etc/MonetDB.conf" --debug=10 --set
"monet_mod_path=/local_tmp/pathfinder/Linux/lib/MonetDB:/local_tmp/MonetDB/Linux/lib/MonetDB"
--set "gdk_dbfarm=/local_tmp/MonetDB/Linux/var/MonetDB/dbfarm" --set
"sql_logdir=/local_tmp/MonetDB/Linux/var/MonetDB/log" --set mapi_port=30625
--set monet_prompt= --trace --dbname=mTests_runtime < serialization.milS
+# 13:48:28 >
+
+# Monet Database Server V4.11.3
+# Copyright (c) 1993-2006, CWI. All rights reserved.
+# Compiled for i686-suse-linux/32bit with 32bit OIDs; dynamically linked.
+# Visit http://monetdb.cwi.nl/ for further information.
+module("pathfinder");
+
+# query for all output modes (contains all different kinds)
+var query := "(1, 2.3, attribute attr { \"val\" }, 3E1, \"string\",
doc(\"nodekinds.xml\")/descendant-or-self::node())";
+var query_no_attr := "(1, 2.3, 3E1, \"string\",
doc(\"nodekinds.xml\")/descendant-or-self::node())";
+
+# current different XML modes
+#
+xquery("xml" ,query , 0).printf();
+<?xml version="1.0" encoding="utf-8"?>
+<XQueryResult attr="val">1 2.300000 30.000000 string<elem
attr="val">text<!--comment--><?pi_tgt pi_data?></elem><elem
attr="val">text<!--comment--><?pi_tgt
pi_data?></elem>text<!--comment--><?pi_tgt pi_data?></XQueryResult>
+
+xquery("xml-typed" ,query , 0).printf();
+<?xml version="1.0" encoding="utf-8"?>
+<result:sequence xmlns:result="http://monetdb.cwi.nl/XQuery/results"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><result:atomic-value
xsi:type="xs:integer">1</result:atomic-value><result:atomic-value
xsi:type="xs:decimal">2.300000</result:atomic-value><result:attribute
attr="val"/><result:atomic-value
xsi:type="xs:double">30.000000</result:atomic-value><result:atomic-value
xsi:type="xs:string">string</result:atomic-value><result:document><elem
attr="val">text<!--comment--><?pi_tgt
pi_data?></elem></result:document><result:element><elem
attr="val">text<!--comment--><?pi_tgt
pi_data?></elem></result:element><result:text>text</result:text><result:comment><!--comment--></result:comment><result:processing-instruction><?pi_tgt
pi_data?></result:processing-instruction></result:sequence>
+
+# ... and their corresponding mapi variants
+xquery("mapi-xml" ,query , 0).printf();
+=<?xml version="1.0" encoding="utf-8"?>
+=<XQueryResult attr="val">1 2.300000 30.000000 string<elem
attr="val">text<!--comment--><?pi_tgt pi_data?></elem><elem
attr="val">text<!--comment--><?pi_tgt
pi_data?></elem>text<!--comment--><?pi_tgt pi_data?></XQueryResult>
+
+xquery("mapi-xml-typed" ,query , 0).printf();
+=<?xml version="1.0" encoding="utf-8"?>
+=<result:sequence xmlns:result="http://monetdb.cwi.nl/XQuery/results"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><result:atomic-value
xsi:type="xs:integer">1</result:atomic-value><result:atomic-value
xsi:type="xs:decimal">2.300000</result:atomic-value><result:attribute
attr="val"/><result:atomic-value
xsi:type="xs:double">30.000000</result:atomic-value><result:atomic-value
xsi:type="xs:string">string</result:atomic-value><result:document><elem
attr="val">text<!--comment--><?pi_tgt
pi_data?></elem></result:document><result:element><elem
attr="val">text<!--comment--><?pi_tgt
pi_data?></elem></result:element><result:text>text</result:text><result:comment><!--comment--></result:comment><result:processing-instruction><?pi_tgt
pi_data?></result:processing-instruction></result:sequence>
+
+
+# additional XML mode arguments:
+#
+xquery("xml-noheader" ,query , 0).printf();
+<XQueryResult attr="val">1 2.300000 30.000000 string<elem
attr="val">text<!--comment--><?pi_tgt pi_data?></elem><elem
attr="val">text<!--comment--><?pi_tgt
pi_data?></elem>text<!--comment--><?pi_tgt pi_data?></XQueryResult>
+
+# does not work for xml-typed mode
+xquery("xml-noroot" ,query , 0).printf();
+<?xml version="1.0" encoding="utf-8"?>
+1 2.300000 30.000000 string<elem attr="val">text<!--comment--><?pi_tgt
pi_data?></elem><elem attr="val">text<!--comment--><?pi_tgt
pi_data?></elem>text<!--comment--><?pi_tgt pi_data?>
+
+# does not work for xml-typed mode
+xquery("xml-root-name" ,query , 0).printf();
+<?xml version="1.0" encoding="utf-8"?>
+<name attr="val">1 2.300000 30.000000 string<elem
attr="val">text<!--comment--><?pi_tgt pi_data?></elem><elem
attr="val">text<!--comment--><?pi_tgt
pi_data?></elem>text<!--comment--><?pi_tgt pi_data?></name>
+
+
+# data model modes:
+#
+xquery("dm" ,query , 0).printf();
+1,
+2.300000,
+attribute attr { "val" },
+30.000000,
+"string",
+<?xml version="1.0" encoding="utf-8"?>
+<elem attr="val">text<!--comment--><?pi_tgt pi_data?></elem>
+,
+<elem attr="val">text<!--comment--><?pi_tgt pi_data?></elem>,
+text {"text"},
+<!--comment-->,
+<?pi_tgt pi_data?>
+
+xquery("mapi-dm" ,query , 0).printf();
+=1,
+=2.300000,
+=attribute attr { "val" },
+=30.000000,
+="string",
+=<?xml version="1.0" encoding="utf-8"?>
+=<elem attr="val">text<!--comment--><?pi_tgt pi_data?></elem>
+=,
+=<elem attr="val">text<!--comment--><?pi_tgt pi_data?></elem>,
+=text {"text"},
+=<!--comment-->,
+=<?pi_tgt pi_data?>
+
+# data model in tabular representation
+#
+printf("%s",xquery("seq" ,query , 0));
+&1 0 10 1 10
+% xquery.result # table_name
+% xml # name
+% varchar # type
+% 60 # length
+[ "1" ]
+[ "2.300000" ]
+[ "attribute attr { "val" }" ]
+[ "30.000000" ]
+[ "\"string\"" ]
+[ "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<elem
attr=\"val\">text<!--comment--><?pi_tgt pi_data?></elem>\n" ]
+[ "<elem attr=\"val\">text<!--comment--><?pi_tgt pi_data?></elem>" ]
+[ "text {\"text\"}" ]
+[ "<!--comment-->" ]
+[ "<?pi_tgt pi_data?>" ]
+
+xquery("seq" ,query , 0).print();
+[ "&1 0 10 1 10\n% xquery.result\t# table_name\n% xml\t# name\n% varchar\t#
type\n% 60\t# length\n[ \"1\"\t]\n[ \"2.300000\"\t]\n[ \"attribute attr {
\"val\" }\"\t]\n[ \"30.000000\"\t]\n[ \"\\\"string\\\"\"\t]\n[ \"<?xml
version=\\\"1.0\\\" encoding=\\\"utf-8\\\"?>\\n<elem
attr=\\\"val\\\">text<!--comment--><?pi_tgt pi_data?></elem>\\n\"\t]\n[ \"<elem
attr=\\\"val\\\">text<!--comment--><?pi_tgt pi_data?></elem>\"\t]\n[ \"text
{\\\"text\\\"}\"\t]\n[ \"<!--comment-->\"\t]\n[ \"<?pi_tgt pi_data?>\"\t]\n" ]
+
+
+# text mode w/ top-level attribute
+#
+xquery("text" ,query , 0).printf();
+!ERROR: 12.300000!ERROR: serialize_dflt.mx: unable to print top level
attribute nodes in text mode
+!ERROR: xquery_print_result_loop: operation failed.
+!ERROR: interpret: no matching MIL operator to 'printf(void)'.
+!MAYBE YOU MEAN:
+! printf(str, ..any..) : void
+
+xquery("mapi-text" ,query , 0).printf();
+!ERROR: =12.300000!ERROR: serialize_dflt.mx: unable to print top level
attribute nodes in text mode
+!ERROR: xquery_print_result_loop: operation failed.
+!ERROR: interpret: no matching MIL operator to 'printf(void)'.
+!MAYBE YOU MEAN:
+! printf(str, ..any..) : void
+
+# text mode w/o top-level attribute
+#
+xquery("text" ,query_no_attr , 0).printf();
+12.30000030.000000string<elem attr="val">text<!--comment--><?pi_tgt
pi_data?></elem><elem attr="val">text<!--comment--><?pi_tgt
pi_data?></elem>text<!--comment--><?pi_tgt pi_data?>
+
+xquery("mapi-text" ,query_no_attr , 0).printf();
+=12.30000030.000000string<elem attr="val">text<!--comment--><?pi_tgt
pi_data?></elem><elem attr="val">text<!--comment--><?pi_tgt
pi_data?></elem>text<!--comment--><?pi_tgt pi_data?>
+
+
+# default mode is xml mode (it also works with mapi
+# -- all other mode arguments are ignored)
+#
+xquery("" ,query , 0).printf();
+<?xml version="1.0" encoding="utf-8"?>
+<XQueryResult attr="val">1 2.300000 30.000000 string<elem
attr="val">text<!--comment--><?pi_tgt pi_data?></elem><elem
attr="val">text<!--comment--><?pi_tgt
pi_data?></elem>text<!--comment--><?pi_tgt pi_data?></XQueryResult>
+
+xquery("mapi" ,query , 0).printf();
+=<?xml version="1.0" encoding="utf-8"?>
+=<XQueryResult attr="val">1 2.300000 30.000000 string<elem
attr="val">text<!--comment--><?pi_tgt pi_data?></elem><elem
attr="val">text<!--comment--><?pi_tgt
pi_data?></elem>text<!--comment--><?pi_tgt pi_data?></XQueryResult>
+quit();
+
+# 13:48:29 >
+# 13:48:29 > Done.
+# 13:48:29 >
+
diff -r 0d31e2ec9d1d -r 8cba17ea123b
pathfinder/tests/BugTracker/Tests/Zombie_document.SF-2009556.stable.err.NoAlgebra
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++
b/pathfinder/tests/BugTracker/Tests/Zombie_document.SF-2009556.stable.err.NoAlgebra
Fri Jul 30 10:18:15 2010 +0200
@@ -0,0 +1,29 @@
+stderr of test 'Zombie_document.SF-2009556` in directory 'tests/BugTracker`
itself:
+
+
+# 12:37:00 >
+# 12:37:00 > Mserver
"--config=/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/etc/MonetDB.conf"
--debug=10 --set
"monet_mod_path=/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB4:/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB4/lib:/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB4/bin"
--set
"gdk_dbfarm=/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/var/MonetDB4/dbfarm"
--set
"sql_logdir=/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/var/MonetDB4/sql_logs"
--set "xquery_logdir=/ufs/manegold/_/scratch0/Monet/Testi
ng/Stable/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/var/MonetDB4/xquery_logs"
--set mapi_open=true --set xrpc_open=true --set mapi_port=31848 --set
xrpc_port=46436 --set monet_prompt= --trace "--dbname=mTests_tests_BugTracker"
"--dbinit= module(pathfinder);" Zombie_document.SF-2009556.prologue ; echo ;
echo Over..
+# 12:37:00 >
+
+
+# 12:37:01 >
+# 12:37:01 > mclient -lxquery -fxml -umonetdb -Pmonetdb --host=rig
--port=31848 Zombie_document.SF-2009556.xq
+# 12:37:01 >
+
+MAPI = mone...@tscan:32256
+QUERY = pf:collection("MyCol")
+ERROR = !ERROR: err:FODC0004: collection 'MyCol' unknown (1 missing in total)
+MAPI = mone...@tscan:32256
+QUERY = pf:collection("MyCol")
+ERROR = !ERROR: xquery_print_result_loop: operation failed.
+MAPI = mone...@tscan:32256
+QUERY = pf:collection("MyCol")
+ERROR = !ERROR: xquery_print_result_loop: operation failed.
+MAPI = mone...@tscan:32256
+QUERY = pf:collection("MyCol")
+ERROR = !ERROR: err:FODC0004: collection 'MyCol' unknown (1 missing in total)
+
+# 12:37:01 >
+# 12:37:01 > Done.
+# 12:37:01 >
+
diff -r 0d31e2ec9d1d -r 8cba17ea123b
pathfinder/tests/BugTracker/Tests/collection_management.SF-1726599.stable.err.NoAlgebra
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++
b/pathfinder/tests/BugTracker/Tests/collection_management.SF-1726599.stable.err.NoAlgebra
Fri Jul 30 10:18:15 2010 +0200
@@ -0,0 +1,42 @@
+stderr of test 'collection_management.SF-1726599` in directory
'tests/BugTracker` itself:
+
+
+# 10:21:41 >
+# 10:21:41 > Mserver "--config=/home/users/boncz/monet/etc/MonetDB.conf"
--debug=10 --set gdk_nr_threads=1 --set
"monet_mod_path=/home/users/boncz/monet/lib/MonetDB4:/home/users/boncz/monet/lib/MonetDB4/lib:/home/users/boncz/monet/lib/MonetDB4/bin"
--set "gdk_dbfarm=/home/users/boncz/monet/var/MonetDB4/dbfarm" --set
mapi_open=true --set xrpc_open=true --set mapi_port=36105 --set xrpc_port=49287
--set monet_prompt= --trace "--dbname=mTests_tests_BugTracker" "--dbinit=
module(pathfinder);" ; echo ; echo Over..
+# 10:21:41 >
+
+
+# 10:22:13 >
+# 10:22:13 > mclient -lxquery -fxml -umonetdb -Pmonetdb --host=tscan
--port=36105 collection_management.SF-1726599_s00.xq
+# 10:22:13 >
+
+MAPI = mone...@tscan:36105
+QUERY = pf:collection("collection_management.SF-1726599.xml")
+ERROR = !ERROR: xquery_print_result_loop: operation failed.
+
+# 10:22:15 >
+# 10:22:15 > mclient -lxquery -fxml -umonetdb -Pmonetdb --host=tscan
--port=36105 collection_management.SF-1726599_s01.xq
+# 10:22:15 >
+
+MAPI = mone...@tscan:36105
+QUERY = pf:collection("collection_management.SF-1726599.xml")
+ERROR = !ERROR: err:FODC0004: collection
'collection_management.SF-1726599.xml' unknown (1 missing in total)
+MAPI = mone...@tscan:36105
+QUERY = doc("collection_management.SF-1726599.xml")
+ERROR = !ERROR: err:FODC0002, Error retrieving resource (no such document
"collection_management.SF-1726599.xml").
+MAPI = mone...@tscan:36105
+QUERY = doc("collection_management.SF-1726599.xml")/aap
+ERROR = !ERROR: err:FODC0002, Error retrieving resource (no such document
"collection_management.SF-1726599.xml").
+
+# 10:22:15 >
+# 10:22:15 > mclient -lxquery -fxml -umonetdb -Pmonetdb --host=tscan
--port=36105 collection_management.SF-1726599_s02.xq
+# 10:22:15 >
+
+MAPI = mone...@tscan:36105
+QUERY = pf:collection("collection_management.SF-1726599.xml")
+ERROR = !ERROR: xquery_print_result_loop: operation failed.
+
+# 10:22:26 >
+# 10:22:26 > Done.
+# 10:22:26 >
+
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list