Update of /cvsroot/monetdb/sql/src/benchmarks/tpch/Tests
In directory 
23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv1170/src/benchmarks/tpch/Tests

Modified Files:
        01-22.stable.out 07.stable.out 13.stable.out 16.stable.out 
        19.stable.out 
Log Message:
be more safe with unions and outer joins (ie copy also the first part 
of the unions and joins, before any append)


U 01-22.stable.out
Index: 01-22.stable.out
===================================================================
RCS file: /cvsroot/monetdb/sql/src/benchmarks/tpch/Tests/01-22.stable.out,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- 01-22.stable.out    28 Dec 2008 19:05:11 -0000      1.17
+++ 01-22.stable.out    30 Dec 2008 19:19:05 -0000      1.18
@@ -142,7 +142,7 @@
 # 11:48:05 >  Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb 
--host=localhost --port=35781
 # 11:48:05 >  
 
-% sys.shipping,        sys.shipping,   sys.shipping,   sys.shipping # 
table_name
+% .shipping,   .shipping,      .shipping,      .shipping # table_name
 % supp_nation, cust_nation,    l_year, revenue # name
 % varchar,     varchar,        int,    decimal # type
 % 7,   7,      4,      21 # length
@@ -787,7 +787,7 @@
 # 11:48:06 >  Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb 
--host=localhost --port=35781
 # 11:48:06 >  
 
-% sys.c_orders,        sys.c_orders # table_name
+% .c_orders,   .c_orders # table_name
 % c_count,     custdist # name
 % wrd, wrd # type
 % 2,   3 # length
@@ -863,7 +863,7 @@
 # 11:48:06 >  Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb 
--host=localhost --port=35781
 # 11:48:06 >  
 
-% sys.part,    sys.part,       sys.part,       sys.partsupp # table_name
+% .part,       .part,  .part,  .partsupp # table_name
 % p_brand,     p_type, p_size, supplier_cnt # name
 % varchar,     varchar,        int,    wrd # type
 % 8,   25,     2,      1 # length
@@ -1204,7 +1204,7 @@
 # 11:48:06 >  Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb 
--host=localhost --port=35781
 # 11:48:06 >  
 
-% sys. # table_name
+% . # table_name
 % revenue # name
 % decimal # type
 % 21 # length

U 16.stable.out
Index: 16.stable.out
===================================================================
RCS file: /cvsroot/monetdb/sql/src/benchmarks/tpch/Tests/16.stable.out,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- 16.stable.out       7 Sep 2008 14:27:54 -0000       1.9
+++ 16.stable.out       30 Dec 2008 19:19:06 -0000      1.10
@@ -24,7 +24,7 @@
 # 12:34:53 >  Mtimeout -timeout 60 MapiClient -lsql -u monetdb -P monetdb 
--host=localhost --port=45579  < 16.sql
 # 12:34:53 >  
 
-% sys.part,    sys.part,       sys.part,       sys.partsupp # table_name
+% .part,       .part,  .part,  .partsupp # table_name
 % p_brand,     p_type, p_size, supplier_cnt # name
 % varchar,     varchar,        int,    wrd # type
 % 8,   25,     2,      1 # length

U 13.stable.out
Index: 13.stable.out
===================================================================
RCS file: /cvsroot/monetdb/sql/src/benchmarks/tpch/Tests/13.stable.out,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- 13.stable.out       7 Sep 2008 14:27:53 -0000       1.11
+++ 13.stable.out       30 Dec 2008 19:19:06 -0000      1.12
@@ -24,7 +24,7 @@
 # 11:48:01 >  Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb 
--host=localhost --port=35781  < 13.sql
 # 11:48:01 >  
 
-% sys.c_orders,        sys.c_orders # table_name
+% .c_orders,   .c_orders # table_name
 % c_count,     custdist # name
 % wrd, wrd # type
 % 2,   3 # length

