Changeset: c0c552fd820c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c0c552fd820c
Modified Files:
sql/backends/monet5/sql_upgrades.c
sql/test/BugTracker-2009/Tests/All
sql/test/BugTracker-2017/Tests/crash-select_after_MAL_error.Bug-6332.stable.out
sql/test/BugTracker-2017/Tests/type-resolution-error.Bugs-6313.stable.err
sql/test/BugTracker-2019/Tests/python-loader-string.Bug-6759.stable.err
sql/test/Dump/Tests/dump-again.stable.err
sql/test/Tests/comment-auth.stable.err
sql/test/Tests/comment-dump.stable.err
sql/test/mergetables/Tests/sqlsmith.Bug-6455.stable.err
sql/test/mergetables/Tests/sqlsmith.Bug-6459.stable.err
sql/test/testdb-reload/Tests/reload.stable.err
sql/test/testdb/Tests/dump-nogeom.stable.err
Branch: default
Log Message:
Merge with Nov2019
diffs (240 lines):
diff --git a/sql/backends/monet5/sql_upgrades.c
b/sql/backends/monet5/sql_upgrades.c
--- a/sql/backends/monet5/sql_upgrades.c
+++ b/sql/backends/monet5/sql_upgrades.c
@@ -1941,6 +1941,7 @@ sql_update_apr2019_sp2(Client c)
if (pos > 7900) { \
pos += snprintf(buf + pos, bufsize - pos, ") as t1(c1,c2,c3)
where t1.c1 not in (select \"id\" from dependencies where depend_id =
t1.c2);\n"); \
assert(pos < bufsize); \
+ printf("Running database upgrade commands:\n%s\n", buf); \
err = SQLstatementIntern(c, &buf, "update", true, false, NULL);
\
if (err) \
goto bailout; \
@@ -2071,6 +2072,7 @@ sql_update_nov2019_missing_dependencies(
pos += snprintf(buf + pos, bufsize - pos, ") as t1(c1,c2,c3)
where t1.c1 not in (select \"id\" from dependencies where depend_id =
t1.c2);\n");
assert(pos < bufsize);
+ printf("Running database upgrade commands:\n%s\n", buf);
err = SQLstatementIntern(c, &buf, "update", true, false, NULL);
}
diff --git a/sql/test/BugTracker-2009/Tests/All
b/sql/test/BugTracker-2009/Tests/All
--- a/sql/test/BugTracker-2009/Tests/All
+++ b/sql/test/BugTracker-2009/Tests/All
@@ -25,7 +25,7 @@ bool-str-bug
rollback_bug
update-crash
correlated-selection-bug
-HAVE_MAL_DEBUGGER?segfault_when_quitting_debugger.SF-2538837
+HAVE_MAL_DEBUGGER&NOT_WIN32?segfault_when_quitting_debugger.SF-2538837
row_number_bug.SF-2546109
#set_history_and_drop_table.SF-2607045 not relevant anymore
TypeException_having_count_distinct.SF-2494227
diff --git
a/sql/test/BugTracker-2017/Tests/crash-select_after_MAL_error.Bug-6332.stable.out
b/sql/test/BugTracker-2017/Tests/crash-select_after_MAL_error.Bug-6332.stable.out
---
a/sql/test/BugTracker-2017/Tests/crash-select_after_MAL_error.Bug-6332.stable.out
+++
b/sql/test/BugTracker-2017/Tests/crash-select_after_MAL_error.Bug-6332.stable.out
@@ -60,8 +60,6 @@ stdout of test 'crash-select_after_MAL_e
# loading sql script: 90_generator.sql
# loading sql script: 90_generator_hge.sql
# loading sql script: 99_system.sql
-#WARNING To speedup calc./ a bulk operator implementation is needed
-# X_24965:bat[:lng] :=
mal.multiplex("calc":str,"/":str,0:bte,X_24964:bat[:int]);
# 14:22:38 >
# 14:22:38 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-11002" "--port=36959"
diff --git
a/sql/test/BugTracker-2017/Tests/type-resolution-error.Bugs-6313.stable.err
b/sql/test/BugTracker-2017/Tests/type-resolution-error.Bugs-6313.stable.err
--- a/sql/test/BugTracker-2017/Tests/type-resolution-error.Bugs-6313.stable.err
+++ b/sql/test/BugTracker-2017/Tests/type-resolution-error.Bugs-6313.stable.err
@@ -30,8 +30,6 @@ stderr of test 'type-resolution-error.Bu
# X_353:bat[:lng] := mal.multiplex("user":str, "hashsize":str,
X_319:bat[:bit], X_298:bat[:lng]);
#WARNING To speedup user.imprintsize a bulk operator implementation is needed
# X_355:bat[:lng] := mal.multiplex("user":str, "imprintsize":str,
X_298:bat[:lng], X_284:bat[:str]);
-#WARNING To speedup calc.ifthenelse a bulk operator implementation is needed
-# X_572:bat[:bit] := mal.multiplex("calc":str, "ifthenelse":str, X_571:bit,
X_130:bat[:int], X_560:bat[:bit]);
# 12:52:03 >
# 12:52:03 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-19106" "--port=36358"
diff --git
a/sql/test/BugTracker-2019/Tests/python-loader-string.Bug-6759.stable.err
b/sql/test/BugTracker-2019/Tests/python-loader-string.Bug-6759.stable.err
--- a/sql/test/BugTracker-2019/Tests/python-loader-string.Bug-6759.stable.err
+++ b/sql/test/BugTracker-2019/Tests/python-loader-string.Bug-6759.stable.err
@@ -20,16 +20,6 @@ stderr of test 'python-loader-string.Bug
# cmdline opt monet_prompt =
# cmdline opt gdk_dbpath =
/home/ferreira/repositories/MonetDB-Apr2019/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2019
# cmdline opt embedded_py = 2
-#WARNING To speedup sql.get_value a bulk operator implementation is needed
-# X_282:bat[:lng] := mal.multiplex("sql":str, "get_value":str,
X_247:bat[:str], X_257:bat[:str]);
-#WARNING To speedup sql.get_value a bulk operator implementation is needed
-# X_283:bat[:lng] := mal.multiplex("sql":str, "get_value":str,
X_248:bat[:str], X_258:bat[:str]);
-#WARNING To speedup sql.get_value a bulk operator implementation is needed
-# X_284:bat[:lng] := mal.multiplex("sql":str, "get_value":str,
X_249:bat[:str], X_259:bat[:str]);
-#WARNING To speedup sql.get_value a bulk operator implementation is needed
-# X_285:bat[:lng] := mal.multiplex("sql":str, "get_value":str,
X_250:bat[:str], X_260:bat[:str]);
-#WARNING To speedup sql.get_value a bulk operator implementation is needed
-# X_286:bat[:lng] := mal.multiplex("sql":str, "get_value":str,
X_251:bat[:str], X_261:bat[:str]);
# 10:43:17 >
# 10:43:17 > "Done."
diff --git a/sql/test/Dump/Tests/dump-again.stable.err
b/sql/test/Dump/Tests/dump-again.stable.err
--- a/sql/test/Dump/Tests/dump-again.stable.err
+++ b/sql/test/Dump/Tests/dump-again.stable.err
@@ -23,14 +23,6 @@ stderr of test 'dump-again` in directory
# cmdline opt gdk_dbpath =
/home/sjoerd/@Monet-stable/var/MonetDB/mTests_sql_test_Dump
# cmdline opt embedded_c = true
# cmdline opt gdk_debug = 553648138
-#WARNING To speedup sql.get_value a bulk operator implementation is needed
-# X_258:bat[:lng] := mal.multiplex("sql":str, "get_value":str,
X_230:bat[:str], X_238:bat[:str]);
-#WARNING To speedup sql.get_value a bulk operator implementation is needed
-# X_259:bat[:lng] := mal.multiplex("sql":str, "get_value":str,
X_231:bat[:str], X_239:bat[:str]);
-#WARNING To speedup sql.get_value a bulk operator implementation is needed
-# X_260:bat[:lng] := mal.multiplex("sql":str, "get_value":str,
X_232:bat[:str], X_240:bat[:str]);
-#WARNING To speedup sql.get_value a bulk operator implementation is needed
-# X_261:bat[:lng] := mal.multiplex("sql":str, "get_value":str,
X_233:bat[:str], X_241:bat[:str]);
# 22:27:57 >
# 22:27:57 > "/usr/bin/python" "dump-again.SQL.py" "dump-again"
diff --git a/sql/test/Tests/comment-auth.stable.err
b/sql/test/Tests/comment-auth.stable.err
--- a/sql/test/Tests/comment-auth.stable.err
+++ b/sql/test/Tests/comment-auth.stable.err
@@ -23,8 +23,6 @@ stderr of test 'comment-auth` in directo
# cmdline opt gdk_dbpath =
/Users/joeri/monets/default/var/MonetDB/mTests_sql_test
# cmdline opt embedded_r = yes
# cmdline opt gdk_debug = 536870922
-#WARNING To speedup aggr.exist a bulk operator implementation is needed
-# X_583:bat[:bit] := mal.multiplex("aggr":str, "exist":str,
X_558:bat[:int]);
# 14:17:01 >
# 14:17:01 > "/usr/local/opt/python/bin/python2.7" "comment-auth.SQL.py"
"comment-auth"
diff --git a/sql/test/Tests/comment-dump.stable.err
b/sql/test/Tests/comment-dump.stable.err
--- a/sql/test/Tests/comment-dump.stable.err
+++ b/sql/test/Tests/comment-dump.stable.err
@@ -23,36 +23,6 @@ stderr of test 'comment-dump` in directo
# cmdline opt gdk_dbpath =
/Users/joeri/monets/default/var/MonetDB/mTests_sql_test
# cmdline opt embedded_r = yes
# cmdline opt gdk_debug = 536870922
-#WARNING To speedup sql.password a bulk operator implementation is needed
-# X_233:bat[:str] := mal.multiplex("sql":str, "password":str,
X_208:bat[:str]);
-#WARNING To speedup sql.password a bulk operator implementation is needed
-# X_234:bat[:str] := mal.multiplex("sql":str, "password":str,
X_209:bat[:str]);
-#WARNING To speedup sql.password a bulk operator implementation is needed
-# X_235:bat[:str] := mal.multiplex("sql":str, "password":str,
X_210:bat[:str]);
-#WARNING To speedup sql.password a bulk operator implementation is needed
-# X_236:bat[:str] := mal.multiplex("sql":str, "password":str,
X_211:bat[:str]);
-#WARNING To speedup sql.password a bulk operator implementation is needed
-# X_237:bat[:str] := mal.multiplex("sql":str, "password":str,
X_212:bat[:str]);
-#WARNING To speedup sql.password a bulk operator implementation is needed
-# X_233:bat[:str] := mal.multiplex("sql":str, "password":str,
X_208:bat[:str]);
-#WARNING To speedup sql.password a bulk operator implementation is needed
-# X_234:bat[:str] := mal.multiplex("sql":str, "password":str,
X_209:bat[:str]);
-#WARNING To speedup sql.password a bulk operator implementation is needed
-# X_235:bat[:str] := mal.multiplex("sql":str, "password":str,
X_210:bat[:str]);
-#WARNING To speedup sql.password a bulk operator implementation is needed
-# X_236:bat[:str] := mal.multiplex("sql":str, "password":str,
X_211:bat[:str]);
-#WARNING To speedup sql.password a bulk operator implementation is needed
-# X_237:bat[:str] := mal.multiplex("sql":str, "password":str,
X_212:bat[:str]);
-#WARNING To speedup sql.get_value a bulk operator implementation is needed
-# X_281:bat[:lng] := mal.multiplex("sql":str, "get_value":str,
X_246:bat[:str], X_256:bat[:str]);
-#WARNING To speedup sql.get_value a bulk operator implementation is needed
-# X_282:bat[:lng] := mal.multiplex("sql":str, "get_value":str,
X_247:bat[:str], X_257:bat[:str]);
-#WARNING To speedup sql.get_value a bulk operator implementation is needed
-# X_283:bat[:lng] := mal.multiplex("sql":str, "get_value":str,
X_248:bat[:str], X_258:bat[:str]);
-#WARNING To speedup sql.get_value a bulk operator implementation is needed
-# X_284:bat[:lng] := mal.multiplex("sql":str, "get_value":str,
X_249:bat[:str], X_259:bat[:str]);
-#WARNING To speedup sql.get_value a bulk operator implementation is needed
-# X_285:bat[:lng] := mal.multiplex("sql":str, "get_value":str,
X_250:bat[:str], X_260:bat[:str]);
# 17:19:14 >
# 17:19:14 > "/usr/local/opt/python/bin/python2.7" "comment-dump.SQL.py"
"comment-dump"
diff --git a/sql/test/mergetables/Tests/sqlsmith.Bug-6455.stable.err
b/sql/test/mergetables/Tests/sqlsmith.Bug-6455.stable.err
--- a/sql/test/mergetables/Tests/sqlsmith.Bug-6455.stable.err
+++ b/sql/test/mergetables/Tests/sqlsmith.Bug-6455.stable.err
@@ -30,8 +30,6 @@ stderr of test 'sqlsmith.Bug-6455` in di
# X_115:bat[:lng] := mal.multiplex("user":str, "hashsize":str,
X_81:bat[:bit], X_60:bat[:lng]);
#WARNING To speedup user.imprintsize a bulk operator implementation is needed
# X_117:bat[:lng] := mal.multiplex("user":str, "imprintsize":str,
X_60:bat[:lng], X_46:bat[:str]);
-#WARNING To speedup aggr.exist a bulk operator implementation is needed
-# X_1489:bat[:bit] := mal.multiplex("aggr":str, "exist":str,
X_1474:bat[:int]);
# 13:19:14 >
# 13:19:14 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-3545" "--port=31757"
diff --git a/sql/test/mergetables/Tests/sqlsmith.Bug-6459.stable.err
b/sql/test/mergetables/Tests/sqlsmith.Bug-6459.stable.err
--- a/sql/test/mergetables/Tests/sqlsmith.Bug-6459.stable.err
+++ b/sql/test/mergetables/Tests/sqlsmith.Bug-6459.stable.err
@@ -22,16 +22,6 @@ stderr of test 'sqlsmith.Bug-6459` in di
# cmdline opt monet_prompt =
# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_mergetables
# cmdline opt gdk_debug = 536870922
-#WARNING To speedup aggr.exist a bulk operator implementation is needed
-# X_621:bat[:bit] := mal.multiplex("aggr":str, "exist":str,
X_609:bat[:hge]);
-#WARNING To speedup aggr.exist a bulk operator implementation is needed
-# X_628:bat[:bit] := mal.multiplex("aggr":str, "exist":str,
X_609:bat[:hge]);
-#WARNING To speedup aggr.exist a bulk operator implementation is needed
-# X_996:bat[:bit] := mal.multiplex("aggr":str, "exist":str,
X_984:bat[:sht]);
-#WARNING To speedup aggr.exist a bulk operator implementation is needed
-# X_1003:bat[:bit] := mal.multiplex("aggr":str, "exist":str,
X_984:bat[:sht]);
-#WARNING To speedup aggr.exist a bulk operator implementation is needed
-# X_478:bat[:bit] := mal.multiplex("aggr":str, "exist":str,
X_467:bat[:int]);
# 18:45:51 >
# 18:45:51 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-30179" "--port=30960"
diff --git a/sql/test/testdb-reload/Tests/reload.stable.err
b/sql/test/testdb-reload/Tests/reload.stable.err
--- a/sql/test/testdb-reload/Tests/reload.stable.err
+++ b/sql/test/testdb-reload/Tests/reload.stable.err
@@ -22,18 +22,6 @@ stderr of test 'reload` in directory 'sq
# cmdline opt monet_prompt =
# cmdline opt gdk_dbpath =
/ufs/sjoerd/@Monet-stable/var/MonetDB/mTests_sql_test_testdb-reload
# cmdline opt gdk_debug = 553648138
-#WARNING To speedup sql.get_value a bulk operator implementation is needed
-# X_309:bat[:lng] := mal.multiplex("sql":str, "get_value":str,
X_267:bat[:str], X_279:bat[:str]);
-#WARNING To speedup sql.get_value a bulk operator implementation is needed
-# X_310:bat[:lng] := mal.multiplex("sql":str, "get_value":str,
X_268:bat[:str], X_280:bat[:str]);
-#WARNING To speedup sql.get_value a bulk operator implementation is needed
-# X_311:bat[:lng] := mal.multiplex("sql":str, "get_value":str,
X_269:bat[:str], X_281:bat[:str]);
-#WARNING To speedup sql.get_value a bulk operator implementation is needed
-# X_312:bat[:lng] := mal.multiplex("sql":str, "get_value":str,
X_270:bat[:str], X_282:bat[:str]);
-#WARNING To speedup sql.get_value a bulk operator implementation is needed
-# X_313:bat[:lng] := mal.multiplex("sql":str, "get_value":str,
X_271:bat[:str], X_283:bat[:str]);
-#WARNING To speedup sql.get_value a bulk operator implementation is needed
-# X_314:bat[:lng] := mal.multiplex("sql":str, "get_value":str,
X_272:bat[:str], X_284:bat[:str]);
# builtin opt gdk_dbpath = /ufs/sjoerd/@Monet-stable/var/monetdb5/dbfarm/demo
# builtin opt gdk_debug = 0
# builtin opt gdk_vmtrim = no
@@ -51,18 +39,6 @@ stderr of test 'reload` in directory 'sq
# cmdline opt mapi_usock = /var/tmp/mtest-14588/.s.monetdb.37779
# cmdline opt gdk_dbpath =
/ufs/sjoerd/@Monet-stable/var/MonetDB/mTests_sql_test_testdb-reload-clone
# cmdline opt gdk_debug = 553648138
-#WARNING To speedup sql.get_value a bulk operator implementation is needed
-# X_309:bat[:lng] := mal.multiplex("sql":str, "get_value":str,
X_267:bat[:str], X_279:bat[:str]);
-#WARNING To speedup sql.get_value a bulk operator implementation is needed
-# X_310:bat[:lng] := mal.multiplex("sql":str, "get_value":str,
X_268:bat[:str], X_280:bat[:str]);
-#WARNING To speedup sql.get_value a bulk operator implementation is needed
-# X_311:bat[:lng] := mal.multiplex("sql":str, "get_value":str,
X_269:bat[:str], X_281:bat[:str]);
-#WARNING To speedup sql.get_value a bulk operator implementation is needed
-# X_312:bat[:lng] := mal.multiplex("sql":str, "get_value":str,
X_270:bat[:str], X_282:bat[:str]);
-#WARNING To speedup sql.get_value a bulk operator implementation is needed
-# X_313:bat[:lng] := mal.multiplex("sql":str, "get_value":str,
X_271:bat[:str], X_283:bat[:str]);
-#WARNING To speedup sql.get_value a bulk operator implementation is needed
-# X_314:bat[:lng] := mal.multiplex("sql":str, "get_value":str,
X_272:bat[:str], X_284:bat[:str]);
# 17:35:07 >
# 17:35:07 > "Done."
diff --git a/sql/test/testdb/Tests/dump-nogeom.stable.err
b/sql/test/testdb/Tests/dump-nogeom.stable.err
--- a/sql/test/testdb/Tests/dump-nogeom.stable.err
+++ b/sql/test/testdb/Tests/dump-nogeom.stable.err
@@ -23,18 +23,6 @@ stderr of test 'dump-nogeom` in director
# cmdline opt gdk_dbpath =
/ufs/sjoerd/@Monet-candidate/var/MonetDB/mTests_sql_test_testdb
# cmdline opt embedded_c = true
# cmdline opt gdk_debug = 553648138
-#WARNING To speedup sql.get_value a bulk operator implementation is needed
-# X_309:bat[:lng] := mal.multiplex("sql":str, "get_value":str,
X_267:bat[:str], X_279:bat[:str]);
-#WARNING To speedup sql.get_value a bulk operator implementation is needed
-# X_310:bat[:lng] := mal.multiplex("sql":str, "get_value":str,
X_268:bat[:str], X_280:bat[:str]);
-#WARNING To speedup sql.get_value a bulk operator implementation is needed
-# X_311:bat[:lng] := mal.multiplex("sql":str, "get_value":str,
X_269:bat[:str], X_281:bat[:str]);
-#WARNING To speedup sql.get_value a bulk operator implementation is needed
-# X_312:bat[:lng] := mal.multiplex("sql":str, "get_value":str,
X_270:bat[:str], X_282:bat[:str]);
-#WARNING To speedup sql.get_value a bulk operator implementation is needed
-# X_313:bat[:lng] := mal.multiplex("sql":str, "get_value":str,
X_271:bat[:str], X_283:bat[:str]);
-#WARNING To speedup sql.get_value a bulk operator implementation is needed
-# X_314:bat[:lng] := mal.multiplex("sql":str, "get_value":str,
X_272:bat[:str], X_284:bat[:str]);
# 14:28:43 >
# 14:28:43 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-22828" "--port=36999"
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
