Changeset: 8e3776585f91 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8e3776585f91
Added Files:
sql/test/BugTracker-2013/Tests/correlated_select.Bug-3250.sql
sql/test/BugTracker-2013/Tests/correlated_select.Bug-3250.stable.err
sql/test/BugTracker-2013/Tests/correlated_select.Bug-3250.stable.out
Modified Files:
sql/server/rel_select.c
sql/test/BugTracker-2013/Tests/All
Branch: Feb2013
Log Message:
fixed bug 3250 (handle join and select expressions in the correlated subquery)
diffs (197 lines):
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -4940,6 +4940,8 @@ rel_select_exp(mvc *sql, sql_rel *rel, s
}
if (rel) {
+ sql_rel *join = NULL;
+
if (rel && sn->groupby) {
list *gbe = rel_group_by(sql, rel, sn->groupby,
sn->selection, sql_sel );
@@ -4955,12 +4957,15 @@ rel_select_exp(mvc *sql, sql_rel *rel, s
/* TODO if ek.card == card_set (IN/EXISTS etc), we could do
something less expensive as group by's ! */
- if (outer && rel->op == op_join && rel->l == outer && ek.card
!= card_set) {
+ join = rel;
+ if (outer && rel->op == op_select)
+ join = rel->l;
+ if (outer && join->op == op_join && join->l == outer && ek.card
!= card_set) {
node *n;
/* correlation expressions */
- list *ce = list_select(rel->exps, rel, (fcmp)
&exp_is_correlation, (fdup)NULL);
-
- if (!ce || list_length(ce) == 0 ||
check_correlation_exps(ce) != 0) {
+ list *ce = list_select(join->exps, join, (fcmp)
&exp_is_correlation, (fdup)NULL);
+
+ if (!ce || list_length(ce) == 0 ||
check_correlation_exps(ce) != 0 || join != rel) {
if (ek.card != card_set) {
node *n;
/* group by on identity */
@@ -4968,7 +4973,7 @@ rel_select_exp(mvc *sql, sql_rel *rel, s
outer_gbexps = rel_projections(sql,
outer, NULL, 1, 1);
if (!is_project(outer->op))
- rel->l = outer =
rel_project(sql->sa, outer, rel_projections(sql, outer, NULL, 1, 1));
+ join->l = outer =
rel_project(sql->sa, outer, rel_projections(sql, outer, NULL, 1, 1));
/* find or create identity column */
if (find_identity(outer->exps, outer)
== NULL) {
e = rel_unop_(sql,
outer->exps->h->data, NULL, "identity", card_value);
diff --git a/sql/test/BugTracker-2013/Tests/All
b/sql/test/BugTracker-2013/Tests/All
--- a/sql/test/BugTracker-2013/Tests/All
+++ b/sql/test/BugTracker-2013/Tests/All
@@ -7,3 +7,4 @@ crash-from-optimizer.Bug-3241
select-view-view.Bug-3245
stddev-group.Bug-3257
between.Bug-3259
+correlated_select.Bug-3250
diff --git a/sql/test/BugTracker-2013/Tests/correlated_select.Bug-3250.sql
b/sql/test/BugTracker-2013/Tests/correlated_select.Bug-3250.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/correlated_select.Bug-3250.sql
@@ -0,0 +1,22 @@
+
+start transaction;
+create table mytest (
+ id int,
+ n int,
+ flag int
+);
+
+insert into mytest values (1,1,null),
+ (2 , 1 , null ),
+ (3 , 1 , null ),
+ (4 , 2 , null ),
+ (5 , 1 , 42 ),
+ (6 , 1 , 42 );
+select * from mytest;
+
+select id, n, flag, (select count(*) from mytest as i where i.id <
+ mytest.id and i.n = mytest.n) from mytest order by id;
+
+select id, n, flag, (select count(*) from mytest as i where i.id <
+ mytest.id and i.n = mytest.n and flag is not null) from mytest order by
id;
+rollback;
diff --git
a/sql/test/BugTracker-2013/Tests/correlated_select.Bug-3250.stable.err
b/sql/test/BugTracker-2013/Tests/correlated_select.Bug-3250.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/correlated_select.Bug-3250.stable.err
@@ -0,0 +1,35 @@
+stderr of test 'correlated_select.Bug-3250` in directory
'sql/test/BugTracker-2013` itself:
+
+
+# 22:53:24 >
+# 22:53:24 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32026" "--set"
"mapi_usock=/var/tmp/mtest-19817/.s.monetdb.32026" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2013"
"--set" "mal_listing=0"
+# 22:53:24 >
+
+# builtin opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/var/monetdb5/dbfarm/demo
+# 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 mapi_open = true
+# cmdline opt mapi_port = 32026
+# cmdline opt mapi_usock = /var/tmp/mtest-19817/.s.monetdb.32026
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2013
+# cmdline opt mal_listing = 0
+
+# 22:53:24 >
+# 22:53:24 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-19817" "--port=32026"
+# 22:53:24 >
+
+
+# 22:53:24 >
+# 22:53:24 > "Done."
+# 22:53:24 >
+
diff --git
a/sql/test/BugTracker-2013/Tests/correlated_select.Bug-3250.stable.out
b/sql/test/BugTracker-2013/Tests/correlated_select.Bug-3250.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/correlated_select.Bug-3250.stable.out
@@ -0,0 +1,76 @@
+stdout of test 'correlated_select.Bug-3250` in directory
'sql/test/BugTracker-2013` itself:
+
+
+# 22:53:24 >
+# 22:53:24 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32026" "--set"
"mapi_usock=/var/tmp/mtest-19817/.s.monetdb.32026" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2013"
"--set" "mal_listing=0"
+# 22:53:24 >
+
+# MonetDB 5 server v11.15.4
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2013', 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-2013 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:32026/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-19817/.s.monetdb.32026
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 22:53:24 >
+# 22:53:24 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-19817" "--port=32026"
+# 22:53:24 >
+
+#start transaction;
+#create table mytest (
+# id int,
+# n int,
+# flag int
+#);
+#insert into mytest values (1,1,null),
+# (2 , 1 , null ),
+# (3 , 1 , null ),
+# (4 , 2 , null ),
+# (5 , 1 , 42 ),
+# (6 , 1 , 42 );
+[ 6 ]
+#select * from mytest;
+% sys.mytest, sys.mytest, sys.mytest # table_name
+% id, n, flag # name
+% int, int, int # type
+% 1, 1, 2 # length
+[ 1, 1, NULL ]
+[ 2, 1, NULL ]
+[ 3, 1, NULL ]
+[ 4, 2, NULL ]
+[ 5, 1, 42 ]
+[ 6, 1, 42 ]
+#select id, n, flag, (select count(*) from mytest as i where i.id <
+# mytest.id and i.n = mytest.n) from mytest order by id;
+% .mytest, .mytest, .mytest, .i # table_name
+% id, n, flag, L2 # name
+% int, int, int, wrd # type
+% 1, 1, 2, 1 # length
+[ 1, 1, NULL, 0 ]
+[ 2, 1, NULL, 1 ]
+[ 3, 1, NULL, 2 ]
+[ 4, 2, NULL, 0 ]
+[ 5, 1, 42, 3 ]
+[ 6, 1, 42, 4 ]
+#select id, n, flag, (select count(*) from mytest as i where i.id <
+# mytest.id and i.n = mytest.n and flag is not null) from mytest order by
id;
+% .mytest, .mytest, .mytest, .L1 # table_name
+% id, n, flag, L2 # name
+% int, int, int, wrd # type
+% 1, 1, 2, 1 # length
+[ 6, 1, 42, 1 ]
+#rollback;
+
+# 22:53:24 >
+# 22:53:24 > "Done."
+# 22:53:24 >
+
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