U 07.stable.out
Index: 07.stable.out
===================================================================
RCS file: /cvsroot/monetdb/sql/src/benchmarks/tpch/Tests/07.stable.out,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- 07.stable.out       24 Oct 2006 16:02:32 -0000      1.9
+++ 07.stable.out       30 Dec 2008 19:19:05 -0000      1.10
@@ -1,19 +1,23 @@
 stdout of test '07` in directory 'src/benchmarks/tpch` itself:
 
 
-# 12:34:36 >  
-# 12:34:36 >  Mtimeout -timeout 180 Mserver 
"--config=/ufs/fabian/scratch/monetdb/current/program-x86_64/etc/MonetDB.conf" 
--debug=10 --set 
"monet_mod_path=/ufs/fabian/scratch/monetdb/current/program-x86_64/lib/MonetDB:/ufs/fabian/scratch/monetdb/current/program-x86_64/lib/bin"
 --set 
"gdk_dbfarm=/ufs/fabian/scratch/monetdb/current/program-x86_64/var/MonetDB/dbfarm"
 --set 
"sql_logdir=/ufs/fabian/scratch/monetdb/current/program-x86_64/var/MonetDB/log" 
--set mapi_port=38933 --set sql_port=45579 --set xquery_port=52530 --set 
monet_prompt= --trace "--dbname=mTests_src_benchmarks_tpch" 
--dbinit="module(sql_server); sql_server_start();" ; echo ; echo Over..
-# 12:34:36 >  
-
-# Monet Database Server V4.9.3
-# Copyright (c) 1993-2005, CWI. All rights reserved.
-# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs; dynamically 
linked.
-# Visit http://monetdb.cwi.nl/ for further information.
+# 19:37:38 >  
+# 19:37:38 >   mserver5 
"--config=/ufs/niels/scratch/monetdb/Linux-x86_64/etc/monetdb5.conf" --debug=10 
--set gdk_nr_threads=4 --set 
"monet_mod_path=/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5/bin"
 --set "gdk_dbfarm=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB5/dbfarm" 
--set 
"sql_logdir=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB5/sql_logs"  
--set mapi_open=true --set xrpc_open=true --set mapi_port=31946 --set 
xrpc_port=44499 --set monet_prompt= --trace  
"--dbname=mTests_src_benchmarks_tpch" --set mal_listing=0 "--dbinit= include 
sql;" ; echo ; echo Over..
+# 19:37:38 >  
 
-printf("\nReady.\n");
+# MonetDB server v5.9.0, based on kernel v1.27.0
+# Serving database 'mTests_src_benchmarks_tpch', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically 
linked
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008- 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:31946/
+# MonetDB/SQL module v2.27.0 loaded
 
 Ready.
-quit();
+#function user.main():void;
+#    clients.quit();
+#end main;
 
 Over..
 
@@ -21,7 +25,7 @@
 # 11:47:57 >  Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb 
--host=localhost --port=35781  < 07.sql
 # 11:47:57 >  
 
-% sys.shipping,        sys.shipping,   sys.shipping,   sys.shipping # 
table_name
+% .shipping,   .shipping,      .shipping,      .shipping # table_name
 % supp_nation, cust_nation,    l_year, revenue # name
 % varchar,     varchar,        int,    decimal # type
 % 7,   7,      4,      21 # length

U 19.stable.out
Index: 19.stable.out
===================================================================
RCS file: /cvsroot/monetdb/sql/src/benchmarks/tpch/Tests/19.stable.out,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- 19.stable.out       24 Oct 2006 16:02:37 -0000      1.9
+++ 19.stable.out       30 Dec 2008 19:19:06 -0000      1.10
@@ -1,19 +1,23 @@
 stdout of test '19` in directory 'src/benchmarks/tpch` itself:
 
 
-# 12:34:58 >  
-# 12:34:58 >  Mtimeout -timeout 180 Mserver 
"--config=/ufs/fabian/scratch/monetdb/current/program-x86_64/etc/MonetDB.conf" 
--debug=10 --set 
"monet_mod_path=/ufs/fabian/scratch/monetdb/current/program-x86_64/lib/MonetDB:/ufs/fabian/scratch/monetdb/current/program-x86_64/lib/bin"
 --set 
"gdk_dbfarm=/ufs/fabian/scratch/monetdb/current/program-x86_64/var/MonetDB/dbfarm"
 --set 
"sql_logdir=/ufs/fabian/scratch/monetdb/current/program-x86_64/var/MonetDB/log" 
--set mapi_port=38933 --set sql_port=45579 --set xquery_port=52530 --set 
monet_prompt= --trace "--dbname=mTests_src_benchmarks_tpch" 
--dbinit="module(sql_server); sql_server_start();" ; echo ; echo Over..
-# 12:34:58 >  
-
-# Monet Database Server V4.9.3
-# Copyright (c) 1993-2005, CWI. All rights reserved.
-# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs; dynamically 
linked.
-# Visit http://monetdb.cwi.nl/ for further information.
+# 19:37:40 >  
+# 19:37:40 >   mserver5 
"--config=/ufs/niels/scratch/monetdb/Linux-x86_64/etc/monetdb5.conf" --debug=10 
--set gdk_nr_threads=4 --set 
"monet_mod_path=/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5/bin"
 --set "gdk_dbfarm=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB5/dbfarm" 
--set 
"sql_logdir=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB5/sql_logs"  
--set mapi_open=true --set xrpc_open=true --set mapi_port=31946 --set 
xrpc_port=44499 --set monet_prompt= --trace  
"--dbname=mTests_src_benchmarks_tpch" --set mal_listing=0 "--dbinit= include 
sql;" ; echo ; echo Over..
+# 19:37:40 >  
 
-printf("\nReady.\n");
+# MonetDB server v5.9.0, based on kernel v1.27.0
+# Serving database 'mTests_src_benchmarks_tpch', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically 
linked
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008- 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:31946/
+# MonetDB/SQL module v2.27.0 loaded
 
 Ready.
-quit();
+#function user.main():void;
+#    clients.quit();
+#end main;
 
 Over..
 
@@ -21,7 +25,7 @@
 # 11:48:04 >  Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb 
--host=localhost --port=35781  < 19.sql
 # 11:48:04 >  
 
-% sys. # table_name
+% . # table_name
 % revenue # name
 % decimal # type
 % 21 # length


------------------------------------------------------------------------------
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins

Reply via email to