Changeset: 17fab754f655 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=17fab754f655
Added Files:
sql/test/VOC/Tests/double_is_null.Bug-3116.sql
sql/test/VOC/Tests/double_is_null.Bug-3116.stable.err
sql/test/VOC/Tests/double_is_null.Bug-3116.stable.out
Modified Files:
sql/server/rel_optimizer.c
sql/test/VOC/Tests/All
Branch: Jul2012
Log Message:
fixed crash, by fixing a bug in the push_select_down optimizer
Fixes bug 3117
diffs (172 lines):
diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c
--- a/sql/server/rel_optimizer.c
+++ b/sql/server/rel_optimizer.c
@@ -1779,7 +1779,24 @@ exp_push_down_prj(mvc *sql, sql_exp *e,
ne = exps_bind_column(f->exps, e->r, NULL);
if (!ne || (ne->type != e_column && ne->type != e_atom))
return NULL;
- /* possibly a groupby column is renamed */
+ while (ne && f->op == op_project && ne->type == e_column) {
+ sql_exp *oe = e, *one = ne;
+
+ e = ne;
+ ne = NULL;
+ if (e->l)
+ ne = exps_bind_column2(f->exps, e->l, e->r);
+ if (!ne && !e->l)
+ ne = exps_bind_column(f->exps, e->r, NULL);
+ if (!ne || ne == one) {
+ ne = one;
+ e = oe;
+ break;
+ }
+ if (ne->type != e_column && ne->type != e_atom)
+ return NULL;
+ }
+ /* possibly a groupby/project column is renamed */
if (is_groupby(f->op) && f->r) {
sql_exp *gbe = NULL;
if (ne->l)
diff --git a/sql/test/VOC/Tests/All b/sql/test/VOC/Tests/All
--- a/sql/test/VOC/Tests/All
+++ b/sql/test/VOC/Tests/All
@@ -1,2 +1,3 @@
VOC
median.Bug-3096
+double_is_null.Bug-3116
diff --git a/sql/test/VOC/Tests/double_is_null.Bug-3116.sql
b/sql/test/VOC/Tests/double_is_null.Bug-3116.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/VOC/Tests/double_is_null.Bug-3116.sql
@@ -0,0 +1,30 @@
+CREATE TABLE "voyages" (
+ "number" integer NOT NULL,
+ "number_sup" char(1) NOT NULL,
+ "trip" integer,
+ "trip_sup" char(1),
+ "boatname" varchar(50),
+ "master" varchar(50),
+ "tonnage" integer,
+ "type_of_boat" varchar(30),
+ "built" varchar(15),
+ "bought" varchar(15),
+ "hired" varchar(15),
+ "yard" char(1),
+ "chamber" char(1),
+ "departure_date" date,
+ "departure_harbour" varchar(30),
+ "cape_arrival" date,
+ "cape_departure" date,
+ "cape_call" boolean,
+ "arrival_date" date,
+ "arrival_harbour" varchar(30),
+ "next_voyage" integer,
+ "particulars" varchar(530)
+);
+
+SELECT hired, count(*) FROM voyages WHERE true AND hired IS NOT NULL AND
+hired is not null GROUP BY hired ORDER BY hired;
+
+drop table voyages;
+
diff --git a/sql/test/VOC/Tests/double_is_null.Bug-3116.stable.err
b/sql/test/VOC/Tests/double_is_null.Bug-3116.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/VOC/Tests/double_is_null.Bug-3116.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'double_is_null.Bug-3116` in directory 'test/VOC` itself:
+
+
+# 08:09:22 >
+# 08:09:22 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB" "--set"
"mapi_open=true" "--set" "mapi_port=34961" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_VOC" "--set"
"mal_listing=0"
+# 08:09:22 >
+
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm =
/home/niels/scratch/rc-clean/Linux-x86_64/var/monetdb5/dbfarm
+# builtin opt gdk_debug = 0
+# builtin opt gdk_alloc_map = no
+# builtin opt gdk_vmtrim = yes
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt gdk_dbfarm =
/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 34961
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_test_VOC
+# cmdline opt mal_listing = 0
+
+# 08:09:22 >
+# 08:09:22 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=34961"
+# 08:09:22 >
+
+
+# 08:09:22 >
+# 08:09:22 > "Done."
+# 08:09:22 >
+
diff --git a/sql/test/VOC/Tests/double_is_null.Bug-3116.stable.out
b/sql/test/VOC/Tests/double_is_null.Bug-3116.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/VOC/Tests/double_is_null.Bug-3116.stable.out
@@ -0,0 +1,54 @@
+stdout of test 'double_is_null.Bug-3116` in directory 'test/VOC` itself:
+
+
+# 08:09:22 >
+# 08:09:22 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB" "--set"
"mapi_open=true" "--set" "mapi_port=34961" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_VOC" "--set"
"mal_listing=0"
+# 08:09:22 >
+
+# MonetDB 5 server v11.11.0
+# This is an unreleased version
+# Serving database 'mTests_test_VOC', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 3.778 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2012 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on
mapi:monetdb://niels.nesco.mine.nu:34961/
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 08:09:22 >
+# 08:09:22 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=34961"
+# 08:09:22 >
+
+#CREATE TABLE "voyages" (
+# "number" integer NOT NULL,
+# "number_sup" char(1) NOT NULL,
+# "trip" integer,
+# "trip_sup" char(1),
+# "boatname" varchar(50),
+# "master" varchar(50),
+# "tonnage" integer,
+# "type_of_boat" varchar(30),
+# "built" varchar(15),
+# "bought" varchar(15),
+# "hired" varchar(15),
+# "yard" char(1),
+# "chamber" char(1),
+# "departure_date" date,
+# "departure_harbour" varchar(30),
+#SELECT hired, count(*) FROM voyages WHERE true AND hired IS NOT NULL AND
+#hired is not null GROUP BY hired ORDER BY hired;
+% sys.voyages, sys.voyages # table_name
+% hired, L1 # name
+% varchar, wrd # type
+% 0, 1 # length
+#drop table voyages;
+
+# 08:09:22 >
+# 08:09:22 > "Done."
+# 08:09:22 >
+
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
