Changeset: 99b2bffa6931 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=99b2bffa6931
Added Files:
sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.stable.err
sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.stable.out
Modified Files:
sql/backends/monet5/rel_bin.c
sql/server/sql_mvc.c
sql/server/sql_mvc.h
sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.out
sql/test/mergetables/Tests/mergequery.stable.out
Branch: Mar2018
Log Message:
fixed bug 6601
diffs (truncated from 395 to 300 lines):
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -1506,7 +1506,7 @@ rel2bin_table(backend *be, sql_rel *rel,
int i;
char name[16], *nme;
- nme = number2name(name, 16, ++sql->label);
+ nme = number2name(name, 16, ++sql->remote);
l = rel2bin_args(be, rel->l, sa_list(sql->sa));
sub = stmt_list(be, l);
diff --git a/sql/server/sql_mvc.c b/sql/server/sql_mvc.c
--- a/sql/server/sql_mvc.c
+++ b/sql/server/sql_mvc.c
@@ -626,6 +626,7 @@ mvc_create(int clientid, backend_stack s
m->history = 0;
m->label = 0;
+ m->remote = 0;
m->cascade_action = NULL;
for(i=0;i<MAXSTATS;i++)
m->opt_stats[i] = 0;
@@ -707,6 +708,7 @@ mvc_reset(mvc *m, bstream *rs, stream *w
m->history = 0;
m->label = 0;
+ m->remote = 0;
m->cascade_action = NULL;
m->type = Q_PARSE;
m->pushdown = 1;
diff --git a/sql/server/sql_mvc.h b/sql/server/sql_mvc.h
--- a/sql/server/sql_mvc.h
+++ b/sql/server/sql_mvc.h
@@ -128,6 +128,7 @@ typedef struct mvc {
int type; /* query type */
int pushdown; /* AND or OR query handling */
int label; /* numbers for relational projection labels */
+ int remote;
list *cascade_action; /* protection against recursive cascade actions
*/
int opt_stats[MAXSTATS];/* keep statistics about optimizer rewrites */
diff --git a/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.out
b/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.out
--- a/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.out
+++ b/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.out
@@ -27,7 +27,7 @@ Ready.
# 11:19:25 > "/usr/bin/python2" "schemadiff.Bug-3778.SQL.py"
"schemadiff.Bug-3778"
# 11:19:25 >
-(mapi:monetdb://monetdb@localhost/worker_0) 'user.l4' undefined in:
rmt5_X_2_bat_int:bat[:int] := user.l4();
+(mapi:monetdb://monetdb@localhost/worker_0) 'user.l1' undefined in:
rmt5_X_2_bat_int:bat[:int] := user.l1();
# 11:19:26 >
diff --git
a/sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.stable.err
b/sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.stable.err
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.stable.err
@@ -0,0 +1,69 @@
+stderr of test 'remote-table-where-is-null.Bug-6601` in directory
'sql/test/BugTracker-2018` itself:
+
+
+# 12:25:26 >
+# 12:25:26 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34060" "--set"
"mapi_usock=/var/tmp/mtest-30679/.s.monetdb.34060" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-old/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018"
"--set" "embedded_c=true"
+# 12:25:26 >
+
+# builtin opt gdk_dbpath =
/home/niels/scratch/rc-old/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 = 34060
+# cmdline opt mapi_usock = /var/tmp/mtest-30679/.s.monetdb.34060
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-old/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018
+# cmdline opt embedded_c = true
+# cmdline opt gdk_debug = 553648138
+
+# 12:25:26 >
+# 12:25:26 > "/usr/bin/python" "remote-table-where-is-null.Bug-6601.SQL.py"
"remote-table-where-is-null.Bug-6601"
+# 12:25:26 >
+
+# builtin opt gdk_dbpath =
/home/niels/scratch/rc-old/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 monet_prompt =
+# cmdline opt mapi_port = 50445
+# cmdline opt mapi_usock = /var/tmp/mtest-30679/.s.monetdb.50445
+# cmdline opt gdk_dbpath = /tmp/tmpSTv8KR/node1/node1
+# cmdline opt gdk_debug = 553648138
+# builtin opt gdk_dbpath =
/home/niels/scratch/rc-old/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 monet_prompt =
+# cmdline opt mapi_port = 53215
+# cmdline opt mapi_usock = /var/tmp/mtest-30679/.s.monetdb.53215
+# cmdline opt gdk_dbpath = /tmp/tmpSTv8KR/node2/node2
+# cmdline opt gdk_debug = 553648138
+
+# 12:25:28 >
+# 12:25:28 > "Done."
+# 12:25:28 >
+
diff --git
a/sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.stable.out
b/sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.stable.out
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.stable.out
@@ -0,0 +1,48 @@
+stdout of test 'remote-table-where-is-null.Bug-6601` in directory
'sql/test/BugTracker-2018` itself:
+
+
+# 12:25:26 >
+# 12:25:26 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34060" "--set"
"mapi_usock=/var/tmp/mtest-30679/.s.monetdb.34060" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-old/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018"
"--set" "embedded_c=true"
+# 12:25:26 >
+
+# MonetDB 5 server v11.29.4
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2018', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers
+# Found 15.386 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://xps13:34060/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-30679/.s.monetdb.34060
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 12:25:26 >
+# 12:25:26 > "/usr/bin/python" "remote-table-where-is-null.Bug-6601.SQL.py"
"remote-table-where-is-null.Bug-6601"
+# 12:25:26 >
+
+# node1: CREATE TABLE tbl (id INT, name TEXT)
+# node1: INSERT INTO tbl VALUES (1, '1')
+# node1: INSERT INTO tbl VALUES (2, '2')
+# node1: INSERT INTO tbl (id) VALUES (3)
+# node1: SELECT * FROM tbl
+[(1, u'1'), (2, u'2'), (3, None)]
+# node1: SELECT * FROM tbl WHERE NAME IS NULL
+[(3, None)]
+# node1: SELECT * FROM tbl
+[(1, u'1'), (2, u'2'), (3, None)]
+# node2: CREATE REMOTE TABLE tbl (id INT, name TEXT) on
'mapi:monetdb://localhost:50445/node1/sys/tbl'
+# node2: SELECT * FROM tbl
+[(1, u'1'), (2, u'2'), (3, None)]
+# node2: SELECT * FROM tbl WHERE NAME IS NULL
+[(3, None)]
+# node2: SELECT * FROM tbl
+[(1, u'1'), (2, u'2'), (3, None)]
+
+# 12:25:28 >
+# 12:25:28 > "Done."
+# 12:25:28 >
+
diff --git a/sql/test/mergetables/Tests/mergequery.stable.out
b/sql/test/mergetables/Tests/mergequery.stable.out
--- a/sql/test/mergetables/Tests/mergequery.stable.out
+++ b/sql/test/mergetables/Tests/mergequery.stable.out
@@ -91,13 +91,29 @@ Ready.
% 142 # length
function user.s22_1():void;
X_3:void := querylog.define("explain insert into answ\nselect * from
complete where x>=1.0 and x <=2.0;":str, "default_pipe":str, 66:int);
-barrier X_155:bit := language.dataflow();
+barrier X_235:bit := language.dataflow();
X_74:bat[:dbl] := bat.new(nil:dbl);
X_6:int := sql.mvc();
- X_10:bat[:dbl] := sql.bind(X_6:int, "sys":str, "part1":str, "x":str,
0:int);
- C_7:bat[:oid] := sql.tid(X_6:int, "sys":str, "part1":str);
- C_38:bat[:oid] := algebra.select(X_10:bat[:dbl], C_7:bat[:oid], 1:dbl,
2:dbl, true:bit, true:bit, false:bit);
- X_42:bat[:dbl] := algebra.projection(C_38:bat[:oid], X_10:bat[:dbl]);
+ X_155:bat[:dbl] := sql.bind(X_6:int, "sys":str, "part1":str, "x":str,
0:int, 0:int, 4:int);
+ C_148:bat[:oid] := sql.tid(X_6:int, "sys":str, "part1":str, 0:int, 4:int);
+ C_197:bat[:oid] := algebra.select(X_155:bat[:dbl], C_148:bat[:oid], 1:dbl,
2:dbl, true:bit, true:bit, false:bit);
+ X_201:bat[:dbl] := algebra.projection(C_197:bat[:oid], X_155:bat[:dbl]);
+ X_156:bat[:dbl] := sql.bind(X_6:int, "sys":str, "part1":str, "x":str,
0:int, 1:int, 4:int);
+ C_150:bat[:oid] := sql.tid(X_6:int, "sys":str, "part1":str, 1:int, 4:int);
+ C_198:bat[:oid] := algebra.select(X_156:bat[:dbl], C_150:bat[:oid], 1:dbl,
2:dbl, true:bit, true:bit, false:bit);
+ X_202:bat[:dbl] := algebra.projection(C_198:bat[:oid], X_156:bat[:dbl]);
+ X_157:bat[:dbl] := sql.bind(X_6:int, "sys":str, "part1":str, "x":str,
0:int, 2:int, 4:int);
+ C_152:bat[:oid] := sql.tid(X_6:int, "sys":str, "part1":str, 2:int, 4:int);
+ C_199:bat[:oid] := algebra.select(X_157:bat[:dbl], C_152:bat[:oid], 1:dbl,
2:dbl, true:bit, true:bit, false:bit);
+ X_203:bat[:dbl] := algebra.projection(C_199:bat[:oid], X_157:bat[:dbl]);
+ X_158:bat[:dbl] := sql.bind(X_6:int, "sys":str, "part1":str, "x":str,
0:int, 3:int, 4:int);
+ C_154:bat[:oid] := sql.tid(X_6:int, "sys":str, "part1":str, 3:int, 4:int);
+ C_200:bat[:oid] := algebra.select(X_158:bat[:dbl], C_154:bat[:oid], 1:dbl,
2:dbl, true:bit, true:bit, false:bit);
+ X_204:bat[:dbl] := algebra.projection(C_200:bat[:oid], X_158:bat[:dbl]);
+ X_221:bat[:dbl] := mat.packIncrement(X_201:bat[:dbl], 4:int);
+ X_223:bat[:dbl] := mat.packIncrement(X_221:bat[:dbl], X_202:bat[:dbl]);
+ X_224:bat[:dbl] := mat.packIncrement(X_223:bat[:dbl], X_203:bat[:dbl]);
+ X_42:bat[:dbl] := mat.packIncrement(X_224:bat[:dbl], X_204:bat[:dbl]);
X_47:bat[:dbl] := sql.bind(X_6:int, "sys":str, "part2":str, "x":str,
0:int);
C_45:bat[:oid] := sql.tid(X_6:int, "sys":str, "part2":str);
C_70:bat[:oid] := algebra.select(X_47:bat[:dbl], C_45:bat[:oid], 1:dbl,
2:dbl, true:bit, true:bit, false:bit);
@@ -106,29 +122,55 @@ barrier X_155:bit := language.dataflow()
X_53:bat[:dbl] := sql.bind(X_6:int, "sys":str, "part2":str, "y":str,
0:int);
X_72:bat[:dbl] := algebra.projection(C_70:bat[:oid], X_53:bat[:dbl]);
X_71:bat[:dbl] := algebra.projection(C_70:bat[:oid], X_47:bat[:dbl]);
- X_27:bat[:dbl] := sql.bind(X_6:int, "sys":str, "part1":str, "z":str,
0:int);
- X_44:bat[:dbl] := algebra.projection(C_38:bat[:oid], X_27:bat[:dbl]);
- X_20:bat[:dbl] := sql.bind(X_6:int, "sys":str, "part1":str, "y":str,
0:int);
- X_43:bat[:dbl] := algebra.projection(C_38:bat[:oid], X_20:bat[:dbl]);
+ X_187:bat[:dbl] := sql.bind(X_6:int, "sys":str, "part1":str, "z":str,
0:int, 3:int, 4:int);
+ X_212:bat[:dbl] := algebra.projection(C_200:bat[:oid], X_187:bat[:dbl]);
+ X_185:bat[:dbl] := sql.bind(X_6:int, "sys":str, "part1":str, "z":str,
0:int, 2:int, 4:int);
+ X_211:bat[:dbl] := algebra.projection(C_199:bat[:oid], X_185:bat[:dbl]);
+ X_183:bat[:dbl] := sql.bind(X_6:int, "sys":str, "part1":str, "z":str,
0:int, 1:int, 4:int);
+ X_210:bat[:dbl] := algebra.projection(C_198:bat[:oid], X_183:bat[:dbl]);
+ X_181:bat[:dbl] := sql.bind(X_6:int, "sys":str, "part1":str, "z":str,
0:int, 0:int, 4:int);
+ X_209:bat[:dbl] := algebra.projection(C_197:bat[:oid], X_181:bat[:dbl]);
+ X_170:bat[:dbl] := sql.bind(X_6:int, "sys":str, "part1":str, "y":str,
0:int, 3:int, 4:int);
+ X_208:bat[:dbl] := algebra.projection(C_200:bat[:oid], X_170:bat[:dbl]);
+ X_169:bat[:dbl] := sql.bind(X_6:int, "sys":str, "part1":str, "y":str,
0:int, 2:int, 4:int);
+ X_207:bat[:dbl] := algebra.projection(C_199:bat[:oid], X_169:bat[:dbl]);
+ X_168:bat[:dbl] := sql.bind(X_6:int, "sys":str, "part1":str, "y":str,
0:int, 1:int, 4:int);
+ X_206:bat[:dbl] := algebra.projection(C_198:bat[:oid], X_168:bat[:dbl]);
+ X_167:bat[:dbl] := sql.bind(X_6:int, "sys":str, "part1":str, "y":str,
0:int, 0:int, 4:int);
+ X_205:bat[:dbl] := algebra.projection(C_197:bat[:oid], X_167:bat[:dbl]);
X_76:bat[:dbl] := bat.append(X_74:bat[:dbl], X_42:bat[:dbl], true:bit);
X_78:bat[:dbl] := bat.append(X_76:bat[:dbl], X_71:bat[:dbl], true:bit);
X_79:bat[:dbl] := bat.new(nil:dbl);
+ X_226:bat[:dbl] := mat.packIncrement(X_205:bat[:dbl], 4:int);
+ X_227:bat[:dbl] := mat.packIncrement(X_226:bat[:dbl], X_206:bat[:dbl]);
+ X_228:bat[:dbl] := mat.packIncrement(X_227:bat[:dbl], X_207:bat[:dbl]);
+ X_43:bat[:dbl] := mat.packIncrement(X_228:bat[:dbl], X_208:bat[:dbl]);
X_80:bat[:dbl] := bat.append(X_79:bat[:dbl], X_43:bat[:dbl], true:bit);
X_81:bat[:dbl] := bat.append(X_80:bat[:dbl], X_72:bat[:dbl], true:bit);
X_82:bat[:dbl] := bat.new(nil:dbl);
+ X_230:bat[:dbl] := mat.packIncrement(X_209:bat[:dbl], 4:int);
+ X_231:bat[:dbl] := mat.packIncrement(X_230:bat[:dbl], X_210:bat[:dbl]);
+ X_232:bat[:dbl] := mat.packIncrement(X_231:bat[:dbl], X_211:bat[:dbl]);
+ X_44:bat[:dbl] := mat.packIncrement(X_232:bat[:dbl], X_212:bat[:dbl]);
X_83:bat[:dbl] := bat.append(X_82:bat[:dbl], X_44:bat[:dbl], true:bit);
X_84:bat[:dbl] := bat.append(X_83:bat[:dbl], X_73:bat[:dbl], true:bit);
- language.pass(X_10:bat[:dbl]);
+ language.pass(X_155:bat[:dbl]);
+ language.pass(X_156:bat[:dbl]);
+ language.pass(X_157:bat[:dbl]);
+ language.pass(X_158:bat[:dbl]);
language.pass(C_70:bat[:oid]);
language.pass(X_47:bat[:dbl]);
- language.pass(C_38:bat[:oid]);
-exit X_155:bit;
+ language.pass(C_200:bat[:oid]);
+ language.pass(C_199:bat[:oid]);
+ language.pass(C_198:bat[:oid]);
+ language.pass(C_197:bat[:oid]);
+exit X_235:bit;
X_86:int := sql.append(X_6:int, "sys":str, "answ":str, "x":str,
X_78:bat[:dbl]);
-barrier X_162:bit := language.dataflow();
+barrier X_248:bit := language.dataflow();
X_90:int := sql.append(X_86:int, "sys":str, "answ":str, "y":str,
X_81:bat[:dbl]);
X_93:int := sql.append(X_90:int, "sys":str, "answ":str, "z":str,
X_84:bat[:dbl]);
X_95:lng := aggr.count(X_84:bat[:dbl]);
-exit X_162:bit;
+exit X_248:bit;
sql.affectedRows(X_93:int, X_95:lng);
end user.s22_1;
#inline actions= 0 time=2 usec
@@ -170,15 +212,37 @@ end user.s22_1;
% 164 # length
function user.s24_1():void;
X_5:void := querylog.define("explain insert into answ\nselect * from
complete\nwhere x between 0 and 2 and y between 0 and 2;":str,
"default_pipe":str, 76:int);
-barrier X_168:bit := language.dataflow();
+barrier X_252:bit := language.dataflow();
X_88:bat[:dbl] := bat.new(nil:dbl);
X_8:int := sql.mvc();
- X_12:bat[:dbl] := sql.bind(X_8:int, "sys":str, "part1":str, "x":str,
0:int);
- X_22:bat[:dbl] := sql.bind(X_8:int, "sys":str, "part1":str, "y":str,
0:int);
- C_9:bat[:oid] := sql.tid(X_8:int, "sys":str, "part1":str);
- C_40:bat[:oid] := algebra.select(X_22:bat[:dbl], C_9:bat[:oid], 0:dbl,
2:dbl, true:bit, true:bit, false:bit);
- C_48:bat[:oid] := algebra.select(X_12:bat[:dbl], C_40:bat[:oid], 0:dbl,
2:dbl, true:bit, true:bit, false:bit);
- X_49:bat[:dbl] := algebra.projection(C_48:bat[:oid], X_12:bat[:dbl]);
+ X_168:bat[:dbl] := sql.bind(X_8:int, "sys":str, "part1":str, "x":str,
0:int, 0:int, 4:int);
+ X_180:bat[:dbl] := sql.bind(X_8:int, "sys":str, "part1":str, "y":str,
0:int, 0:int, 4:int);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
