Changeset: 0bed78c83f84 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0bed78c83f84
Modified Files:
        
Branch: default
Log Message:

merged from Oct2010


diffs (239 lines):

diff -r ebfb42ba06e3 -r 0bed78c83f84 sql/src/test/BugTracker-2010/Tests/All
--- a/sql/src/test/BugTracker-2010/Tests/All    Thu Oct 28 11:26:49 2010 +0200
+++ b/sql/src/test/BugTracker-2010/Tests/All    Thu Oct 28 14:34:50 2010 +0200
@@ -68,3 +68,4 @@
 substring_display_width.Bug-2683
 new-readonly-db.Bug-2695
 Mbedded-crash.Bug-2701
+distinct-order-by-limit.Bug-2691
diff -r ebfb42ba06e3 -r 0bed78c83f84 
sql/src/test/BugTracker-2010/Tests/distinct-order-by-limit.Bug-2691.sql
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/src/test/BugTracker-2010/Tests/distinct-order-by-limit.Bug-2691.sql   
Thu Oct 28 14:34:50 2010 +0200
@@ -0,0 +1,19 @@
+start transaction;
+
+create table lim_prob (dir varchar(12), test varchar(12));
+insert into lim_prob values ('mydir1/', 'mytest1'), ('mydir2/', 'mytest3'), 
('mydir1/', 'mytest2'), ('mydir1/', 'mytest4'), ('mydir2/', 'mytest1'), 
('mydir2/', 'mytest2'), ('mydir1/', 'mytest3');
+
+select concat("dir", "test") as a from lim_prob order by a limit 10;
+
+select distinct concat("dir", "test") as a from lim_prob order by a;
+
+select concat("dir", "test") as a from lim_prob order by a desc limit 10;
+
+select distinct concat("dir", "test") as a from lim_prob order by a desc;
+
+select distinct concat("dir", "test") as a from lim_prob order by a desc limit 
10;
+
+-- wrong result in bug
+select distinct concat("dir", "test") as a from lim_prob order by a limit 10;
+
+rollback;
diff -r ebfb42ba06e3 -r 0bed78c83f84 
sql/src/test/BugTracker-2010/Tests/distinct-order-by-limit.Bug-2691.stable.err
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ 
b/sql/src/test/BugTracker-2010/Tests/distinct-order-by-limit.Bug-2691.stable.err
    Thu Oct 28 14:34:50 2010 +0200
@@ -0,0 +1,79 @@
+stderr of test 'distinct-order-by-limit.Bug-2691` in directory 
'src/test/BugTracker-2010` itself:
+
+
+# 14:06:04 >  
+# 14:06:04 >   mserver5 
"--config=/ufs/fabian/scratch/monetdb/Oct2010/program-x86_64/etc/monetdb5.conf" 
--debug=10 --set gdk_nr_threads=0 --set 
"monet_mod_path=/ufs/fabian/scratch/monetdb/Oct2010/program-x86_64/lib/MonetDB5:/ufs/fabian/scratch/monetdb/Oct2010/program-x86_64/lib/MonetDB5/lib:/ufs/fabian/scratch/monetdb/Oct2010/program-x86_64/lib/MonetDB5/bin"
 --set 
"gdk_dbfarm=/net/volund.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-Oct2010-volund.ins.cwi.nl/sql/dbfarm"
  --set mapi_open=true --set xrpc_open=true --set mapi_port=34497 --set 
