Changeset: 3d0abd7051aa for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3d0abd7051aa
Modified Files:
sql/server/rel_bin.c
Branch: default
Log Message:
Merge with Dec2011 branch.
diffs (283 lines):
diff --git a/sql/server/rel_bin.c b/sql/server/rel_bin.c
--- a/sql/server/rel_bin.c
+++ b/sql/server/rel_bin.c
@@ -1324,8 +1324,24 @@ rel2bin_join( mvc *sql, sql_rel *rel, li
*/
if (rel->exps) {
int idx = 0;
+ list *jexps = sa_list(sql->sa);
list *jns = sa_list(sql->sa);
+ /* get equi-joins first */
+ if (list_length(rel->exps) > 1) {
+ for( en = rel->exps->h; en; en = en->next ) {
+ sql_exp *e = en->data;
+ if (e->type == e_cmp && e->flag == cmp_equal)
+ append(jexps, e);
+ }
+ for( en = rel->exps->h; en; en = en->next ) {
+ sql_exp *e = en->data;
+ if (e->type != e_cmp || e->flag != cmp_equal)
+ append(jexps, e);
+ }
+ rel->exps = jexps;
+ }
+
/* generate a relational join */
for( en = rel->exps->h; en; en = en->next ) {
int join_idx = sql->opt_stats[0];
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
@@ -6,3 +6,4 @@ sticky-precision.Bug-2969
url_script_test.Bug-2972
date_script_test.Bug-2973
nested-select-crash.Bug-3009
+combination_of_theta_and_equijoins.Bug-3004.sql
diff --git
a/sql/test/BugTracker-2012/Tests/combination_of_theta_and_equijoins.Bug-3004.sql
b/sql/test/BugTracker-2012/Tests/combination_of_theta_and_equijoins.Bug-3004.sql
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2012/Tests/combination_of_theta_and_equijoins.Bug-3004.sql
@@ -0,0 +1,77 @@
+
+CREATE TABLE e (
+ "a" CLOB,
+ "r" BIGINT
+);
+CREATE TABLE s (
+ "a" CLOB,
+ "v" BIGINT
+);
+
+INSERT INTO e VALUES ('Simon', '1');
+INSERT INTO s VALUES ('Simon', '0');
+
+SELECT *
+FROM
+ (
+ SELECT
+ "a" AS "ea",
+ "r" AS "er"
+ FROM
+ "e"
+ ) AS "e"
+ ,
+ (
+ SELECT
+ "a" AS "sa",
+ "v" AS "sv"
+ FROM
+ "s"
+ ) AS "s"
+WHERE "sv" <= "er"
+ AND "ea" = "sa"
+;
+
+SELECT *
+FROM
+ (
+ SELECT
+ "a" AS "ea",
+ "r" AS "er"
+ FROM
+ "e"
+ ) AS "e"
+ ,
+ (
+ SELECT
+ "a" AS "sa",
+ "v" AS "sv"
+ FROM
+ "s"
+ ) AS "s"
+WHERE "ea" = "sa"
+ AND "sv" <= "er"
+;
+
+SELECT *
+FROM
+ (
+ SELECT
+ "a" AS "ea",
+ "r" AS "er"
+ FROM
+ "e"
+ ) AS "e",
+ (
+ SELECT
+ "a" AS "sa",
+ "v" AS "sv"
+ FROM
+ "s"
+ ) AS "s"
+WHERE ("sv" <= "er") = true
+ AND ("ea" = "sa") = true
+;
+
+DROP TABLE "e";
+DROP TABLE "s";
diff --git
a/sql/test/BugTracker-2012/Tests/combination_of_theta_and_equijoins.Bug-3004.stable.err
b/sql/test/BugTracker-2012/Tests/combination_of_theta_and_equijoins.Bug-3004.stable.err
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2012/Tests/combination_of_theta_and_equijoins.Bug-3004.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'combination_of_theta_and_equijoins.Bug-3004` in directory
'test/BugTracker-2012` itself:
+
+
+# 22:55:17 >
+# 22:55:17 > "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=38633" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2012"
"--set" "mal_listing=0"
+# 22:55:17 >
+
+# 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 = 38633
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_test_BugTracker-2012
+# cmdline opt mal_listing = 0
+
+# 22:55:17 >
+# 22:55:17 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=38633"
+# 22:55:17 >
+
+
+# 22:55:17 >
+# 22:55:17 > "Done."
+# 22:55:17 >
+
diff --git
a/sql/test/BugTracker-2012/Tests/combination_of_theta_and_equijoins.Bug-3004.stable.out
b/sql/test/BugTracker-2012/Tests/combination_of_theta_and_equijoins.Bug-3004.stable.out
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2012/Tests/combination_of_theta_and_equijoins.Bug-3004.stable.out
@@ -0,0 +1,118 @@
+stdout of test 'combination_of_theta_and_equijoins.Bug-3004` in directory
'test/BugTracker-2012` itself:
+
+
+# 22:55:17 >
+# 22:55:17 > "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=38633" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2012"
"--set" "mal_listing=0"
+# 22:55:17 >
+
+# MonetDB 5 server v11.7.6
+# 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.779 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:38633/
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 22:55:17 >
+# 22:55:17 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=38633"
+# 22:55:17 >
+
+#CREATE TABLE e (
+# "a" CLOB,
+# "r" BIGINT
+#);
+#CREATE TABLE s (
+# "a" CLOB,
+# "v" BIGINT
+#);
+#INSERT INTO e VALUES ('Simon', '1');
+[ 1 ]
+#INSERT INTO s VALUES ('Simon', '0');
+[ 1 ]
+#SELECT *
+#FROM
+# (
+# SELECT
+# "a" AS "ea",
+# "r" AS "er"
+# FROM
+# "e"
+# ) AS "e"
+# ,
+# (
+# SELECT
+# "a" AS "sa",
+# "v" AS "sv"
+# FROM
+# "s"
+# ) AS "s"
+#WHERE "sv" <= "er"
+# AND "ea" = "sa"
+#;
+% sys.e, sys.e, sys.s, sys.s # table_name
+% ea, er, sa, sv # name
+% clob, bigint, clob, bigint # type
+% 5, 1, 5, 1 # length
+[ "Simon", 1, "Simon", 0 ]
+#SELECT *
+#FROM
+# (
+# SELECT
+# "a" AS "ea",
+# "r" AS "er"
+# FROM
+# "e"
+# ) AS "e"
+# ,
+# (
+# SELECT
+# "a" AS "sa",
+# "v" AS "sv"
+# FROM
+# "s"
+# ) AS "s"
+#WHERE "ea" = "sa"
+# AND "sv" <= "er"
+#;
+% sys.e, sys.e, sys.s, sys.s # table_name
+% ea, er, sa, sv # name
+% clob, bigint, clob, bigint # type
+% 5, 1, 5, 1 # length
+[ "Simon", 1, "Simon", 0 ]
+#SELECT *
+#FROM
+# (
+# SELECT
+# "a" AS "ea",
+# "r" AS "er"
+# FROM
+# "e"
+# ) AS "e",
+# (
+# SELECT
+# "a" AS "sa",
+# "v" AS "sv"
+# FROM
+# "s"
+# ) AS "s"
+#WHERE ("sv" <= "er") = true
+# AND ("ea" = "sa") = true
+#;
+% sys.e, sys.e, sys.s, sys.s # table_name
+% ea, er, sa, sv # name
+% clob, bigint, clob, bigint # type
+% 5, 1, 5, 1 # length
+[ "Simon", 1, "Simon", 0 ]
+#DROP TABLE "e";
+#DROP TABLE "s";
+
+# 22:55:17 >
+# 22:55:17 > "Done."
+# 22:55:17 >
+
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
