Changeset: c55a04c5026e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c55a04c5026e
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
monetdb5/modules/mal/Tests/clients01.stable.out
monetdb5/modules/mal/clients.c
sql/backends/monet5/UDF/udf/Tests/udf-fuse.stable.out
sql/backends/monet5/UDF/udf/Tests/udf-reverse.stable.out
sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out
sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out
sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out
sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.stable.out
sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.stable.out.single
sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-query.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-0join-view.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-query.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-view.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-query.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-view.stable.out
Branch: default
Log Message:
approved output
diffs (truncated from 2060 to 300 lines):
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -12030,7 +12030,7 @@ stdout of test 'MAL-signatures` in direc
[ "url", "url", "command url.url(s:str):url ", "URLnew;", "Create
an URL from a string literal" ]
[ "url", "url", "command url.url(s:url):url ", "URLnoop;", "Create
an URL from a string literal" ]
[ "user", "main", "function user.main():void;", "", "" ]
-[ "user", "s2_1", "function user.s2_1():void;", "", "" ]
+[ "user", "s2_0", "function user.s2_0():void;", "", "" ]
[ "uuid", "#cmp", "command uuid.#cmp():void ", "UUIDcompare;", ""
]
[ "uuid", "#fromstr", "command uuid.#fromstr():void ",
"UUIDfromString;", "" ]
[ "uuid", "#hash", "command uuid.#hash():void ", "UUIDhash;",
"" ]
diff --git a/clients/Tests/MAL-signatures.stable.out.int128
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -16458,7 +16458,7 @@ stdout of test 'MAL-signatures` in direc
[ "url", "url", "command url.url(s:str):url ", "URLnew;", "Create
an URL from a string literal" ]
[ "url", "url", "command url.url(s:url):url ", "URLnoop;", "Create
an URL from a string literal" ]
[ "user", "main", "function user.main():void;", "", "" ]
-[ "user", "s2_1", "function user.s2_1():void;", "", "" ]
+[ "user", "s2_0", "function user.s2_0():void;", "", "" ]
[ "uuid", "#cmp", "command uuid.#cmp():void ", "UUIDcompare;", ""
]
[ "uuid", "#fromstr", "command uuid.#fromstr():void ",
"UUIDfromString;", "" ]
[ "uuid", "#hash", "command uuid.#hash():void ", "UUIDhash;",
"" ]
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
--- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
+++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
@@ -60,7 +60,7 @@ stdout of test 'opt_sql_append` in direc
% mal # name
% clob # type
% 180 # length
-function user.s10_1():void;
+function user.s10_0():void;
X_1:void := querylog.define("explain copy into ttt from
\\'/tmp/xyz\\';":str, "sequential_pipe":str, 22:int);
X_4:int := sql.mvc();
(X_26:bat[:int], X_27:bat[:int], X_28:bat[:int]) := sql.copy_from(nil:ptr,
"|":str, "\n":str, nil:str, "null":str, "/tmp/xyz":str, -1:lng, 0:lng, 0:int,
0:int, nil:str, 0:int);
@@ -69,7 +69,7 @@ function user.s10_1():void;
X_38:int := sql.append(X_35:int, "sys":str, "ttt":str, "c":str,
X_28:bat[:int]);
X_40:lng := aggr.count(X_28:bat[:int]);
sql.affectedRows(X_38:int, X_40:lng);
-end user.s10_1;
+end user.s10_0;
#inline actions= 0 time=1 usec
#candidates actions= 1 time=14 usec
#remap actions= 0 time=3 usec
@@ -107,7 +107,7 @@ end user.s10_1;
% L2 # name
% varchar # type
% 6 # length
-[ "user_1" ]
+[ "user_0" ]
#select def from optimizers() where name = optimizer;
% .L1 # table_name
% def # name
@@ -119,8 +119,8 @@ end user.s10_1;
% mal # name
% clob # type
% 180 # length
-function user.s26_1():void;
- X_1:void := querylog.define("explain copy into ttt from
\\'/tmp/xyz\\';":str, "user_1":str, 22:int);
+function user.s26_0():void;
+ X_1:void := querylog.define("explain copy into ttt from
\\'/tmp/xyz\\';":str, "user_0":str, 22:int);
X_4:int := sql.mvc();
(X_26:bat[:int], X_27:bat[:int], X_28:bat[:int]) := sql.copy_from(nil:ptr,
"|":str, "\n":str, nil:str, "null":str, "/tmp/xyz":str, -1:lng, 0:lng, 0:int,
0:int, nil:str, 0:int);
X_30:int := sql.append(X_4:int, "sys":str, "ttt":str, "a":str,
X_26:bat[:int]);
@@ -128,7 +128,7 @@ function user.s26_1():void;
X_40:lng := aggr.count(X_28:bat[:int]);
X_38:int := sql.append(X_35:int, "sys":str, "ttt":str, "c":str,
X_28:bat[:int]);
sql.affectedRows(X_38:int, X_40:lng);
-end user.s26_1;
+end user.s26_0;
#inline actions= 0 time=1 usec
#candidates actions= 1 time=14 usec
#remap actions= 0 time=3 usec
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
---
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
+++
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
@@ -80,7 +80,7 @@ function user.s10_1():void;
X_38:int := sql.append(X_35:int, "sys":str, "ttt":str, "c":str,
X_28:bat[:int]);
X_40:lng := aggr.count(X_28:bat[:int]);
sql.affectedRows(X_38:int, X_40:lng);
-end user.s10_1;
+end user.s10_0;
#inline actions= 0 time=1 usec
#remap actions= 0 time=2 usec
#costmodel actions= 1 time=1 usec
diff --git a/monetdb5/modules/mal/Tests/clients01.stable.out
b/monetdb5/modules/mal/Tests/clients01.stable.out
--- a/monetdb5/modules/mal/Tests/clients01.stable.out
+++ b/monetdb5/modules/mal/Tests/clients01.stable.out
@@ -22,13 +22,9 @@ stdout of test 'clients01` in directory
# MonetDB/R module loaded
-# 11:44:18 >
-# 11:44:18 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-17929" "--port=36836"
-# 11:44:18 >
+[ 0 ]
-[ 1 ]
+# 19:52:04 >
+# 19:52:04 > "Done."
+# 19:52:04 >
-# 11:44:19 >
-# 11:44:19 > "Done."
-# 11:44:19 >
-
diff --git a/monetdb5/modules/mal/clients.c b/monetdb5/modules/mal/clients.c
--- a/monetdb5/modules/mal/clients.c
+++ b/monetdb5/modules/mal/clients.c
@@ -647,7 +647,7 @@ CLTsessions(Client cntxt, MalBlkPtr mb,
MT_lock_set(&mal_contextLock);
- for (c = mal_clients + 1; c < mal_clients + MAL_MAXCLIENTS; c++) {
+ for (c = mal_clients; c < mal_clients + MAL_MAXCLIENTS; c++) {
if (c->mode == RUNCLIENT) {
if (BUNappend(user, c->username, false) != GDK_SUCCEED)
goto bailout;
diff --git a/sql/backends/monet5/UDF/udf/Tests/udf-fuse.stable.out
b/sql/backends/monet5/UDF/udf/Tests/udf-fuse.stable.out
--- a/sql/backends/monet5/UDF/udf/Tests/udf-fuse.stable.out
+++ b/sql/backends/monet5/UDF/udf/Tests/udf-fuse.stable.out
@@ -27,36 +27,36 @@ stdout of test 'udf-fuse` in directory '
% mal # name
% clob # type
% 95 # length
-function user.s4_1():void;
+function user.s4_0():void;
X_3:void := querylog.define("explain select fuse(1,2);":str,
"sequential_pipe":str, 8:int);
X_9:sht := udf.fuse(1:bte, 2:bte);
sql.resultSet(".L2":str, "L2":str, "smallint":str, 16:int, 0:int, 7:int,
X_9:sht);
-end user.s4_1;
-#inline actions= 0 time=2 usec
-#candidates actions= 1 time=12 usec
-#remap actions= 0 time=4 usec
-#costModel actions= 1 time=10 usec
-#coercions actions= 0 time=2 usec
-#evaluate actions= 2 time=26 usec
-#emptybind actions= 0 time=5 usec
-#pushselect actions= 0 time=4 usec
-#aliases actions= 2 time=14 usec
-#mergetable actions= 0 time=20 usec
-#deadcode actions= 1 time=14 usec
-#aliases actions= 0 time=4 usec
-#constants actions= 2 time=15 usec
-#commonTerms actions= 0 time=3 usec
-#projectionpath actions= 0 time=11 usec
-#reorder actions= 1 time=23 usec
-#deadcode actions= 0 time=6 usec
-#reduce actions=23 time=26 usec
-#matpack actions= 0 time=6 usec
-#querylog actions= 0 time=1 usec
-#multiplex actions= 0 time=4 usec
-#generator actions= 0 time=3 usec
-#profiler actions= 1 time=6 usec
-#garbageCollector actions= 1 time=12 usec
-#total actions= 1 time=335 usec
+end user.s4_0;
+#inline actions= 0 time=0 usec
+#remap actions= 0 time=1 usec
+#costmodel actions= 1 time=0 usec
+#coercion actions= 0 time=0 usec
+#aliases actions= 2 time=2 usec
+#evaluate actions= 0 time=2 usec
+#emptybind actions= 0 time=1 usec
+#pushselect actions= 0 time=2 usec
+#aliases actions= 0 time=0 usec
+#mergetable actions= 0 time=12 usec
+#deadcode actions= 1 time=3 usec
+#aliases actions= 0 time=0 usec
+#constants actions= 0 time=1 usec
+#commonTerms actions= 0 time=1 usec
+#projectionpath actions= 0 time=1 usec
+#deadcode actions= 0 time=3 usec
+#reorder actions= 1 time=22 usec
+#matpack actions= 0 time=0 usec
+#multiplex actions= 0 time=0 usec
+#profiler actions= 1 time=0 usec
+#candidates actions= 1 time=0 usec
+#deadcode actions= 0 time=3 usec
+#wlc actions= 0 time=0 usec
+#garbagecollector actions= 1 time=5 usec
+#total actions=27 time=117 usec
#select fuse(1,2);
% .L2 # table_name
% L2 # name
@@ -68,36 +68,36 @@ end user.s4_1;
% mal # name
% clob # type
% 101 # length
-function user.s6_1():void;
+function user.s6_0():void;
X_3:void := querylog.define("explain select fuse(1000,2000);":str,
"sequential_pipe":str, 8:int);
X_9:int := udf.fuse(1000:sht, 2000:sht);
sql.resultSet(".L2":str, "L2":str, "int":str, 32:int, 0:int, 7:int,
X_9:int);
-end user.s6_1;
-#inline actions= 0 time=2 usec
-#candidates actions= 1 time=10 usec
-#remap actions= 0 time=4 usec
-#costModel actions= 1 time=10 usec
-#coercions actions= 0 time=2 usec
-#evaluate actions= 2 time=26 usec
-#emptybind actions= 0 time=4 usec
-#pushselect actions= 0 time=4 usec
-#aliases actions= 2 time=13 usec
-#mergetable actions= 0 time=20 usec
-#deadcode actions= 1 time=12 usec
-#aliases actions= 0 time=5 usec
-#constants actions= 2 time=10 usec
-#commonTerms actions= 0 time=5 usec
-#projectionpath actions= 0 time=4 usec
-#reorder actions= 1 time=21 usec
-#deadcode actions= 0 time=6 usec
-#reduce actions=23 time=25 usec
-#matpack actions= 0 time=6 usec
-#querylog actions= 0 time=1 usec
-#multiplex actions= 0 time=4 usec
-#generator actions= 0 time=2 usec
-#profiler actions= 1 time=5 usec
-#garbageCollector actions= 1 time=12 usec
-#total actions= 1 time=289 usec
+end user.s6_0;
+#inline actions= 0 time=0 usec
+#remap actions= 0 time=1 usec
+#costmodel actions= 1 time=0 usec
+#coercion actions= 0 time=1 usec
+#aliases actions= 2 time=3 usec
+#evaluate actions= 0 time=2 usec
+#emptybind actions= 0 time=1 usec
+#pushselect actions= 0 time=2 usec
+#aliases actions= 0 time=0 usec
+#mergetable actions= 0 time=11 usec
+#deadcode actions= 1 time=3 usec
+#aliases actions= 0 time=0 usec
+#constants actions= 0 time=1 usec
+#commonTerms actions= 0 time=1 usec
+#projectionpath actions= 0 time=1 usec
+#deadcode actions= 0 time=2 usec
+#reorder actions= 1 time=7 usec
+#matpack actions= 0 time=0 usec
+#multiplex actions= 0 time=0 usec
+#profiler actions= 1 time=0 usec
+#candidates actions= 1 time=1 usec
+#deadcode actions= 0 time=2 usec
+#wlc actions= 0 time=0 usec
+#garbagecollector actions= 1 time=4 usec
+#total actions=27 time=85 usec
#select fuse(1000,2000);
% .L2 # table_name
% L2 # name
@@ -109,36 +109,36 @@ end user.s6_1;
% mal # name
% clob # type
% 107 # length
-function user.s8_1():void;
+function user.s8_0():void;
X_3:void := querylog.define("explain select fuse(1000000,2000000);":str,
"sequential_pipe":str, 8:int);
X_9:lng := udf.fuse(1000000:int, 2000000:int);
sql.resultSet(".L2":str, "L2":str, "bigint":str, 64:int, 0:int, 7:int,
X_9:lng);
-end user.s8_1;
-#inline actions= 0 time=3 usec
-#candidates actions= 1 time=10 usec
-#remap actions= 0 time=4 usec
-#costModel actions= 1 time=9 usec
-#coercions actions= 0 time=2 usec
-#evaluate actions= 2 time=25 usec
-#emptybind actions= 0 time=4 usec
-#pushselect actions= 0 time=3 usec
-#aliases actions= 2 time=13 usec
-#mergetable actions= 0 time=19 usec
-#deadcode actions= 1 time=12 usec
-#aliases actions= 0 time=4 usec
-#constants actions= 2 time=10 usec
-#commonTerms actions= 0 time=5 usec
-#projectionpath actions= 0 time=4 usec
-#reorder actions= 1 time=21 usec
-#deadcode actions= 0 time=5 usec
-#reduce actions=23 time=24 usec
-#matpack actions= 0 time=5 usec
-#querylog actions= 0 time=1 usec
-#multiplex actions= 0 time=4 usec
-#generator actions= 0 time=3 usec
-#profiler actions= 1 time=6 usec
-#garbageCollector actions= 1 time=13 usec
-#total actions= 1 time=284 usec
+end user.s8_0;
+#inline actions= 0 time=1 usec
+#remap actions= 0 time=0 usec
+#costmodel actions= 1 time=0 usec
+#coercion actions= 0 time=0 usec
+#aliases actions= 2 time=2 usec
+#evaluate actions= 0 time=2 usec
+#emptybind actions= 0 time=0 usec
+#pushselect actions= 0 time=2 usec
+#aliases actions= 0 time=0 usec
+#mergetable actions= 0 time=11 usec
+#deadcode actions= 1 time=3 usec
+#aliases actions= 0 time=0 usec
+#constants actions= 0 time=2 usec
+#commonTerms actions= 0 time=1 usec
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
