Changeset: 97e83feb664f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=97e83feb664f
Modified Files:
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
monetdb5/mal/Tests/tst670.stable.err
sql/backends/monet5/sql_optimizer.h
sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.sql
sql/test/BugTracker-2019/Tests/prepared-merge-statement.Bug-6706.stable.out
sql/test/Tests/trace.stable.out
Branch: default
Log Message:
Tests approval.
diffs (151 lines):
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
@@ -71,7 +71,7 @@ stdout of test 'opt_sql_append` in direc
% mal # name
% clob # type
% 183 # length
-function user.s10_1():void;
+function user.s10_0():void;
X_1:void := querylog.define("explain copy into ttt from
E\\'a:\\\\\\\\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, "a:\\tmp/xyz":str, -1:lng, 0:lng,
0:int, 0:int, nil:str, 0:int);
@@ -114,7 +114,7 @@ end user.s10_0;
% L2 # name
% varchar # type
% 6 # length
-[ "user_1" ]
+[ "user_0" ]
#select def from optimizers() where name = optimizer;
% .L1 # table_name
% def # name
@@ -126,8 +126,8 @@ end user.s10_0;
% mal # name
% clob # type
% 182 # length
-function user.s26_1():void;
- X_1:void := querylog.define("explain copy into ttt from
\\'Z:/tmp/xyz\\';":str, "user_1":str, 22:int);
+function user.s26_0():void;
+ X_1:void := querylog.define("explain copy into ttt from
\\'Z:/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, "Z:/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]);
@@ -135,7 +135,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=0 usec
#remap actions= 0 time=2 usec
#costmodel actions= 1 time=1 usec
diff --git a/monetdb5/mal/Tests/tst670.stable.err
b/monetdb5/mal/Tests/tst670.stable.err
--- a/monetdb5/mal/Tests/tst670.stable.err
+++ b/monetdb5/mal/Tests/tst670.stable.err
@@ -10,18 +10,6 @@ stderr of test 'tst670` in directory 'mo
# 09:29:49 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-25470" "--port=39422"
# 09:29:49 >
-MAPI = (monetdb) /var/tmp/mtest-8241/.s.monetdb.34087
-QUERY = function foo();
- io.print("go");
- end foo;
- user.foo();
- clients.quit();
- function foo();
- io.print("gone");
- end foo;
- mdb.List("user","foo");
- user.foo();
-ERROR = !MALException:mal.interpreter:prematurely stopped client
# 09:29:49 >
# 09:29:49 > "Done."
diff --git a/sql/backends/monet5/sql_optimizer.h
b/sql/backends/monet5/sql_optimizer.h
--- a/sql/backends/monet5/sql_optimizer.h
+++ b/sql/backends/monet5/sql_optimizer.h
@@ -14,8 +14,6 @@
sql5_export str SQLoptimizeQuery(Client c, MalBlkPtr mb);
sql5_export str SQLoptimizeFunction(Client c, MalBlkPtr mb);
sql5_export void SQLaddQueryToCache(Client c);
-sql5_export str SQLoptimizer(Client c);
-sql5_export void SQLsetAccessMode(Client c);
sql5_export str getSQLoptimizer(mvc *m);
#endif /* _SQL_OPTIMIZER_H_ */
diff --git
a/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.sql
b/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.sql
---
a/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.sql
+++
b/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.sql
@@ -1,4 +1,3 @@
set optimizer = 'sequential_pipe'; -- to get predictable errors
debug select * from tables;
-n
diff --git
a/sql/test/BugTracker-2019/Tests/prepared-merge-statement.Bug-6706.stable.out
b/sql/test/BugTracker-2019/Tests/prepared-merge-statement.Bug-6706.stable.out
---
a/sql/test/BugTracker-2019/Tests/prepared-merge-statement.Bug-6706.stable.out
+++
b/sql/test/BugTracker-2019/Tests/prepared-merge-statement.Bug-6706.stable.out
@@ -58,11 +58,9 @@ stdout of test 'prepared-merge-statement
# loading sql script: 99_system.sql
# MonetDB/SQL module loaded
-Ready.
-
-# 10:09:57 >
-# 10:09:57 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-31613" "--port=31509"
-# 10:09:57 >
+# 09:11:28 >
+# 09:11:28 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-12052" "--port=37692"
+# 09:11:28 >
#create schema test;
#create table test.share_daily_history (id string, timeid int, c1 int, c2 int,
c3 int, c4 int, volume int);
diff --git a/sql/test/Tests/trace.stable.out b/sql/test/Tests/trace.stable.out
--- a/sql/test/Tests/trace.stable.out
+++ b/sql/test/Tests/trace.stable.out
@@ -35,26 +35,26 @@ stdout of test 'trace` in directory 'sql
% .trace, .trace # table_name
% usec, statement # name
% bigint, clob # type
-% 2, 207 # length
-[ 71, "X_3=0@0:void := querylog.define(\"trace select count(*) from types
where id < 30 and systemname <> \\\\'hge\\\\';\":str, \"sequential_pipe\":str,
25:int);" ]
-[ 48, "X_6=0:int := sql.mvc();" ]
-[ 80, "X_20=<tmp_146>[35]:bat[:str] := sql.bind(X_6=0:int, \"sys\":str,
\"types\":str, \"systemname\":str, 0:int);" ]
-[ 64, "X_10=<tmp_224>[35]:bat[:int] := sql.bind(X_6=0:int, \"sys\":str,
\"types\":str, \"id\":str, 0:int);" ]
-[ 59, "C_7=<tmp_2340>[35]:bat[:oid] := sql.tid(X_6=0:int, \"sys\":str,
\"types\":str);" ]
-[ 84, "C_88=<tmp_3141>[28]:bat[:oid] :=
algebra.thetaselect(X_10=<tmp_224>[35]:bat[:int], C_7=<tmp_2340>[35]:bat[:oid],
30:int, \"<\":str);" ]
-[ 71, "(X_15=<sql_empty_oid_bat>[0]:bat[:oid],
X_16=<sql_empty_int_bat>[0]:bat[:int]) := sql.bind(X_6=0:int, \"sys\":str,
\"types\":str, \"id\":str, 2:int);" ]
-[ 73, "C_89=<tmp_3052>[0]:bat[:oid] :=
algebra.thetaselect(X_16=<sql_empty_int_bat>[0]:bat[:int], nil:bat[:oid],
30:int, \"<\":str);" ]
-[ 65, "X_13=<sql_empty_int_bat>[0]:bat[:int] := sql.bind(X_6=0:int,
\"sys\":str, \"types\":str, \"id\":str, 1:int);" ]
-[ 74, "C_91=<tmp_2767>[0]:bat[:oid] :=
algebra.thetaselect(X_13=<sql_empty_int_bat>[0]:bat[:int],
C_7=<tmp_2340>[35]:bat[:oid], 30:int, \"<\":str);" ]
-[ 73, "C_29=<tmp_3141>[28]:bat[:oid] :=
sql.subdelta(C_88=<tmp_3141>[28]:bat[:oid], C_7=<tmp_2340>[35]:bat[:oid],
X_15=<sql_empty_oid_bat>[0]:bat[:oid], C_89=<tmp_3052>[0]:bat[:oid],
C_91=<tmp_2767>[0]:bat[:oid]);" ]
-[ 70, "C_92=<tmp_2767>[26]:bat[:oid] :=
algebra.thetaselect(X_20=<tmp_146>[35]:bat[:str],
C_29=<tmp_3141>[28]:bat[:oid], \"hge\":str, \"!=\":str);" ]
-[ 74, "(X_23=<sql_empty_oid_bat>[0]:bat[:oid],
X_24=<sql_empty_str_bat>[0]:bat[:str]) := sql.bind(X_6=0:int, \"sys\":str,
\"types\":str, \"systemname\":str, 2:int);" ]
-[ 66, "C_93=<tmp_3052>[0]:bat[:oid] :=
algebra.thetaselect(X_24=<sql_empty_str_bat>[0]:bat[:str], nil:bat[:oid],
\"hge\":str, \"!=\":str);" ]
-[ 64, "X_22=<sql_empty_str_bat>[0]:bat[:str] := sql.bind(X_6=0:int,
\"sys\":str, \"types\":str, \"systemname\":str, 1:int);" ]
-[ 65, "C_95=<tmp_2340>[0]:bat[:oid] :=
algebra.thetaselect(X_22=<sql_empty_str_bat>[0]:bat[:str],
C_29=<tmp_3141>[28]:bat[:oid], \"hge\":str, \"!=\":str);" ]
-[ 77, "C_36=<tmp_2767>[26]:bat[:oid] :=
sql.subdelta(C_92=<tmp_2767>[26]:bat[:oid], C_29=<tmp_3141>[28]:bat[:oid],
X_23=<sql_empty_oid_bat>[0]:bat[:oid], C_93=<tmp_3052>[0]:bat[:oid],
C_95=<tmp_2340>[0]:bat[:oid]);" ]
-[ 47, "X_40=26:lng := aggr.count(C_36=<tmp_2767>[26]:bat[:oid]);" ]
-[ 90, "sql.resultSet(\"sys.L3\":str, \"L3\":str, \"bigint\":str, 64:int,
0:int, 7:int, X_40=26:lng);" ]
+% 3, 207 # length
+[ 86, "X_3=0@0:void := querylog.define(\"trace select count(*) from types
where id < 30 and systemname <> \\\\'hge\\\\';\":str, \"sequential_pipe\":str,
25:int);" ]
+[ 44, "X_6=0:int := sql.mvc();" ]
+[ 155, "X_20=<tmp_146>[35]:bat[:str] := sql.bind(X_6=0:int, \"sys\":str,
\"types\":str, \"systemname\":str, 0:int);" ]
+[ 78, "X_10=<tmp_224>[35]:bat[:int] := sql.bind(X_6=0:int, \"sys\":str,
\"types\":str, \"id\":str, 0:int);" ]
+[ 71, "C_7=<tmp_2330>[35]:bat[:oid] := sql.tid(X_6=0:int, \"sys\":str,
\"types\":str);" ]
+[ 112, "C_88=<tmp_3431>[28]:bat[:oid] :=
algebra.thetaselect(X_10=<tmp_224>[35]:bat[:int], C_7=<tmp_2330>[35]:bat[:oid],
30:int, \"<\":str);" ]
+[ 86, "(X_15=<sql_empty_oid_bat>[0]:bat[:oid],
X_16=<sql_empty_int_bat>[0]:bat[:int]) := sql.bind(X_6=0:int, \"sys\":str,
\"types\":str, \"id\":str, 2:int);" ]
+[ 86, "C_89=<tmp_3113>[0]:bat[:oid] :=
algebra.thetaselect(X_16=<sql_empty_int_bat>[0]:bat[:int], nil:bat[:oid],
30:int, \"<\":str);" ]
+[ 75, "X_13=<sql_empty_int_bat>[0]:bat[:int] := sql.bind(X_6=0:int,
\"sys\":str, \"types\":str, \"id\":str, 1:int);" ]
+[ 85, "C_91=<tmp_2750>[0]:bat[:oid] :=
algebra.thetaselect(X_13=<sql_empty_int_bat>[0]:bat[:int],
C_7=<tmp_2330>[35]:bat[:oid], 30:int, \"<\":str);" ]
+[ 96, "C_29=<tmp_3431>[28]:bat[:oid] :=
sql.subdelta(C_88=<tmp_3431>[28]:bat[:oid], C_7=<tmp_2330>[35]:bat[:oid],
X_15=<sql_empty_oid_bat>[0]:bat[:oid], C_89=<tmp_3113>[0]:bat[:oid],
C_91=<tmp_2750>[0]:bat[:oid]);" ]
+[ 87, "C_92=<tmp_2750>[26]:bat[:oid] :=
algebra.thetaselect(X_20=<tmp_146>[35]:bat[:str],
C_29=<tmp_3431>[28]:bat[:oid], \"hge\":str, \"!=\":str);" ]
+[ 88, "(X_23=<sql_empty_oid_bat>[0]:bat[:oid],
X_24=<sql_empty_str_bat>[0]:bat[:str]) := sql.bind(X_6=0:int, \"sys\":str,
\"types\":str, \"systemname\":str, 2:int);" ]
+[ 75, "C_93=<tmp_3113>[0]:bat[:oid] :=
algebra.thetaselect(X_24=<sql_empty_str_bat>[0]:bat[:str], nil:bat[:oid],
\"hge\":str, \"!=\":str);" ]
+[ 77, "X_22=<sql_empty_str_bat>[0]:bat[:str] := sql.bind(X_6=0:int,
\"sys\":str, \"types\":str, \"systemname\":str, 1:int);" ]
+[ 79, "C_95=<tmp_2330>[0]:bat[:oid] :=
algebra.thetaselect(X_22=<sql_empty_str_bat>[0]:bat[:str],
C_29=<tmp_3431>[28]:bat[:oid], \"hge\":str, \"!=\":str);" ]
+[ 94, "C_36=<tmp_2750>[26]:bat[:oid] :=
sql.subdelta(C_92=<tmp_2750>[26]:bat[:oid], C_29=<tmp_3431>[28]:bat[:oid],
X_23=<sql_empty_oid_bat>[0]:bat[:oid], C_93=<tmp_3113>[0]:bat[:oid],
C_95=<tmp_2330>[0]:bat[:oid]);" ]
+[ 72, "X_40=26:lng := aggr.count(C_36=<tmp_2750>[26]:bat[:oid]);" ]
+[ 152, "sql.resultSet(\"sys.L3\":str, \"L3\":str, \"bigint\":str, 64:int,
0:int, 7:int, X_40=26:lng);" ]
#SELECT COUNT(*) FROM tracelog();
% .L4 # table_name
% L4 # name
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