xrpc_port=44688 --set monet_prompt= --trace --forcemito --set mal_listing=2  
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo 
Over..
+# 14:06:04 >  
+
+# builtin opt  gdk_arch = 64bitx86_64-pc-linux-gnu
+# builtin opt  gdk_version = 1.40.0
+# builtin opt  prefix = /ufs/fabian/scratch/monetdb/Oct2010/program-x86_64
+# 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 = 
/ufs/fabian/scratch/monetdb/Oct2010/program-x86_64/lib/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  default_pipe = 
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# builtin opt  minimal_pipe = inline,remap,deadcode,multiplex,garbageCollector
+# builtin opt  sql_optimizer = default_pipe
+# builtin opt  sql_debug = 0
+# builtin opt  standoff_ns = 
+# builtin opt  standoff_start = start
+# builtin opt  standoff_end = end
+# config opt   prefix = /ufs/fabian/scratch/monetdb/Oct2010/program-x86_64
+# config opt   config = ${prefix}/etc/monetdb5.conf
+# config opt   prefix = /ufs/fabian/scratch/monetdb/Oct2010/program-x86_64
+# config opt   exec_prefix = ${prefix}
+# config opt   gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
+# config opt   monet_mod_path = 
/ufs/fabian/scratch/monetdb/Oct2010/program-x86_64/lib/MonetDB5:/ufs/fabian/scratch/monetdb/Oct2010/program-x86_64/lib/MonetDB5/lib:/ufs/fabian/scratch/monetdb/Oct2010/program-x86_64/lib/MonetDB5/bin
+# config opt   mero_pidfile = ${prefix}/var/run/MonetDB/merovingian.pid
+# config opt   mero_controlport = 50001
+# config opt   no_mitosis_pipe = 
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt   sequential_pipe = 
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,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,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,replication,multiplex,garbageCollector
+# config opt   derive_pipe = 
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,derivePath,joinPath,reorder,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/fabian/scratch/monetdb/Oct2010/program-x86_64/etc/monetdb5.conf
+# cmdline opt  gdk_nr_threads = 0
+# cmdline opt  monet_mod_path = 
/ufs/fabian/scratch/monetdb/Oct2010/program-x86_64/lib/MonetDB5:/ufs/fabian/scratch/monetdb/Oct2010/program-x86_64/lib/MonetDB5/lib:/ufs/fabian/scratch/monetdb/Oct2010/program-x86_64/lib/MonetDB5/bin
+# cmdline opt  gdk_dbfarm = 
/net/volund.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-Oct2010-volund.ins.cwi.nl/sql/dbfarm
+# cmdline opt  mapi_open = true
+# cmdline opt  xrpc_open = true
+# cmdline opt  mapi_port = 34497
+# cmdline opt  xrpc_port = 44688
+# 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/fabian/scratch/monetdb/Oct2010/program-x86_64/etc/monetdb5.conf)
+
+# 14:06:04 >  
+# 14:06:04 >  mclient -lsql -ftest -i -e --host=volund --port=34497 
+# 14:06:04 >  
+
+
+# 14:06:05 >  
+# 14:06:05 >  Done.
+# 14:06:05 >  
+
diff -r ebfb42ba06e3 -r 0bed78c83f84 
sql/src/test/BugTracker-2010/Tests/distinct-order-by-limit.Bug-2691.stable.out
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ 
b/sql/src/test/BugTracker-2010/Tests/distinct-order-by-limit.Bug-2691.stable.out
    Thu Oct 28 14:34:50 2010 +0200
@@ -0,0 +1,109 @@
+stdout of test 'distinct-order-by-limit.Bug-2691` in directory 
'src/test/BugTracker-2010` itself:
+
+
+# 14:06:04 >  
+# 14:06:04 >   mserver5 
"--config=/ufs/fabian/scratch/monetdb/Oct2010/program-x86_64/etc/monetdb5.conf" 
--debug=10 --set gdk_nr_threads=0 --set 
"monet_mod_path=/ufs/fabian/scratch/monetdb/Oct2010/program-x86_64/lib/MonetDB5:/ufs/fabian/scratch/monetdb/Oct2010/program-x86_64/lib/MonetDB5/lib:/ufs/fabian/scratch/monetdb/Oct2010/program-x86_64/lib/MonetDB5/bin"
 --set 
"gdk_dbfarm=/net/volund.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-Oct2010-volund.ins.cwi.nl/sql/dbfarm"
  --set mapi_open=true --set xrpc_open=true --set mapi_port=34497 --set 
