Changeset: e49ebce55b48 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e49ebce55b48
Modified Files:
sql/ChangeLog.Jun2010
sql/src/server/rel_bin.mx
sql/src/server/rel_optimizer.mx
sql/src/test/BugTracker-2010/Tests/All
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (truncated from 529 to 300 lines):
diff -r a087e83ab53e -r e49ebce55b48 buildtools/Mx/Code.c
--- a/buildtools/Mx/Code.c Wed Jul 07 08:58:58 2010 +0200
+++ b/buildtools/Mx/Code.c Wed Jul 07 10:27:21 2010 +0200
@@ -41,7 +41,8 @@
char *s;
fname = d->d_cmd;
- for (s = fname; *s && !isspace((int) (*s)); s++) ;
+ for (s = fname; *s && !isspace((int) (*s)); s++)
+ ;
if (isspace((int) (*s)))
*s = 0;
if (s == fname) {
diff -r a087e83ab53e -r e49ebce55b48 buildtools/Mx/Def.c
--- a/buildtools/Mx/Def.c Wed Jul 07 08:58:58 2010 +0200
+++ b/buildtools/Mx/Def.c Wed Jul 07 10:27:21 2010 +0200
@@ -111,7 +111,8 @@
d = NwDef(Bfile, mod, sec, 0, mx_file);
d->d_cmd = name;
- while ((line = NextLine()) && *line != '@') ;
+ while ((line = NextLine()) && *line != '@')
+ ;
PrevLine();
while (!EofFile()) {
dir = DefDir();
diff -r a087e83ab53e -r e49ebce55b48 buildtools/Mx/Display.c
--- a/buildtools/Mx/Display.c Wed Jul 07 08:58:58 2010 +0200
+++ b/buildtools/Mx/Display.c Wed Jul 07 10:27:21 2010 +0200
@@ -144,7 +144,8 @@
/* find out the full name in 'full', the basename in 's', end in 't' */
strncpy(full, file, sizeof(full));
- for (s = full; s[1]; s++) ;
+ for (s = full; s[1]; s++)
+ ;
while (s >= full && *s != DIR_SEP
#ifdef WIN32
&& *s != '/'
diff -r a087e83ab53e -r e49ebce55b48 buildtools/Mx/Form.c
--- a/buildtools/Mx/Form.c Wed Jul 07 08:58:58 2010 +0200
+++ b/buildtools/Mx/Form.c Wed Jul 07 10:27:21 2010 +0200
@@ -52,7 +52,8 @@
char *getlogin();
char *dstbak = NULL;
- for (d = defs; d < defs + ndef && (d->d_dir != Bfile); dirbak =
d->d_dir, d++) ;
+ for (d = defs; d < defs + ndef && (d->d_dir != Bfile); dirbak =
d->d_dir, d++)
+ ;
for (; d < defs + ndef; dirbak = d->d_dir, d++) {
codeline = d->d_line;
again:switch (d->d_dir) {
diff -r a087e83ab53e -r e49ebce55b48 buildtools/Mx/Io.c
--- a/buildtools/Mx/Io.c Wed Jul 07 08:58:58 2010 +0200
+++ b/buildtools/Mx/Io.c Wed Jul 07 10:27:21 2010 +0200
@@ -410,14 +410,15 @@
char *
NextLine(void)
{
- mx_line++;
if (fullbuf) {
+ mx_line++;
fullbuf = 0;
return linebuf;
} else {
char *s, *t;
do {
+ mx_line++;
s = fgets(linebuf, MAXLINE, ifile);
} while (s == NULL && !EofFile());
diff -r a087e83ab53e -r e49ebce55b48 sql/ChangeLog.Jun2010
--- a/sql/ChangeLog.Jun2010 Wed Jul 07 08:58:58 2010 +0200
+++ b/sql/ChangeLog.Jun2010 Wed Jul 07 10:27:21 2010 +0200
@@ -1,3 +1,8 @@
# ChangeLog file for sql
# This file is updated with Maddlog
+* Wed Jul 7 2010 Niels Nes <[email protected]>
+- Fixed bug 2581. Completed the implementation of handling boolean types in
prepare statements.
+- Fix bug 2582. Statements with 'constant in ( )' are now handled properly.
+- Fixed bug 2583 + added test. The assert was incorrect.
+
diff -r a087e83ab53e -r e49ebce55b48 sql/src/server/rel_bin.mx
--- a/sql/src/server/rel_bin.mx Wed Jul 07 08:58:58 2010 +0200
+++ b/sql/src/server/rel_bin.mx Wed Jul 07 10:27:21 2010 +0200
@@ -182,9 +182,9 @@
are_equality_exps( list *exps )
{
if (list_length(exps) == 1) {
- sql_exp *e = exps->h->data, *re = e->r;
-
- if (e->type == e_cmp && e->flag == cmp_equal && re->card ==
CARD_ATOM)
+ sql_exp *e = exps->h->data, *le = e->l, *re = e->r;
+
+ if (e->type == e_cmp && e->flag == cmp_equal && le->card !=
CARD_ATOM && re->card == CARD_ATOM)
return 1;
if (e->type == e_cmp && e->flag == cmp_or)
return (are_equality_exps(e->l) &&
diff -r a087e83ab53e -r e49ebce55b48 sql/src/server/rel_optimizer.mx
--- a/sql/src/server/rel_optimizer.mx Wed Jul 07 08:58:58 2010 +0200
+++ b/sql/src/server/rel_optimizer.mx Wed Jul 07 10:27:21 2010 +0200
@@ -3315,7 +3315,6 @@
}
}
}
- assert(list_length(exps) == list_length(es));
/* fix the destroy function */
cols->destroy = NULL;
list_destroy(cols);
diff -r a087e83ab53e -r e49ebce55b48 sql/src/test/BugTracker-2010/Tests/All
--- a/sql/src/test/BugTracker-2010/Tests/All Wed Jul 07 08:58:58 2010 +0200
+++ b/sql/src/test/BugTracker-2010/Tests/All Wed Jul 07 10:27:21 2010 +0200
@@ -18,3 +18,6 @@
delete_insert.Bug-2529
decimal_div_whole_nrs.Bug-2579
SQLengine_error_on_join.Bug-2580
+keycheck_crash.Bug-2583
+in_query_with_constants_fails.Bug-2582
+prepare_on_boolean_bug.Bug-2581
diff -r a087e83ab53e -r e49ebce55b48
sql/src/test/BugTracker-2010/Tests/in_query_with_constants_fails.Bug-2582.sql
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++
b/sql/src/test/BugTracker-2010/Tests/in_query_with_constants_fails.Bug-2582.sql
Wed Jul 07 10:27:21 2010 +0200
@@ -0,0 +1,5 @@
+create table skycrash(id serial, boom boolean);
+create view skyview as select 1 as unknown, id from skycrash;
+select * from skyview where unknown in (1, 2, 3);
+drop view skyview;
+drop table skycrash;
diff -r a087e83ab53e -r e49ebce55b48
sql/src/test/BugTracker-2010/Tests/in_query_with_constants_fails.Bug-2582.stable.err
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++
b/sql/src/test/BugTracker-2010/Tests/in_query_with_constants_fails.Bug-2582.stable.err
Wed Jul 07 10:27:21 2010 +0200
@@ -0,0 +1,78 @@
+stderr of test 'in_query_with_constants_fails.Bug-2582` in directory
'src/test/BugTracker-2010` itself:
+
+
+# 09:27:06 >
+# 09:27:06 > 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=38169 --set
xrpc_port=44022 --set monet_prompt= --set mal_listing=2 --trace
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo
Over..
+# 09:27:06 >
+
+# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
+# builtin opt gdk_version = 1.38.0
+# builtin opt prefix = /ufs/niels/scratch/rc/Linux-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 = ${exec_prefix}/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 sql_debug = 0
+# builtin opt standoff_ns =
+# builtin opt standoff_start = start
+# builtin opt standoff_end = end
+# config opt prefix = /ufs/niels/scratch/rc/Linux-x86_64
+# config opt config = ${prefix}/etc/monetdb5.conf
+# config opt prefix = /ufs/niels/scratch/rc/Linux-x86_64
+# config opt exec_prefix = ${prefix}
+# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
+# config opt monet_mod_path =
${exec_prefix}/lib/MonetDB5:${exec_prefix}/lib/MonetDB5/lib:${exec_prefix}/lib/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 mapreduce_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mapreduce,mergetable,deadcode,commonTerms,joinPath,reorder,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/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt 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
+# cmdline opt gdk_dbfarm =
/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/dbfarm
+# cmdline opt mapi_open = true
+# cmdline opt xrpc_open = true
+# cmdline opt mapi_port = 38169
+# cmdline opt xrpc_port = 44022
+# 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/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf)
+
+# 09:27:06 >
+# 09:27:06 > mclient -lsql -ftest -i -e --host=alf --port=38169
+# 09:27:06 >
+
+
+# 09:27:06 >
+# 09:27:06 > Done.
+# 09:27:06 >
+
diff -r a087e83ab53e -r e49ebce55b48
sql/src/test/BugTracker-2010/Tests/in_query_with_constants_fails.Bug-2582.stable.out
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++
b/sql/src/test/BugTracker-2010/Tests/in_query_with_constants_fails.Bug-2582.stable.out
Wed Jul 07 10:27:21 2010 +0200
@@ -0,0 +1,35 @@
+stdout of test 'in_query_with_constants_fails.Bug-2582` in directory
'src/test/BugTracker-2010` itself:
+
+
+# 09:27:06 >
+# 09:27:06 > 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=38169 --set
xrpc_port=44022 --set monet_prompt= --set mal_listing=2 --trace
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo
Over..
+# 09:27:06 >
+
+# MonetDB server v5.20.0, based on kernel v1.38.0
+# Serving database 'mTests_src_test_BugTracker-2010', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 7.754 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://alf.ins.cwi.nl:38169/
+# MonetDB/SQL module v2.38.2 loaded
+
+Ready.
+
+Over..
+
+# 09:27:06 >
+# 09:27:06 > mclient -lsql -ftest -i -e --host=alf --port=38169
+# 09:27:06 >
+
+#select * from skyview where unknown in (1, 2, 3);
+% .skyview, sys.skyview # table_name
+% unknown, id # name
+% tinyint, int # type
+% 1, 1 # length
+
+# 09:27:06 >
+# 09:27:06 > Done.
+# 09:27:06 >
+
diff -r a087e83ab53e -r e49ebce55b48
sql/src/test/BugTracker-2010/Tests/keycheck_crash.Bug-2583.sql
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/src/test/BugTracker-2010/Tests/keycheck_crash.Bug-2583.sql Wed Jul
07 10:27:21 2010 +0200
@@ -0,0 +1,23 @@
+CREATE SCHEMA "test";
+CREATE TABLE "test"."tbl1" (
+ "id" int NOT NULL,
+ "id1" int NOT NULL,
+ "id2" int NOT NULL,
+ "name" varchar(300) NOT NULL,
+ CONSTRAINT "test_id_pkey" PRIMARY KEY ("id"),
+ CONSTRAINT "test_id1_name_unique" UNIQUE ("id1", "name")
+);
+
+
+SELECT
+ (1) AS "a"
+FROM
+ "test"."tbl1"
+WHERE
+ "tbl1"."name" = 'some text' AND
+ "tbl1"."id1" = 1 AND NOT
+ ("tbl1"."id2" = 295)
+;
+
+DROP TABLE "test"."tbl1";
+DROP SCHEMA "test";
diff -r a087e83ab53e -r e49ebce55b48
sql/src/test/BugTracker-2010/Tests/keycheck_crash.Bug-2583.stable.err
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/src/test/BugTracker-2010/Tests/keycheck_crash.Bug-2583.stable.err
Wed Jul 07 10:27:21 2010 +0200
@@ -0,0 +1,78 @@
+stderr of test 'keycheck_crash.Bug-2583` in directory
'src/test/BugTracker-2010` itself:
+
+
+# 09:16:38 >
+# 09:16:38 > 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=31811 --set
xrpc_port=48864 --set monet_prompt= --set mal_listing=2 --trace
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo
Over..
+# 09:16:38 >
+
+# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
+# builtin opt gdk_version = 1.38.0
+# builtin opt prefix = /ufs/niels/scratch/rc/Linux-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 = >
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
