Changeset: f2b4784ab6d9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f2b4784ab6d9
Added Files:
sql/test/bugs/Tests/WHERE_IN_subquery_incorrect_results-JIRA-44.sql
sql/test/bugs/Tests/WHERE_IN_subquery_incorrect_results-JIRA-44.stable.err
sql/test/bugs/Tests/WHERE_IN_subquery_incorrect_results-JIRA-44.stable.out
Modified Files:
sql/server/rel_optimizer.c
sql/server/rel_rel.c
sql/server/rel_select.c
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
sql/test/bugs/Tests/All
Branch: Jun2016
Log Message:
merged with Jun2015
diffs (225 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
@@ -3833,7 +3833,7 @@ rel_push_semijoin_down(int *changes, mvc
{
(void)*changes;
if (is_semi(rel->op) && rel->exps && rel->l) {
- operator_type op = rel->op;
+ operator_type op = rel->op, lop;
node *n;
sql_rel *l = rel->l, *ll = NULL, *lr = NULL;
sql_rel *r = rel->r;
@@ -3848,6 +3848,7 @@ rel_push_semijoin_down(int *changes, mvc
if (!is_join(l->op) || rel_is_ref(l))
return rel;
+ lop = l->op;
ll = l->l;
lr = l->r;
/* semijoin shouldn't be based on right relation of join */
@@ -3879,9 +3880,9 @@ rel_push_semijoin_down(int *changes, mvc
l = rel_crossproduct(sql->sa, lr, r, op);
l->exps = nsexps;
if (right)
- rel = rel_crossproduct(sql->sa, l, lr, op_join);
+ rel = rel_crossproduct(sql->sa, l, lr, lop);
else
- rel = rel_crossproduct(sql->sa, l, ll, op_join);
+ rel = rel_crossproduct(sql->sa, l, ll, lop);
rel->exps = njexps;
}
return rel;
diff --git a/sql/server/rel_rel.c b/sql/server/rel_rel.c
--- a/sql/server/rel_rel.c
+++ b/sql/server/rel_rel.c
@@ -966,7 +966,7 @@ rel_push_join(mvc *sql, sql_rel *rel, sq
rrel = rn->data;
rrel2 = rn2->data;
- if (rel_is_ref(lrel) || rel_is_ref(rrel) ||
rel_is_ref(rrel2))
+ if (rel_is_ref(lrel) || rel_is_ref(rrel) ||
rel_is_ref(rrel2) || is_processed(lrel) || is_processed(rrel))
break;
/* push down as long as the operators allow this
@@ -988,7 +988,7 @@ rel_push_join(mvc *sql, sql_rel *rel, sq
lrel = ln->data;
rrel = rn->data;
- if (rel_is_ref(lrel) || rel_is_ref(rrel))
+ if (rel_is_ref(lrel) || rel_is_ref(rrel) ||
is_processed(lrel) || is_processed(rrel))
break;
/* push down as long as the operators allow this
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
@@ -1483,7 +1483,7 @@ rel_compare_exp_(mvc *sql, sql_rel *rel,
/* push select into the given relation */
return rel_push_select(sql, rel, L, e);
} else { /* join */
- if (is_semi(rel->op) || is_outerjoin(rel->op)) {
+ if (is_semi(rel->op) || (is_outerjoin(rel->op) &&
!is_processed((rel)))) {
rel_join_add_exp(sql->sa, rel, e);
return rel;
}
@@ -4886,9 +4886,6 @@ rel_joinquery_(mvc *sql, sql_rel *rel, s
if (js && js->token != SQL_USING) { /* On sql_logical_exp */
rel = rel_logical_exp(sql, rel, js, sql_where);
-
- if (!rel)
- return rel;
} else if (js) { /* using */
char rname[16], *rnme;
dnode *n = js->data.lval->h;
diff --git a/sql/test/bugs/Tests/All b/sql/test/bugs/Tests/All
--- a/sql/test/bugs/Tests/All
+++ b/sql/test/bugs/Tests/All
@@ -107,3 +107,4 @@ substring_limit_bug
apply_with_union_assertion
cur_date_crash-JIRA-42
WHERE_and_multiple_LEFT_JOIN_incorrect_results-JIRA-43
+WHERE_IN_subquery_incorrect_results-JIRA-44
diff --git
a/sql/test/bugs/Tests/WHERE_IN_subquery_incorrect_results-JIRA-44.sql
b/sql/test/bugs/Tests/WHERE_IN_subquery_incorrect_results-JIRA-44.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/bugs/Tests/WHERE_IN_subquery_incorrect_results-JIRA-44.sql
@@ -0,0 +1,7 @@
+CREATE TABLE foo (fooid INTEGER);
+CREATE TABLE bar (fooid INTEGER, barval VARCHAR(8));
+INSERT INTO foo VALUES (1);
+SELECT * FROM foo AS f LEFT JOIN bar AS B ON (f.fooid = b.fooid) WHERE
(f.fooid) IN (SELECT 1);
+
+DROP TABLE foo;
+DROP TABLE bar;
diff --git
a/sql/test/bugs/Tests/WHERE_IN_subquery_incorrect_results-JIRA-44.stable.err
b/sql/test/bugs/Tests/WHERE_IN_subquery_incorrect_results-JIRA-44.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/bugs/Tests/WHERE_IN_subquery_incorrect_results-JIRA-44.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'WHERE_IN_subquery_incorrect_results-JIRA-44` in directory
'sql/test/bugs` itself:
+
+
+# 16:51:18 >
+# 16:51:18 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34531" "--set"
"mapi_usock=/var/tmp/mtest-15511/.s.monetdb.34531" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/net/toulouse/export/scratch2/zhang/monet-install/Jul2015/debug/var/MonetDB/mTests_sql_test_bugs"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 16:51:18 >
+
+# builtin opt gdk_dbpath =
/net/toulouse/export/scratch2/zhang/monet-install/Jul2015/debug/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = no
+# 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 = 34531
+# cmdline opt mapi_usock = /var/tmp/mtest-15511/.s.monetdb.34531
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/net/toulouse/export/scratch2/zhang/monet-install/Jul2015/debug/var/MonetDB/mTests_sql_test_bugs
+# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 16:51:18 >
+# 16:51:18 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-15511" "--port=34531"
+# 16:51:18 >
+
+
+# 16:51:19 >
+# 16:51:19 > "Done."
+# 16:51:19 >
+
diff --git
a/sql/test/bugs/Tests/WHERE_IN_subquery_incorrect_results-JIRA-44.stable.out
b/sql/test/bugs/Tests/WHERE_IN_subquery_incorrect_results-JIRA-44.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/bugs/Tests/WHERE_IN_subquery_incorrect_results-JIRA-44.stable.out
@@ -0,0 +1,83 @@
+stdout of test 'WHERE_IN_subquery_incorrect_results-JIRA-44` in directory
'sql/test/bugs` itself:
+
+
+# 16:51:18 >
+# 16:51:18 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34531" "--set"
"mapi_usock=/var/tmp/mtest-15511/.s.monetdb.34531" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/net/toulouse/export/scratch2/zhang/monet-install/Jul2015/debug/var/MonetDB/mTests_sql_test_bugs"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 16:51:18 >
+
+# MonetDB 5 server v11.21.20
+# This is an unreleased version
+# Serving database 'mTests_sql_test_bugs', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 15.589 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://toulouse.da.cwi.nl:34531/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-15511/.s.monetdb.34531
+# MonetDB/GIS module loaded
+# Start processing logs sql/sql_logs version 52200
+# Finished processing logs sql/sql_logs
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+# SQL catalog created, loading sql scripts once
+# loading sql script: 09_like.sql
+# loading sql script: 10_math.sql
+# loading sql script: 11_times.sql
+# loading sql script: 12_url.sql
+# loading sql script: 13_date.sql
+# loading sql script: 14_inet.sql
+# loading sql script: 15_querylog.sql
+# loading sql script: 16_tracelog.sql
+# loading sql script: 17_temporal.sql
+# loading sql script: 20_vacuum.sql
+# loading sql script: 21_dependency_functions.sql
+# loading sql script: 22_clients.sql
+# loading sql script: 23_skyserver.sql
+# loading sql script: 24_zorder.sql
+# loading sql script: 25_debug.sql
+# loading sql script: 26_sysmon.sql
+# loading sql script: 27_rejects.sql
+# loading sql script: 39_analytics.sql
+# loading sql script: 39_analytics_hge.sql
+# loading sql script: 40_geom.sql
+# loading sql script: 40_json.sql
+# loading sql script: 40_json_hge.sql
+# loading sql script: 41_md5sum.sql
+# loading sql script: 45_uuid.sql
+# loading sql script: 46_gsl.sql
+# loading sql script: 51_sys_schema_extension.sql
+# loading sql script: 72_fits.sql
+# loading sql script: 74_netcdf.sql
+# loading sql script: 75_storagemodel.sql
+# loading sql script: 80_statistics.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 80_udf_hge.sql
+# loading sql script: 85_bam.sql
+# loading sql script: 90_generator.sql
+# loading sql script: 90_generator_hge.sql
+# loading sql script: 99_system.sql
+
+# 16:51:18 >
+# 16:51:18 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-15511" "--port=34531"
+# 16:51:18 >
+
+#CREATE TABLE foo (fooid INTEGER);
+#CREATE TABLE bar (fooid INTEGER, barval VARCHAR(8));
+#INSERT INTO foo VALUES (1);
+[ 1 ]
+#SELECT * FROM foo AS f LEFT JOIN bar AS B ON (f.fooid = b.fooid) WHERE
(f.fooid) IN (1);
+% .f, .b, .b # table_name
+% fooid, fooid, barval # name
+% int, int, varchar # type
+% 1, 1, 0 # length
+[ 1, NULL, NULL ]
+#DROP TABLE foo;
+#DROP TABLE bar;
+
+# 16:51:19 >
+# 16:51:19 > "Done."
+# 16:51:19 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