xrpc_port=44688 --set monet_prompt= --trace --forcemito --set mal_listing=2  
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo 
Over..
+# 14:06:04 >  
+
+# MonetDB server v5.22.0, based on kernel v1.40.0
+# Release Oct2010-hg
+# Serving database 'mTests_src_test_BugTracker-2010', using 4 threads
+# Compiled for x86_64-pc-linux-gnu/64bit with 64bit OIDs dynamically linked
+# Found 7.750 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2010 MonetDB B.V., all rights reserved
+# Visit http://monetdb.cwi.nl/ for further information
+# Listening for connection requests on mapi:monetdb://volund.ins.cwi.nl:34497/
+# MonetDB/SQL module v2.40.0 loaded
+
+Ready.
+# SQL catalog created, loading sql scripts once
+
+Over..
+
+# 14:06:04 >  
+# 14:06:04 >  mclient -lsql -ftest -i -e --host=volund --port=34497 
+# 14:06:04 >  
+
+#start transaction;
+#create table lim_prob (dir varchar(12), test varchar(12));
+#insert into lim_prob values ('mydir1/', 'mytest1'), ('mydir2/', 'mytest3'), 
('mydir1/', 'mytest2'), ('mydir1/', 'mytest4'), ('mydir2/', 'mytest1'), 
('mydir2/', 'mytest2'), ('mydir1/', 'mytest3');
+[ 7    ]
+#select concat("dir", "test") as a from lim_prob order by a limit 10;
+% sys. # table_name
+% a # name
+% varchar # type
+% 14 # length
+[ "mydir1/mytest1"     ]
+[ "mydir1/mytest2"     ]
+[ "mydir1/mytest3"     ]
+[ "mydir1/mytest4"     ]
+[ "mydir2/mytest1"     ]
+[ "mydir2/mytest2"     ]
+[ "mydir2/mytest3"     ]
+#select distinct concat("dir", "test") as a from lim_prob order by a;
+% sys. # table_name
+% a # name
+% varchar # type
+% 14 # length
+[ "mydir1/mytest1"     ]
+[ "mydir1/mytest2"     ]
+[ "mydir1/mytest3"     ]
+[ "mydir1/mytest4"     ]
+[ "mydir2/mytest1"     ]
+[ "mydir2/mytest2"     ]
+[ "mydir2/mytest3"     ]
+#select concat("dir", "test") as a from lim_prob order by a desc limit 10;
+% sys. # table_name
+% a # name
+% varchar # type
+% 14 # length
+[ "mydir2/mytest3"     ]
+[ "mydir2/mytest2"     ]
+[ "mydir2/mytest1"     ]
+[ "mydir1/mytest4"     ]
+[ "mydir1/mytest3"     ]
+[ "mydir1/mytest2"     ]
+[ "mydir1/mytest1"     ]
+#select distinct concat("dir", "test") as a from lim_prob order by a desc;
+% sys. # table_name
+% a # name
+% varchar # type
+% 14 # length
+[ "mydir2/mytest3"     ]
+[ "mydir2/mytest2"     ]
+[ "mydir2/mytest1"     ]
+[ "mydir1/mytest4"     ]
+[ "mydir1/mytest3"     ]
+[ "mydir1/mytest2"     ]
+[ "mydir1/mytest1"     ]
+#select distinct concat("dir", "test") as a from lim_prob order by a desc 
limit 10;
+% sys. # table_name
+% a # name
+% varchar # type
+% 14 # length
+[ "mydir2/mytest3"     ]
+[ "mydir2/mytest2"     ]
+[ "mydir2/mytest1"     ]
+[ "mydir1/mytest4"     ]
+[ "mydir1/mytest3"     ]
+[ "mydir1/mytest2"     ]
+[ "mydir1/mytest1"     ]
+#select distinct concat("dir", "test") as a from lim_prob order by a limit 10;
+% sys. # table_name
+% a # name
+% varchar # type
+% 14 # length
+[ "mydir1/mytest1"     ]
+[ "mydir1/mytest2"     ]
+[ "mydir1/mytest3"     ]
+[ "mydir1/mytest4"     ]
+[ "mydir2/mytest1"     ]
+[ "mydir2/mytest2"     ]
+[ "mydir2/mytest3"     ]
+#rollback;
+
+# 14:06:05 >  
+# 14:06:05 >  Done.
+# 14:06:05 >  
+
diff -r ebfb42ba06e3 -r 0bed78c83f84 
sql/src/test/bugs/except-union-intersect-bug-sf-1146079.sql
--- a/sql/src/test/bugs/except-union-intersect-bug-sf-1146079.sql       Thu Oct 
28 11:26:49 2010 +0200
+++ b/sql/src/test/bugs/except-union-intersect-bug-sf-1146079.sql       Thu Oct 
28 14:34:50 2010 +0200
@@ -86,7 +86,7 @@
 SELECT class FROM a EXCEPT ALL SELECT class FROM b ORDER BY class; -- a minus 
the elements from b that are in a (if count(x) in a > count(x) in b, x will 
appear in output)
 SELECT * FROM a UNION ALL SELECT * FROM b ORDER BY class, property; -- a + b
 SELECT * FROM a INTERSECT ALL SELECT * FROM b ORDER BY class, property; -- 
first 50% of a
-SELECT class FROM a INTERSECT ALL SELECT class FROM b ORDER BY class, 
property; -- only those that are both in a and b (min(count(a, x), count(b, x)) 
!!!
+SELECT class FROM a INTERSECT ALL SELECT class FROM b ORDER BY class; -- only 
those that are both in a and b (min(count(a, x), count(b, x)) !!!
 ROLLBACK;
 
 -- cleanup! (also should cascade into dropping the index)
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to