Changeset: a3fe02d1b63f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a3fe02d1b63f
Added Files:
sql/test/BugTracker-2012/Tests/hash_join_crash.Bug-3089.sql
sql/test/BugTracker-2012/Tests/hash_join_crash.Bug-3089.stable.err
sql/test/BugTracker-2012/Tests/hash_join_crash.Bug-3089.stable.out
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.sql
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
sql/test/BugTracker-2012/Tests/row-number-nyi.Bug-3087.sql
sql/test/BugTracker-2012/Tests/row-number-nyi.Bug-3087.stable.err
sql/test/BugTracker-2012/Tests/row-number-nyi.Bug-3087.stable.out
Modified Files:
sql/server/rel_bin.c
sql/server/rel_optimizer.c
sql/test/BugTracker-2012/Tests/All
Branch: Jul2012
Log Message:
Merge with Apr2012 branch.
diffs (truncated from 495 to 300 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
@@ -1436,9 +1436,10 @@ rel2bin_join( mvc *sql, sql_rel *rel, li
sql_idx *i = p->value;
join = s = rel2bin_hash_lookup(sql, rel, left,
right, i, en);
- assert(s);
- list_append(jns, s);
- use_hash = 1;
+ if (s) {
+ list_append(jns, s);
+ use_hash = 1;
+ }
}
s = exp_bin(sql, e, left, right, NULL, NULL);
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
@@ -1357,40 +1357,26 @@ rel_push_func_down(int *changes, mvc *sq
sql_exp *e = n->data, *ne = NULL;
int must = 0, mustl = 0, mustr = 0;
- assert(e->type == e_cmp);
+ if (e->type == e_column)
+ continue;
if ((is_join(rel->op) && ((can_push_func(e, l,
&mustl) && mustl) || (can_push_func(e, r, &mustr) && mustr))) ||
(is_select(rel->op) && can_push_func(e,
NULL, &must) && must)) {
must = 0; mustl = 0; mustr = 0;
- ne = e->l;
- if ((is_join(rel->op) &&
((can_push_func(ne, l, &mustl) && mustl) || (can_push_func(ne, r, &mustr) &&
mustr))) ||
- (is_select(rel->op) &&
can_push_func(ne, NULL, &must) && must)) {
- exp_label(sql->sa, ne,
++sql->label);
- if (mustr)
- append(r->exps, ne);
- else
- append(l->exps, ne);
- ne = exp_column(sql->sa,
exp_relname(ne), exp_name(ne), exp_subtype(ne), ne->card, has_nil(ne),
is_intern(ne));
- }
- e->l = ne;
-
- must = 0; mustl = 0; mustr = 0;
- ne = e->r;
- if ((is_join(rel->op) &&
((can_push_func(ne, l, &mustl) && mustl) || (can_push_func(ne, r, &mustr) &&
mustr))) ||
- (is_select(rel->op) &&
can_push_func(ne, NULL, &must) && must)) {
- exp_label(sql->sa, ne,
++sql->label);
- if (mustr)
- append(r->exps, ne);
- else
- append(l->exps, ne);
- ne = exp_column(sql->sa,
exp_relname(ne), exp_name(ne), exp_subtype(ne), ne->card, has_nil(ne),
is_intern(ne));
- }
- e->r = ne;
-
- if (e->f) {
- must = 0; mustl = 0; mustr = 0;
- ne = e->f;
+ if (e->type != e_cmp) { /* predicate */
+ if ((is_join(rel->op) &&
((can_push_func(e, l, &mustl) && mustl) || (can_push_func(e, r, &mustr) &&
mustr))) ||
+ (is_select(rel->op) &&
can_push_func(e, NULL, &must) && must)) {
+ exp_label(sql->sa, e,
++sql->label);
+ if (mustr)
+ append(r->exps,
e);
+ else
+ append(l->exps,
e);
+ e = exp_column(sql->sa,
exp_relname(e), exp_name(e), exp_subtype(e), e->card, has_nil(e), is_intern(e));
+ n->data = e;
+ }
+ } else {
+ ne = e->l;
if ((is_join(rel->op) &&
((can_push_func(ne, l, &mustl) && mustl) || (can_push_func(ne, r, &mustr) &&
mustr))) ||
- (is_select(rel->op) &&
can_push_func(ne, NULL, &must) && must)) {
+ (is_select(rel->op) &&
can_push_func(ne, NULL, &must) && must)) {
exp_label(sql->sa, ne,
++sql->label);
if (mustr)
append(r->exps,
ne);
@@ -1398,11 +1384,39 @@ rel_push_func_down(int *changes, mvc *sq
append(l->exps,
ne);
ne =
exp_column(sql->sa, exp_relname(ne), exp_name(ne), exp_subtype(ne), ne->card,
has_nil(ne), is_intern(ne));
}
- e->f = ne;
+ e->l = ne;
+
+ must = 0; mustl = 0; mustr = 0;
+ ne = e->r;
+ if ((is_join(rel->op) &&
((can_push_func(ne, l, &mustl) && mustl) || (can_push_func(ne, r, &mustr) &&
mustr))) ||
+ (is_select(rel->op) &&
can_push_func(ne, NULL, &must) && must)) {
+ exp_label(sql->sa, ne,
++sql->label);
+ if (mustr)
+ append(r->exps,
ne);
+ else
+ append(l->exps,
ne);
+ ne =
exp_column(sql->sa, exp_relname(ne), exp_name(ne), exp_subtype(ne), ne->card,
has_nil(ne), is_intern(ne));
+ }
+ e->r = ne;
+
+ if (e->f) {
+ must = 0; mustl = 0;
mustr = 0;
+ ne = e->f;
+ if ((is_join(rel->op)
&& ((can_push_func(ne, l, &mustl) && mustl) || (can_push_func(ne, r, &mustr) &&
mustr))) ||
+ (is_select(rel->op)
&& can_push_func(ne, NULL, &must) && must)) {
+
exp_label(sql->sa, ne, ++sql->label);
+ if (mustr)
+
append(r->exps, ne);
+ else
+
append(l->exps, ne);
+ ne =
exp_column(sql->sa, exp_relname(ne), exp_name(ne), exp_subtype(ne), ne->card,
has_nil(ne), is_intern(ne));
+ }
+ e->f = ne;
+ }
}
+ (*changes)++;
}
}
- (*changes)++;
}
}
if (rel->op == op_project && rel->l && rel->exps) {
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
@@ -40,3 +40,6 @@ bug_large-insert-Bug.2960
any_null.Bug-2594
float-mod.Bug-3086
aggregate_vs_positional_column_crash.Bug-3085
+predicate_select.Bug-3090
+hash_join_crash.Bug-3089
+row-number-nyi.Bug-3087
diff --git a/sql/test/BugTracker-2012/Tests/hash_join_crash.Bug-3089.sql
b/sql/test/BugTracker-2012/Tests/hash_join_crash.Bug-3089.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/hash_join_crash.Bug-3089.sql
@@ -0,0 +1,8 @@
+
+create table test1 ( id int, seq int, name varchar(20), primary key (id, seq));
+create table test2 ( id int not null, seq int not null, name varchar(20));
+
+select * from test1 a, test2 b where a.id = b.id and b.seq = a.seq;
+
+drop table test2;
+drop table test1;
diff --git a/sql/test/BugTracker-2012/Tests/hash_join_crash.Bug-3089.stable.err
b/sql/test/BugTracker-2012/Tests/hash_join_crash.Bug-3089.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/hash_join_crash.Bug-3089.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'hash_join_crash.Bug-3089` in directory 'test/BugTracker-2012`
itself:
+
+
+# 09:10:21 >
+# 09:10:21 > "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=38474" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2012"
"--set" "mal_listing=0"
+# 09:10:21 >
+
+# 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 = 38474
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_test_BugTracker-2012
+# cmdline opt mal_listing = 0
+
+# 09:10:22 >
+# 09:10:22 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=38474"
+# 09:10:22 >
+
+
+# 09:10:22 >
+# 09:10:22 > "Done."
+# 09:10:22 >
+
diff --git a/sql/test/BugTracker-2012/Tests/hash_join_crash.Bug-3089.stable.out
b/sql/test/BugTracker-2012/Tests/hash_join_crash.Bug-3089.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/hash_join_crash.Bug-3089.stable.out
@@ -0,0 +1,39 @@
+stdout of test 'hash_join_crash.Bug-3089` in directory 'test/BugTracker-2012`
itself:
+
+
+# 09:10:21 >
+# 09:10:21 > "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=38474" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2012"
"--set" "mal_listing=0"
+# 09:10:21 >
+
+# MonetDB 5 server v11.9.2
+# 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:38474/
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 09:10:22 >
+# 09:10:22 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=38474"
+# 09:10:22 >
+
+#create table test1 ( id int, seq int, name varchar(20), primary key (id,
seq));
+#create table test2 ( id int not null, seq int not null, name varchar(20));
+#select * from test1 a, test2 b where a.id = b.id and b.seq = a.seq;
+% sys.a, sys.a, sys.a, sys.b, sys.b, sys.b # table_name
+% id, seq, name, id, seq, name # name
+% int, int, varchar, int, int, varchar # type
+% 1, 1, 0, 1, 1, 0 # length
+#drop table test2;
+#drop table test1;
+
+# 09:10:22 >
+# 09:10:22 > "Done."
+# 09:10:22 >
+
diff --git a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.sql
b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.sql
@@ -0,0 +1,2 @@
+select * from tables where 1;
+select * from tables where name;
diff --git
a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err
b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'predicate_select.Bug-3090` in directory 'test/BugTracker-2012`
itself:
+
+
+# 18:53:13 >
+# 18:53:13 > "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=32323" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2012"
"--set" "mal_listing=0"
+# 18:53:13 >
+
+# 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 = 32323
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_test_BugTracker-2012
+# cmdline opt mal_listing = 0
+
+# 18:53:13 >
+# 18:53:13 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=32323"
+# 18:53:13 >
+
+
+# 18:53:13 >
+# 18:53:13 > "Done."
+# 18:53:13 >
+
diff --git
a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
@@ -0,0 +1,102 @@
+stdout of test 'predicate_select.Bug-3090` in directory 'test/BugTracker-2012`
itself:
+
+
+# 18:53:13 >
+# 18:53:13 > "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=32323" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2012"
"--set" "mal_listing=0"
+# 18:53:13 >
+
+# MonetDB 5 server v11.9.2
+# 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:32323/
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
