Changeset: 4c00145df76f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4c00145df76f
Added Files:
sql/test/BugTracker-2012/Tests/recursive_optimizer.Bug-3191.sql
sql/test/BugTracker-2012/Tests/recursive_optimizer.Bug-3191.stable.err
sql/test/BugTracker-2012/Tests/recursive_optimizer.Bug-3191.stable.out
Modified Files:
sql/server/rel_optimizer.c
sql/test/BugTracker-2012/Tests/All
Branch: Oct2012
Log Message:
fixed bug 3191, problem with endless recursive optimizer calls.
Solved by not pushing down empty selects.
diffs (195 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
@@ -2695,6 +2695,10 @@ rel_push_select_down(int *changes, mvc *
if (rel_is_ref(rel))
return rel;
+ /* don't make changes for empty selects */
+ if (is_select(rel->op) && (!rel->exps || list_length(rel->exps) == 0))
+ return rel;
+
/* merge 2 selects */
r = rel->l;
if (is_select(rel->op) && r && is_select(r->op) && !(rel_is_ref(r))) {
@@ -5604,8 +5608,10 @@ _rel_optimizer(mvc *sql, sql_rel *rel, i
rel = rewrite(sql, rel, &rel_merge_table_rewrite, &changes);
- if (changes && level > 10)
+ if (changes && level > 10) {
assert(0);
+ return rel;
+ }
if (changes)
return _rel_optimizer(sql, rel, ++level);
diff --git a/sql/test/BugTracker-2012/Tests/All
b/sql/test/BugTracker-2012/Tests/All
--- a/sql/test/BugTracker-2012/Tests/All
+++ b/sql/test/BugTracker-2012/Tests/All
@@ -55,3 +55,4 @@ aggregate_incorrect_precision_scale.Bug-
timestamp-diff.Bug-3190
string-insert-default-null-crash.Bug-3168
case_evaluated_too_early.Bug-3186
+recursive_optimizer.Bug-3191
diff --git a/sql/test/BugTracker-2012/Tests/recursive_optimizer.Bug-3191.sql
b/sql/test/BugTracker-2012/Tests/recursive_optimizer.Bug-3191.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/recursive_optimizer.Bug-3191.sql
@@ -0,0 +1,40 @@
+CREATE SEQUENCE "sys"."seq_5958" AS INTEGER;
+CREATE TABLE "sys"."anbi_intern" (
+ "id" INTEGER NOT NULL DEFAULT next value for
"sys"."seq_5958",
+ "naam" VARCHAR(1024),
+ "plaats" VARCHAR(54),
+ "begindatum" DATE,
+ "einddatum" DATE,
+ "intrekking" DATE,
+ "activiteit" VARCHAR(16),
+ CONSTRAINT "anbi_intern_id_pkey" PRIMARY KEY ("id")
+);
+CREATE TABLE "sys"."anbi_kvk" (
+ "kvks" INTEGER,
+ "anbi" INTEGER
+);
+CREATE TABLE "sys"."kvk" (
+ "kvk" BIGINT,
+ "bedrijfsnaam" VARCHAR(512),
+ "kvks" INTEGER,
+ "sub" INTEGER,
+ "adres" VARCHAR(64),
+ "postcode" VARCHAR(8),
+ "plaats" VARCHAR(32),
+ "type" VARCHAR(14),
+ "status" VARCHAR(256),
+ "website" VARCHAR(128),
+ "vestiging" BIGINT,
+ "rechtsvorm" VARCHAR(48),
+ "lat_rad" DECIMAL(9,9),
+ "lon_rad" DECIMAL(9,9),
+ "anbi" DATE
+);
+
+update kvk set anbi = (select begindatum from sys.anbi_kvk, anbi_intern where
+anbi_kvk.anbi = anbi_intern.id and kvk.kvks = anbi_kvk.kvks and
+anbi_intern.einddatum is null) where kvk.kvks in (select kvks from anbi_kvk);
+
+drop table sys.kvk;
+drop table sys.anbi_kvk;
+drop table sys.anbi_intern;
diff --git
a/sql/test/BugTracker-2012/Tests/recursive_optimizer.Bug-3191.stable.err
b/sql/test/BugTracker-2012/Tests/recursive_optimizer.Bug-3191.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/recursive_optimizer.Bug-3191.stable.err
@@ -0,0 +1,36 @@
+stderr of test 'recursive_optimizer.Bug-3191` in directory
'test/BugTracker-2012` itself:
+
+
+# 18:36:26 >
+# 18:36:26 > "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=36409" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2012"
"--set" "mal_listing=0"
+# 18:36:26 >
+
+# 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_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 = 36409
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_test_BugTracker-2012
+# cmdline opt mal_listing = 0
+
+# 18:36:26 >
+# 18:36:26 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=36409"
+# 18:36:26 >
+
+
+# 18:36:27 >
+# 18:36:27 > "Done."
+# 18:36:27 >
+
diff --git
a/sql/test/BugTracker-2012/Tests/recursive_optimizer.Bug-3191.stable.out
b/sql/test/BugTracker-2012/Tests/recursive_optimizer.Bug-3191.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/recursive_optimizer.Bug-3191.stable.out
@@ -0,0 +1,70 @@
+stdout of test 'recursive_optimizer.Bug-3191` in directory
'test/BugTracker-2012` itself:
+
+
+# 18:36:26 >
+# 18:36:26 > "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=36409" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2012"
"--set" "mal_listing=0"
+# 18:36:26 >
+
+# MonetDB 5 server v11.13.4
+# This is an unreleased version
+# Serving database 'mTests_test_BugTracker-2012', 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:36409/
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 18:36:26 >
+# 18:36:26 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=36409"
+# 18:36:26 >
+
+#CREATE SEQUENCE "sys"."seq_5958" AS INTEGER;
+#CREATE TABLE "sys"."anbi_intern" (
+# "id" INTEGER NOT NULL DEFAULT next value for
"sys"."seq_5958",
+# "naam" VARCHAR(1024),
+# "plaats" VARCHAR(54),
+# "begindatum" DATE,
+# "einddatum" DATE,
+# "intrekking" DATE,
+# "activiteit" VARCHAR(16),
+# CONSTRAINT "anbi_intern_id_pkey" PRIMARY KEY ("id")
+#);
+#CREATE TABLE "sys"."anbi_kvk" (
+# "kvks" INTEGER,
+# "anbi" INTEGER
+#);
+#CREATE TABLE "sys"."kvk" (
+# "kvk" BIGINT,
+# "bedrijfsnaam" VARCHAR(512),
+# "kvks" INTEGER,
+# "sub" INTEGER,
+# "adres" VARCHAR(64),
+# "postcode" VARCHAR(8),
+# "plaats" VARCHAR(32),
+# "type" VARCHAR(14),
+# "status" VARCHAR(256),
+# "website" VARCHAR(128),
+# "vestiging" BIGINT,
+# "rechtsvorm" VARCHAR(48),
+# "lat_rad" DECIMAL(9,9),
+# "lon_rad" DECIMAL(9,9),
+# "anbi" DATE
+#);
+#update kvk set anbi = (select begindatum from sys.anbi_kvk, anbi_intern where
+#anbi_kvk.anbi = anbi_intern.id and kvk.kvks = anbi_kvk.kvks and
+#anbi_intern.einddatum is null) where kvk.kvks in (select kvks from anbi_kvk);
+[ 0 ]
+#drop table sys.kvk;
+#drop table sys.anbi_kvk;
+#drop table sys.anbi_intern;
+
+# 18:36:27 >
+# 18:36:27 > "Done."
+# 18:36:27 >
+
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
