Changeset: c150cc9de5d5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c150cc9de5d5
Added Files:
sql/test/BugTracker-2017/Tests/crash_in_in_handling.Bug-6260.sql
sql/test/BugTracker-2017/Tests/crash_in_in_handling.Bug-6260.stable.err
sql/test/BugTracker-2017/Tests/crash_in_in_handling.Bug-6260.stable.out
Modified Files:
sql/server/rel_select.c
sql/test/BugTracker-2016/Tests/storagemodel.stable.out
sql/test/BugTracker-2017/Tests/All
Branch: Dec2016
Log Message:
fixed bug 6260, ie crash in the in type checking.
approved output (properties aren't stable?)
diffs (153 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
@@ -2054,7 +2054,7 @@ rel_logical_value_exp(mvc *sql, sql_rel
sql_rel *z = NULL, *rl;
r = rel_value_exp(sql, &z, sval, f, ek);
- if (l && IS_ANY(st->type->eclass)){
+ if (l && r && IS_ANY(st->type->eclass)){
l = rel_check_type(sql, exp_subtype(r),
l, type_equal);
if (l)
st = exp_subtype(l);
diff --git a/sql/test/BugTracker-2016/Tests/storagemodel.stable.out
b/sql/test/BugTracker-2016/Tests/storagemodel.stable.out
--- a/sql/test/BugTracker-2016/Tests/storagemodel.stable.out
+++ b/sql/test/BugTracker-2016/Tests/storagemodel.stable.out
@@ -100,7 +100,7 @@ Ready.
[ "sys", "_tables", "name", "varchar", "writable", 8,
0, false, 0, false ]
[ "sys", "_tables", "schema_id", "int", "writable", 4,
0, false, 0, NULL ]
[ "sys", "_tables", "query", "varchar", "writable",
45, 0, false, 0, NULL ]
-[ "sys", "_tables", "type", "smallint", "writable", 2,
0, false, 0, NULL ]
+[ "sys", "_tables", "type", "smallint", "writable", 2,
0, false, 0, false ]
[ "sys", "_tables", "system", "boolean", "writable",
1, 0, false, 0, NULL ]
[ "sys", "_tables", "commit_action", "smallint",
"writable", 2, 0, false, 0, NULL ]
[ "sys", "_tables", "access", "smallint", "writable",
2, 0, false, 0, true ]
diff --git a/sql/test/BugTracker-2017/Tests/All
b/sql/test/BugTracker-2017/Tests/All
--- a/sql/test/BugTracker-2017/Tests/All
+++ b/sql/test/BugTracker-2017/Tests/All
@@ -33,3 +33,4 @@ fullouterjoinfilter.Bug-6256
wrong_aggregation_count.Bug-6257
select.Bug-6259
function_and_mergetable.Bug-6288
+crash_in_in_handling.Bug-6260
diff --git a/sql/test/BugTracker-2017/Tests/crash_in_in_handling.Bug-6260.sql
b/sql/test/BugTracker-2017/Tests/crash_in_in_handling.Bug-6260.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2017/Tests/crash_in_in_handling.Bug-6260.sql
@@ -0,0 +1,16 @@
+CREATE TABLE tab0(pk INTEGER PRIMARY KEY, col0 INTEGER, col1 FLOAT, col2 TEXT,
col3 INTEGER, col4 FLOAT, col5 TEXT);
+
+INSERT INTO tab0 VALUES(0,698,169.42,'apdbu',431,316.15,'sqvis');
+INSERT INTO tab0 VALUES(1,538,676.36,'fuqeu',514,685.97,'bgwrq');
+INSERT INTO tab0 VALUES(2,90,205.26,'yrrzx',123,836.88,'kpuhc');
+INSERT INTO tab0 VALUES(3,620,864.8,'myrdv',877,820.98,'oxkuv');
+INSERT INTO tab0 VALUES(4,754,677.3,'iofrg',67,665.49,'bzqba');
+INSERT INTO tab0 VALUES(5,107,710.19,'lhfro',286,504.28,'kwwsg');
+INSERT INTO tab0 VALUES(6,904,193.16,'eozui',48,698.55,'ejyzs');
+INSERT INTO tab0 VALUES(7,606,650.64,'ovmce',417,962.43,'dvkbh');
+INSERT INTO tab0 VALUES(8,535,18.11,'ijika',630,489.63,'hpnyu');
+INSERT INTO tab0 VALUES(9,501,776.40,'cvygg',725,75.5,'etlyv');
+
+SELECT * FROM tab0 AS cor0 WHERE NOT NULL IN ( col3 );
+
+drop table tab0;
diff --git
a/sql/test/BugTracker-2017/Tests/crash_in_in_handling.Bug-6260.stable.err
b/sql/test/BugTracker-2017/Tests/crash_in_in_handling.Bug-6260.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2017/Tests/crash_in_in_handling.Bug-6260.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'crash_in_in_handling.Bug-6260` in directory
'sql/test/BugTracker-2017` itself:
+
+
+# 14:07:27 >
+# 14:07:27 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39677" "--set"
"mapi_usock=/var/tmp/mtest-29945/.s.monetdb.39677" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017"
+# 14:07:27 >
+
+# 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 = 39677
+# cmdline opt mapi_usock = /var/tmp/mtest-29945/.s.monetdb.39677
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017
+# cmdline opt gdk_debug = 536870922
+
+# 14:07:27 >
+# 14:07:27 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-29945" "--port=39677"
+# 14:07:27 >
+
+MAPI = (monetdb) /var/tmp/mtest-29945/.s.monetdb.39677
+QUERY = SELECT * FROM tab0 AS cor0 WHERE NOT NULL IN ( col3 );
+ERROR = !SELECT: identifier 'col3' unknown
+
+# 14:07:27 >
+# 14:07:27 > "Done."
+# 14:07:27 >
+
diff --git
a/sql/test/BugTracker-2017/Tests/crash_in_in_handling.Bug-6260.stable.out
b/sql/test/BugTracker-2017/Tests/crash_in_in_handling.Bug-6260.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2017/Tests/crash_in_in_handling.Bug-6260.stable.out
@@ -0,0 +1,53 @@
+stdout of test 'crash_in_in_handling.Bug-6260` in directory
'sql/test/BugTracker-2017` itself:
+
+
+# 14:07:27 >
+# 14:07:27 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39677" "--set"
"mapi_usock=/var/tmp/mtest-29945/.s.monetdb.39677" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017"
+# 14:07:27 >
+
+# MonetDB 5 server v11.25.10
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2017', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers
+# Found 7.332 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://localhost.nes.nl:39677/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-29945/.s.monetdb.39677
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 14:07:27 >
+# 14:07:27 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-29945" "--port=39677"
+# 14:07:27 >
+
+#CREATE TABLE tab0(pk INTEGER PRIMARY KEY, col0 INTEGER, col1 FLOAT, col2
TEXT, col3 INTEGER, col4 FLOAT, col5 TEXT);
+#INSERT INTO tab0 VALUES(0,698,169.42,'apdbu',431,316.15,'sqvis');
+[ 1 ]
+#INSERT INTO tab0 VALUES(1,538,676.36,'fuqeu',514,685.97,'bgwrq');
+[ 1 ]
+#INSERT INTO tab0 VALUES(2,90,205.26,'yrrzx',123,836.88,'kpuhc');
+[ 1 ]
+#INSERT INTO tab0 VALUES(3,620,864.8,'myrdv',877,820.98,'oxkuv');
+[ 1 ]
+#INSERT INTO tab0 VALUES(4,754,677.3,'iofrg',67,665.49,'bzqba');
+[ 1 ]
+#INSERT INTO tab0 VALUES(5,107,710.19,'lhfro',286,504.28,'kwwsg');
+[ 1 ]
+#INSERT INTO tab0 VALUES(6,904,193.16,'eozui',48,698.55,'ejyzs');
+[ 1 ]
+#INSERT INTO tab0 VALUES(7,606,650.64,'ovmce',417,962.43,'dvkbh');
+[ 1 ]
+#INSERT INTO tab0 VALUES(8,535,18.11,'ijika',630,489.63,'hpnyu');
+[ 1 ]
+#INSERT INTO tab0 VALUES(9,501,776.40,'cvygg',725,75.5,'etlyv');
+[ 1 ]
+#drop table tab0;
+
+# 14:07:27 >
+# 14:07:27 > "Done."
+# 14:07:27 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
