Changeset: 63b48b9be801 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=63b48b9be801
Added Files:
sql/test/BugTracker-2014/Tests/crash_on_groupby_distinct_serial.Bug-3463.sql
sql/test/BugTracker-2014/Tests/crash_on_groupby_distinct_serial.Bug-3463.stable.err
sql/test/BugTracker-2014/Tests/crash_on_groupby_distinct_serial.Bug-3463.stable.out
sql/test/BugTracker-2014/Tests/crash_on_or_with_in.Bug-3461.sql
sql/test/BugTracker-2014/Tests/crash_on_or_with_in.Bug-3461.stable.err
sql/test/BugTracker-2014/Tests/crash_on_or_with_in.Bug-3461.stable.out
sql/test/BugTracker-2014/Tests/in_incorrect_multi.Bug-3462.sql
sql/test/BugTracker-2014/Tests/in_incorrect_multi.Bug-3462.stable.err
sql/test/BugTracker-2014/Tests/in_incorrect_multi.Bug-3462.stable.out
Modified Files:
sql/server/rel_optimizer.c
sql/server/rel_select.c
sql/test/BugTracker-2014/Tests/All
sql/test/BugTracker-2014/Tests/select-having.Bug-3458.stable.err
sql/test/BugTracker-2014/Tests/select-having.Bug-3458.stable.out
Branch: default
Log Message:
Merge with Jan2014 branch.
diffs (truncated from 430 to 300 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
@@ -3912,7 +3912,11 @@ rel_reduce_groupby_exps(int *changes, mv
if (scores[l] == -1 &&
exp_match_exp(e,gb)) {
sql_column *c =
exp_find_column_(rel, e, -2, &bt);
- sql_exp *rs =
exp_column(sql->sa, rnme, c->base.name, exp_subtype(e), rel->card, has_nil(e),
is_intern(e));
+ sql_exp *rs;
+
+ if (!c)
+ c =
exp_find_column_(rel, gb, -2, &bt);
+ rs =
exp_column(sql->sa, rnme, c->base.name, exp_subtype(e), rel->card, has_nil(e),
is_intern(e));
exp_setname(sql->sa, rs, exp_find_rel_name(e), exp_name(e));
append(r->exps,
rs);
fnd = 1;
@@ -4760,8 +4764,9 @@ rel_remove_unused(mvc *sql, sql_rel *rel
if (e->used)
append(exps, e);
}
- /* atleast one (needed for crossproducts, count(*),
rank() and single value projections) !, handled by exps_mark_used */
- assert(list_length(exps) > 0);
+ /* atleast one (needed for crossproducts, count(*),
rank() and single value projections) */
+ if (list_length(exps) <= 0)
+ append(exps, rel->exps->h->data);
rel->exps = exps;
}
return rel;
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
@@ -616,7 +616,6 @@ rel_project(sql_allocator *sa, sql_rel *
if (l) {
rel->card = l->card;
rel->nrcols = l->nrcols;
- //assert (exps_card(rel->exps) <= rel->card);
}
return rel;
}
@@ -2913,7 +2912,7 @@ rel_logical_exp(mvc *sql, sql_rel *rel,
l->card != CARD_ATOM && has_nil(l)) {
e = rel_unop_(sql, l, NULL, "isnull", card_value);
e = exp_compare(sql->sa, e, exp_atom_bool(sql->sa, 0),
cmp_equal);
- if (!is_select(rel->op) && !rel_is_ref(rel))
+ if (!is_select(rel->op))
left = rel = rel_select(sql->sa, rel, e);
else
rel_select_add_exp(sql->sa, rel, e);
@@ -2962,6 +2961,8 @@ rel_logical_exp(mvc *sql, sql_rel *rel,
r = rel_value_exp(sql, &z, sval, f, ek);
if (z)
r_is_rel = 1;
+ if (z && is_project(z->op) &&
list_length(z->exps) != 1)
+ return sql_error(sql, 02, "IN:
iinner query should return a single column");
if (!r && sql->session->status !=
-ERR_AMBIGUOUS) {
/* reset error */
sql->session->status = 0;
diff --git a/sql/test/BugTracker-2014/Tests/All
b/sql/test/BugTracker-2014/Tests/All
--- a/sql/test/BugTracker-2014/Tests/All
+++ b/sql/test/BugTracker-2014/Tests/All
@@ -12,3 +12,6 @@ utf8bom.Bug-3436
left-outer-join-with-and.Bug-3444
setreadonly_forgets_changes.Bug-3446
select-having.Bug-3458
+crash_on_or_with_in.Bug-3461
+in_incorrect_multi.Bug-3462
+crash_on_groupby_distinct_serial.Bug-3463
diff --git
a/sql/test/BugTracker-2014/Tests/crash_on_groupby_distinct_serial.Bug-3463.sql
b/sql/test/BugTracker-2014/Tests/crash_on_groupby_distinct_serial.Bug-3463.sql
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2014/Tests/crash_on_groupby_distinct_serial.Bug-3463.sql
@@ -0,0 +1,3 @@
+CREATE TABLE test (a int, b int, c serial);
+SELECT a as t, count(distinct c) FROM test GROUP BY t;
+drop table test;
diff --git
a/sql/test/BugTracker-2014/Tests/crash_on_groupby_distinct_serial.Bug-3463.stable.err
b/sql/test/BugTracker-2014/Tests/crash_on_groupby_distinct_serial.Bug-3463.stable.err
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2014/Tests/crash_on_groupby_distinct_serial.Bug-3463.stable.err
@@ -0,0 +1,35 @@
+stderr of test 'crash_on_groupby_distinct_serial.Bug-3463` in directory
'sql/test/BugTracker-2014` itself:
+
+
+# 12:20:38 >
+# 12:20:38 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38842" "--set"
"mapi_usock=/var/tmp/mtest-18464/.s.monetdb.38842" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2014"
"--set" "mal_listing=0"
+# 12:20:38 >
+
+# 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 = 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 = 38842
+# cmdline opt mapi_usock = /var/tmp/mtest-18464/.s.monetdb.38842
+# 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-2014
+# cmdline opt mal_listing = 0
+
+# 12:20:39 >
+# 12:20:39 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-18464" "--port=38842"
+# 12:20:39 >
+
+
+# 12:20:39 >
+# 12:20:39 > "Done."
+# 12:20:39 >
+
diff --git
a/sql/test/BugTracker-2014/Tests/crash_on_groupby_distinct_serial.Bug-3463.stable.out
b/sql/test/BugTracker-2014/Tests/crash_on_groupby_distinct_serial.Bug-3463.stable.out
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2014/Tests/crash_on_groupby_distinct_serial.Bug-3463.stable.out
@@ -0,0 +1,39 @@
+stdout of test 'crash_on_groupby_distinct_serial.Bug-3463` in directory
'sql/test/BugTracker-2014` itself:
+
+
+# 12:20:38 >
+# 12:20:38 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38842" "--set"
"mapi_usock=/var/tmp/mtest-18464/.s.monetdb.38842" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2014"
"--set" "mal_listing=0"
+# 12:20:38 >
+
+# MonetDB 5 server v11.17.14
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2014', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 7.334 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://localhost.nes.nl:38842/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-18464/.s.monetdb.38842
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 12:20:39 >
+# 12:20:39 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-18464" "--port=38842"
+# 12:20:39 >
+
+#CREATE TABLE test (a int, b int, c serial);
+#SELECT a as t, count(distinct c) FROM test GROUP BY t;
+% sys.test, sys.L1 # table_name
+% t, L1 # name
+% int, wrd # type
+% 1, 1 # length
+#drop table test;
+
+# 12:20:39 >
+# 12:20:39 > "Done."
+# 12:20:39 >
+
diff --git a/sql/test/BugTracker-2014/Tests/crash_on_or_with_in.Bug-3461.sql
b/sql/test/BugTracker-2014/Tests/crash_on_or_with_in.Bug-3461.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/crash_on_or_with_in.Bug-3461.sql
@@ -0,0 +1,3 @@
+SELECT * FROM SYS.ARGS
+ WHERE FUNC_ID NOT IN (SELECT ID FROM SYS.FUNCTIONS)
+ OR FUNC_ID NOT IN (SELECT ID FROM SYS.FUNCTIONS);
diff --git
a/sql/test/BugTracker-2014/Tests/crash_on_or_with_in.Bug-3461.stable.err
b/sql/test/BugTracker-2014/Tests/crash_on_or_with_in.Bug-3461.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/crash_on_or_with_in.Bug-3461.stable.err
@@ -0,0 +1,35 @@
+stderr of test 'crash_on_or_with_in.Bug-3461` in directory
'sql/test/BugTracker-2014` itself:
+
+
+# 14:17:10 >
+# 14:17:10 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39561" "--set"
"mapi_usock=/var/tmp/mtest-1586/.s.monetdb.39561" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2014"
"--set" "mal_listing=0"
+# 14:17:10 >
+
+# 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 = 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 = 39561
+# cmdline opt mapi_usock = /var/tmp/mtest-1586/.s.monetdb.39561
+# 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-2014
+# cmdline opt mal_listing = 0
+
+# 14:17:10 >
+# 14:17:10 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-1586" "--port=39561"
+# 14:17:10 >
+
+
+# 14:17:10 >
+# 14:17:10 > "Done."
+# 14:17:10 >
+
diff --git
a/sql/test/BugTracker-2014/Tests/crash_on_or_with_in.Bug-3461.stable.out
b/sql/test/BugTracker-2014/Tests/crash_on_or_with_in.Bug-3461.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/crash_on_or_with_in.Bug-3461.stable.out
@@ -0,0 +1,39 @@
+stdout of test 'crash_on_or_with_in.Bug-3461` in directory
'sql/test/BugTracker-2014` itself:
+
+
+# 14:17:10 >
+# 14:17:10 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39561" "--set"
"mapi_usock=/var/tmp/mtest-1586/.s.monetdb.39561" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2014"
"--set" "mal_listing=0"
+# 14:17:10 >
+
+# MonetDB 5 server v11.17.14
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2014', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 7.334 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://localhost.nes.nl:39561/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-1586/.s.monetdb.39561
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 14:17:10 >
+# 14:17:10 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-1586" "--port=39561"
+# 14:17:10 >
+
+#SELECT * FROM SYS.ARGS
+# WHERE FUNC_ID NOT IN (SELECT ID FROM SYS.FUNCTIONS)
+# OR FUNC_ID NOT IN (SELECT ID FROM SYS.FUNCTIONS);
+% .args, .args, .args, .args, .args, .args, .args # table_name
+% id, func_id, name, type, type_digits, type_scale, number
# name
+% int, int, varchar, varchar, int, int, int # type
+% 1, 1, 0, 0, 1, 1, 1 # length
+
+# 14:17:10 >
+# 14:17:10 > "Done."
+# 14:17:10 >
+
diff --git a/sql/test/BugTracker-2014/Tests/in_incorrect_multi.Bug-3462.sql
b/sql/test/BugTracker-2014/Tests/in_incorrect_multi.Bug-3462.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/in_incorrect_multi.Bug-3462.sql
@@ -0,0 +1,4 @@
+SELECT * FROM SYS.ARGS
+ WHERE FUNC_ID NOT IN (SELECT * FROM SYS.FUNCTIONS);
+SELECT * FROM SYS.ARGS
+ WHERE FUNC_ID NOT IN (SELECT FUNC_ID FROM SYS.FUNCTIONS);
diff --git
a/sql/test/BugTracker-2014/Tests/in_incorrect_multi.Bug-3462.stable.err
b/sql/test/BugTracker-2014/Tests/in_incorrect_multi.Bug-3462.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/in_incorrect_multi.Bug-3462.stable.err
@@ -0,0 +1,39 @@
+stderr of test 'in_incorrect_multi.Bug-3462` in directory
'sql/test/BugTracker-2014` itself:
+
+
+# 14:17:10 >
+# 14:17:10 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39561" "--set"
"mapi_usock=/var/tmp/mtest-1586/.s.monetdb.39561" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2014"
"--set" "mal_listing=0"
+# 14:17:10 >
+
+# 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 = 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 = 39561
+# cmdline opt mapi_usock = /var/tmp/mtest-1586/.s.monetdb.39561
+# 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-2014
+# cmdline opt mal_listing = 0
+
+# 14:17:11 >
+# 14:17:11 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-1586" "--port=39561"
+# 14:17:11 >
+
+MAPI = (monetdb) /var/tmp/mtest-1586/.s.monetdb.39561
+QUERY = SELECT * FROM SYS.ARGS
+ WHERE FUNC_ID NOT IN (SELECT * FROM SYS.FUNCTIONS);
+ERROR = !IN: iinner query should return a single column
+
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
