Changeset: 9ddf37267b1c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9ddf37267b1c
Added Files:
sql/test/BugTracker-2018/Tests/sqlitelogictest-bat-undefined.Bug-6516.stable.err
sql/test/BugTracker-2018/Tests/sqlitelogictest-bat-undefined.Bug-6516.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-overflow-in-conversion.Bug-6517.stable.err
sql/test/BugTracker-2018/Tests/sqlitelogictest-overflow-in-conversion.Bug-6517.stable.out
Modified Files:
sql/server/rel_select.c
Branch: Jul2017
Log Message:
fixes for bugs 6516 and 6517, improved type checking in the 'IN/NOT IN' cases
diffs (209 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
@@ -2152,7 +2152,7 @@ rel_logical_value_exp(mvc *sql, sql_rel
r = NULL;
}
}
- if (!l || !r || !(r=rel_check_type(sql, st, r,
type_equal))) {
+ if (!l || !r || (z && !(r=rel_check_type(sql,
st, r, type_equal)))) {
rel_destroy(right);
return NULL;
}
@@ -2186,6 +2186,8 @@ rel_logical_value_exp(mvc *sql, sql_rel
for(n=vals->h; n; n = n->next) {
sql_exp *r = n->data, *ne;
+ if (rel_convert_types(sql, &l, &r, 1,
type_equal) < 0)
+ return NULL;
if (sc->token == SQL_NOT_IN)
ne = rel_binop_(sql, l, r,
NULL, "<>", card_value);
else
@@ -2651,6 +2653,8 @@ rel_logical_exp(mvc *sql, sql_rel *rel,
if (z) {
rl = z;
} else {
+ if (rel_convert_types(sql, &l,
&r, 1, type_equal) < 0)
+ return NULL;
rl = rel_project_exp(sql->sa,
exp_label(sql->sa, r, ++sql->label));
r = exp_column(sql->sa,
exp_relname(r), exp_name(r), exp_subtype(r), r->card, has_nil(r), is_intern(r));
if (l_is_value && r_is_rel) {
diff --git
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-bat-undefined.Bug-6516.stable.err
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-bat-undefined.Bug-6516.stable.err
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-bat-undefined.Bug-6516.stable.err
@@ -0,0 +1,34 @@
+stderr of test 'sqlitelogictest-bat-undefined.Bug-6516` in directory
'sql/test/BugTracker-2018` itself:
+
+
+# 21:18:54 >
+# 21:18:54 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32808" "--set"
"mapi_usock=/var/tmp/mtest-30152/.s.monetdb.32808" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018"
+# 21:18:54 >
+
+# builtin opt gdk_dbpath =
/home/niels/scratch/rc-monetdb/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 = 32808
+# cmdline opt mapi_usock = /var/tmp/mtest-30152/.s.monetdb.32808
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018
+# cmdline opt gdk_debug = 553648138
+
+# 21:18:55 >
+# 21:18:55 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-30152" "--port=32808"
+# 21:18:55 >
+
+
+# 21:18:55 >
+# 21:18:55 > "Done."
+# 21:18:55 >
+
diff --git
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-bat-undefined.Bug-6516.stable.out
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-bat-undefined.Bug-6516.stable.out
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-bat-undefined.Bug-6516.stable.out
@@ -0,0 +1,44 @@
+stdout of test 'sqlitelogictest-bat-undefined.Bug-6516` in directory
'sql/test/BugTracker-2018` itself:
+
+
+# 21:18:54 >
+# 21:18:54 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32808" "--set"
"mapi_usock=/var/tmp/mtest-30152/.s.monetdb.32808" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018"
+# 21:18:54 >
+
+# MonetDB 5 server v11.27.6
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2018', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers
+# Found 7.324 GiB available main-memory.
+# Copyright (c) 1993 - July 2008 CWI.
+# Copyright (c) August 2008 - 2018 MonetDB B.V., all rights reserved
+# Visit https://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://localhost.nes.nl:32808/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-30152/.s.monetdb.32808
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 21:18:55 >
+# 21:18:55 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-30152" "--port=32808"
+# 21:18:55 >
+
+#CREATE TABLE tab1(col0 INTEGER, col1 INTEGER, col2 INTEGER);
+#INSERT INTO tab1 VALUES(51,14,96);
+[ 1 ]
+#INSERT INTO tab1 VALUES(85,5,59);
+[ 1 ]
+#INSERT INTO tab1 VALUES(91,47,68);
+[ 1 ]
+#SELECT DISTINCT * FROM tab1 AS cor0 WHERE ( col0 ) NOT IN ( + col0, 70 );
+% sys.cor0, sys.cor0, sys.cor0 # table_name
+% col0, col1, col2 # name
+% int, int, int # type
+% 1, 1, 1 # length
+#DROP TABLE tab1;
+
+# 21:18:55 >
+# 21:18:55 > "Done."
+# 21:18:55 >
+
diff --git
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-overflow-in-conversion.Bug-6517.stable.err
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-overflow-in-conversion.Bug-6517.stable.err
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-overflow-in-conversion.Bug-6517.stable.err
@@ -0,0 +1,34 @@
+stderr of test 'sqlitelogictest-overflow-in-conversion.Bug-6517` in directory
'sql/test/BugTracker-2018` itself:
+
+
+# 21:18:55 >
+# 21:18:55 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32808" "--set"
"mapi_usock=/var/tmp/mtest-30152/.s.monetdb.32808" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018"
+# 21:18:55 >
+
+# builtin opt gdk_dbpath =
/home/niels/scratch/rc-monetdb/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 = 32808
+# cmdline opt mapi_usock = /var/tmp/mtest-30152/.s.monetdb.32808
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018
+# cmdline opt gdk_debug = 553648138
+
+# 21:18:55 >
+# 21:18:55 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-30152" "--port=32808"
+# 21:18:55 >
+
+
+# 21:18:55 >
+# 21:18:55 > "Done."
+# 21:18:55 >
+
diff --git
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-overflow-in-conversion.Bug-6517.stable.out
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-overflow-in-conversion.Bug-6517.stable.out
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-overflow-in-conversion.Bug-6517.stable.out
@@ -0,0 +1,47 @@
+stdout of test 'sqlitelogictest-overflow-in-conversion.Bug-6517` in directory
'sql/test/BugTracker-2018` itself:
+
+
+# 21:18:55 >
+# 21:18:55 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32808" "--set"
"mapi_usock=/var/tmp/mtest-30152/.s.monetdb.32808" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018"
+# 21:18:55 >
+
+# MonetDB 5 server v11.27.6
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2018', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers
+# Found 7.324 GiB available main-memory.
+# Copyright (c) 1993 - July 2008 CWI.
+# Copyright (c) August 2008 - 2018 MonetDB B.V., all rights reserved
+# Visit https://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://localhost.nes.nl:32808/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-30152/.s.monetdb.32808
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 21:18:55 >
+# 21:18:55 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-30152" "--port=32808"
+# 21:18:55 >
+
+#CREATE TABLE tab1(col0 INTEGER, col1 INTEGER, col2 INTEGER);
+#INSERT INTO tab1 VALUES(51,14,96);
+[ 1 ]
+#INSERT INTO tab1 VALUES(85,5,59);
+[ 1 ]
+#INSERT INTO tab1 VALUES(91,47,68);
+[ 1 ]
+#SELECT - col1 FROM tab1 WHERE NOT - 86 IN ( 47 * - 49 + 22 );
+% sys.L3 # table_name
+% L3 # name
+% int # type
+% 3 # length
+[ -14 ]
+[ -5 ]
+[ -47 ]
+#DROP TABLE tab1;
+
+# 21:18:55 >
+# 21:18:55 > "Done."
+# 21:18:55 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
