Changeset: 1a10469e62a2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1a10469e62a2
Added Files:
sql/test/BugTracker-2012/Tests/case_evaluated_too_early.Bug-3186.sql
sql/test/BugTracker-2012/Tests/case_evaluated_too_early.Bug-3186.stable.err
sql/test/BugTracker-2012/Tests/case_evaluated_too_early.Bug-3186.stable.out
Modified Files:
sql/server/rel_optimizer.c
sql/test/BugTracker-2012/Tests/All
Branch: Oct2012
Log Message:
fixed bug 3186
diffs (132 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
@@ -2046,12 +2046,24 @@ exp_case_fixup( mvc *sql, sql_exp *e )
a1 = sql_div_fixup(sql, a1, cond, 0);
} else if (a1->type == e_func && a1->l) {
a1->l = exps_case_fixup(sql, a1->l, cond, 0);
+ } else if (a1->type == e_convert) {
+ sql_exp *l = a1->l;
+ sql_subfunc *f = l->f;
+
+ if (l->type == e_func && !f->func->s &&
!strcmp(f->func->base.name, "sql_div"))
+ a1->l = sql_div_fixup(sql, l, cond, 0);
}
if (a2->type == e_func && !a2f->func->s &&
!strcmp(a2f->func->base.name, "sql_div")) {
a2 = sql_div_fixup(sql, a2, cond, 1);
} else if (a2->type == e_func && a2->l) {
a2->l = exps_case_fixup(sql, a2->l, cond, 1);
+ } else if (a2->type == e_convert) {
+ sql_exp *l = a2->l;
+ sql_subfunc *f = l->f;
+
+ if (l->type == e_func && !f->func->s &&
!strcmp(f->func->base.name, "sql_div"))
+ a2->l = sql_div_fixup(sql, l, cond, 1);
}
nne = exp_op3(sql->sa, cond, a1, a2, ne->f);
exp_setname(sql->sa, nne, ne->rname, ne->name );
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
@@ -54,3 +54,4 @@ many-columns-truncated.Bug-3161
aggregate_incorrect_precision_scale.Bug-3182
timestamp-diff.Bug-3190
string-insert-default-null-crash.Bug-3168
+case_evaluated_too_early.Bug-3186
diff --git
a/sql/test/BugTracker-2012/Tests/case_evaluated_too_early.Bug-3186.sql
b/sql/test/BugTracker-2012/Tests/case_evaluated_too_early.Bug-3186.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/case_evaluated_too_early.Bug-3186.sql
@@ -0,0 +1,2 @@
+SELECT CASE WHEN TRUE THEN -10 ELSE 0/0 END;
+SELECT coalesce (CASE WHEN TRUE THEN -10. end, case when false then 0/0 END);
diff --git
a/sql/test/BugTracker-2012/Tests/case_evaluated_too_early.Bug-3186.stable.err
b/sql/test/BugTracker-2012/Tests/case_evaluated_too_early.Bug-3186.stable.err
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2012/Tests/case_evaluated_too_early.Bug-3186.stable.err
@@ -0,0 +1,36 @@
+stderr of test 'case_evaluated_too_early.Bug-3186` in directory
'test/BugTracker-2012` itself:
+
+
+# 17:10:19 >
+# 17:10:19 > "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=35816" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2012"
"--set" "mal_listing=0"
+# 17:10:19 >
+
+# 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 = 35816
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_test_BugTracker-2012
+# cmdline opt mal_listing = 0
+
+# 17:10:20 >
+# 17:10:20 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=35816"
+# 17:10:20 >
+
+
+# 17:10:20 >
+# 17:10:20 > "Done."
+# 17:10:20 >
+
diff --git
a/sql/test/BugTracker-2012/Tests/case_evaluated_too_early.Bug-3186.stable.out
b/sql/test/BugTracker-2012/Tests/case_evaluated_too_early.Bug-3186.stable.out
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2012/Tests/case_evaluated_too_early.Bug-3186.stable.out
@@ -0,0 +1,43 @@
+stdout of test 'case_evaluated_too_early.Bug-3186` in directory
'test/BugTracker-2012` itself:
+
+
+# 17:10:19 >
+# 17:10:19 > "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=35816" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2012"
"--set" "mal_listing=0"
+# 17:10:19 >
+
+# 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:35816/
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 17:10:20 >
+# 17:10:20 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=35816"
+# 17:10:20 >
+
+#SELECT CASE WHEN TRUE THEN -10 ELSE 0/0 END;
+% . # table_name
+% isnull_single_value # name
+% tinyint # type
+% 3 # length
+[ -10 ]
+#SELECT coalesce (CASE WHEN TRUE THEN -10. end, case when false then 0/0 END);
+% . # table_name
+% isnull_single_value # name
+% decimal # type
+% 4 # length
+[ -10 ]
+
+# 17:10:20 >
+# 17:10:20 > "Done."
+# 17:10:20 >
+
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
