Changeset: d1b131d12a67 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d1b131d12a67
Modified Files:
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err.Windows
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
sql/test/emptydb/Tests/check.stable.out
Branch: default
Log Message:
Approved output
diffs (167 lines):
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err.Windows
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err.Windows
---
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err.Windows
+++
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err.Windows
@@ -34,18 +34,10 @@ MAPI = monetdb@LAB03:37903
QUERY = explain copy into ttt from '/tmp/xyz';
ERROR = !COPY INTO: filename must have absolute path: "/tmp/xyz"
CODE = 42000
-MAPI = monetdb@WIN2K12R2:34268
-QUERY = explain copy into ttt from E'\\tmp/xyz';
-ERROR = !COPY INTO: filename must have absolute path: "\\tmp/xyz"
-CODE = 42000
MAPI = monetdb@LAB03:37903
QUERY = explain copy into ttt from '/tmp/xyz';
ERROR = !COPY INTO: filename must have absolute path: "/tmp/xyz"
CODE = 42000
-MAPI = monetdb@WIN2K12R2:34268
-QUERY = explain copy into ttt from E'\\tmp/xyz';
-ERROR = !COPY INTO: filename must have absolute path: "\\tmp/xyz"
-CODE = 42000
# 22:58:58 >
# 22:58:58 > "Done."
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
@@ -66,12 +66,53 @@ stdout of test 'opt_sql_append` in direc
% clob # type
% 580 # length
[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.aliases();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.matpack();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.deadcode();optimizer.postfix();optimizer.wlc();optimizer.garbageCollector();"
]
+#explain copy into ttt from E'\\tmp/xyz';
+% .explain # table_name
+% mal # name
+% clob # type
+% 183 # length
+function user.s10_0():void;
+ X_1:void := querylog.define("explain copy into ttt from
E\\'\\\\\\\\tmp/xyz\\';":str, "sequential_pipe":str, 23:int);
+ X_4:int := sql.mvc();
+ (X_28:bat[:int], X_29:bat[:int], X_30:bat[:int]) :=
sql.copy_from("sys":str, "ttt":str, "|":str, "\n":str, nil:str, "null":str,
"\\tmp/xyz":str, -1:lng, 0:lng, 0:int, 0:int, nil:str, 0:int);
+ X_32:int := sql.append(X_4:int, "sys":str, "ttt":str, "a":str,
X_28:bat[:int]);
+ X_35:int := sql.append(X_32:int, "sys":str, "ttt":str, "b":str,
X_29:bat[:int]);
+ X_38:int := sql.append(X_35:int, "sys":str, "ttt":str, "c":str,
X_30:bat[:int]);
+ X_40:lng := aggr.count(X_30:bat[:int]);
+ sql.affectedRows(X_38:int, X_40:lng);
+end user.s10_0;
+#inline actions= 0 time=0 usec
+#remap actions= 0 time=0 usec
+#costmodel actions= 1 time=0 usec
+#coercion actions=12 time=0 usec
+#aliases actions=12 time=0 usec
+#evaluate actions= 0 time=0 usec
+#emptybind actions= 0 time=0 usec
+#pushselect actions= 0 time=0 usec
+#aliases actions= 0 time=0 usec
+#mergetable actions= 0 time=0 usec
+#deadcode actions= 0 time=0 usec
+#aliases actions= 0 time=0 usec
+#constants actions= 0 time=0 usec
+#commonTerms actions= 0 time=0 usec
+#projectionpath actions= 0 time=0 usec
+#deadcode actions= 0 time=0 usec
+#reorder actions= 1 time=0 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=0 usec
+#postfix actions= 0 time=0 usec
+#wlc actions= 0 time=0 usec
+#garbagecollector actions= 1 time=0 usec
+#total actions=27 time=0 usec
#explain copy into ttt from E'a:\\tmp/xyz';
% .explain # table_name
% mal # name
% clob # type
% 190 # length
-function user.s10_0():void;
+function user.s12_0():void;
X_1:void := querylog.define("explain copy into ttt from
E\\'a:\\\\\\\\tmp/xyz\\';":str, "sequential_pipe":str, 23:int);
X_4:int := sql.mvc();
(X_28:bat[:int], X_29:bat[:int], X_30:bat[:int]) :=
sql.copy_from("sys":str, "ttt":str, "|":str, "\n":str, nil:str, "null":str,
"a:\\tmp/xyz":str, -1:lng, 0:lng, 0:int, 0:int, nil:str, 0:int);
@@ -80,7 +121,7 @@ function user.s10_0():void;
X_38:int := sql.append(X_35:int, "sys":str, "ttt":str, "c":str,
X_30:bat[:int]);
X_40:lng := aggr.count(X_30:bat[:int]);
sql.affectedRows(X_38:int, X_40:lng);
-end user.s10_0;
+end user.s12_0;
#inline actions= 0 time=1 usec
#remap actions= 0 time=2 usec
#costmodel actions= 1 time=1 usec
@@ -121,12 +162,54 @@ end user.s10_0;
% clob # type
% 603 # length
[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.aliases();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.matpack();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.deadcode();optimizer.postfix();optimizer.wlc();optimizer.sql_append();optimizer.garbageCollector();"
]
+#explain copy into ttt from E'\\tmp/xyz';
+% .explain # table_name
+% mal # name
+% clob # type
+% 195 # length
+function user.s28_0():void;
+ X_1:void := querylog.define("explain copy into ttt from
E\\'\\\\\\\\tmp/xyz\\';":str, "user_0":str, 23:int);
+ X_4:int := sql.mvc();
+ (X_28:bat[:int], X_29:bat[:int], X_30:bat[:int]) :=
sql.copy_from("sys":str, "ttt":str, "|":str, "\n":str, nil:str, "null":str,
"\\tmp/xyz":str, -1:lng, 0:lng, 0:int, 0:int, nil:str, 0:int);
+ X_32:int := sql.append(X_4:int, "sys":str, "ttt":str, "a":str,
X_28:bat[:int]);
+ X_35:int := sql.append(X_32:int, "sys":str, "ttt":str, "b":str,
X_29:bat[:int]);
+ X_40:lng := aggr.count(X_30:bat[:int]);
+ X_38:int := sql.append(X_35:int, "sys":str, "ttt":str, "c":str,
X_30:bat[:int]);
+ sql.affectedRows(X_38:int, X_40:lng);
+end user.s28_0;
+#inline actions= 0 time=0 usec
+#remap actions= 0 time=0 usec
+#costmodel actions= 1 time=0 usec
+#coercion actions=12 time=0 usec
+#aliases actions=12 time=0 usec
+#evaluate actions= 0 time=0 usec
+#emptybind actions= 0 time=0 usec
+#pushselect actions= 0 time=0 usec
+#aliases actions= 0 time=0 usec
+#mergetable actions= 0 time=0 usec
+#deadcode actions= 0 time=0 usec
+#aliases actions= 0 time=0 usec
+#constants actions= 0 time=0 usec
+#commonTerms actions= 0 time=0 usec
+#projectionpath actions= 0 time=0 usec
+#deadcode actions= 0 time=0 usec
+#reorder actions= 1 time=0 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=0 usec
+#postfix actions= 0 time=0 usec
+#wlc actions= 0 time=0 usec
+#optimizer.sql_append actions= 1 time=0 usec
+#garbagecollector actions= 1 time=0 usec
+#total actions=28 time=0 usec
#explain copy into ttt from 'Z:/tmp/xyz';
% .explain # table_name
% mal # name
% clob # type
-% 189 # length
-function user.s26_0():void;
+% 196 # length
+function user.s30_0():void;
X_1:void := querylog.define("explain copy into ttt from
\\'Z:/tmp/xyz\\';":str, "user_0":str, 23:int);
X_4:int := sql.mvc();
(X_28:bat[:int], X_29:bat[:int], X_30:bat[:int]) :=
sql.copy_from("sys":str, "ttt":str, "|":str, "\n":str, nil:str, "null":str,
"Z:/tmp/xyz":str, -1:lng, 0:lng, 0:int, 0:int, nil:str, 0:int);
@@ -135,7 +218,7 @@ function user.s26_0():void;
X_40:lng := aggr.count(X_30:bat[:int]);
X_38:int := sql.append(X_35:int, "sys":str, "ttt":str, "c":str,
X_30:bat[:int]);
sql.affectedRows(X_38:int, X_40:lng);
-end user.s26_0;
+end user.s30_0;
#inline actions= 0 time=0 usec
#remap actions= 0 time=2 usec
#costmodel actions= 1 time=1 usec
diff --git a/sql/test/emptydb/Tests/check.stable.out
b/sql/test/emptydb/Tests/check.stable.out
--- a/sql/test/emptydb/Tests/check.stable.out
+++ b/sql/test/emptydb/Tests/check.stable.out
@@ -2209,7 +2209,7 @@ drop function pcre_replace(string, strin
% .s, .f, ., ., .f, .fl, .ft, .f, .f, .f,
., ., ., ., ., ., ., ., ., .,
., ., ., ., ., ., ., ., ., .,
., ., ., ., ., ., ., ., ., .,
., ., ., ., ., ., ., ., ., .,
., ., ., ., ., ., ., ., ., .,
., ., ., ., ., ., ., ., ., .,
., ., ., ., ., ., ., ., ., .,
., ., ., ., ., ., ., ., ., . #
table_name
% name, name, system, query, mod, language_name,
function_type_name, side_effect, varres, vararg, name0, type0,
type_digits0, type_scale0, inout0, name1, type1, type_digits1,
type_scale1, inout1, name2, type2, type_digits2, type_scale2, inout2,
name3, type3, type_digits3, type_scale3, inout3, name4, type4,
type_digits4, type_scale4, inout4, name5, type5, type_digits5,
type_scale5, inout5, name6, type6, type_digits6, type_scale6, inout6,
name7, type7, type_digits7, type_scale7, inout7, name8, type8,
type_digits8, type_scale8, inout8, name9, type9, type_digits9,
type_scale9, inout9, name10, type10, type_digits10, type_scale10,
inout10, name11, type11, type_digits11, type_scale11, inout11,
name12, type12, type_digits12, type_scale12, inout12, name13, type13,
type_digits13, type_scale13, inout13, name14, type14, type_digits14,
type_scale14, inout14, name15, type15, type_digits15, type_scale15,
inout15 # name
% varchar, varchar, char, varchar, varchar,
varchar, varchar, boolean, boolean, boolean,
varchar, varchar, int, int, char, varchar,
varchar, int, int, char, varchar, varchar, int,
int, char, varchar, varchar, int, int, char,
varchar, varchar, int, int, char, varchar,
varchar, int, int, char, varchar, varchar, int,
int, char, varchar, varchar, int, int, char,
varchar, varchar, int, int, char, varchar,
varchar, int, int, char, varchar, varchar, int,
int, char, varchar, varchar, int, int, char,
varchar, varchar, int, int, char, varchar,
varchar, int, int, char, varchar, varchar, int,
int, char, varchar, varchar, int, int, char # type
-% 8, 24, 6, 1362, 9, 10, 26, 5, 5, 5,
11, 14, 4, 1, 3, 16, 14, 4, 1, 3,
16, 14, 4, 1, 3, 27, 12, 4, 1, 3,
9, 9, 2, 1, 3, 14, 14, 4, 1, 3,
12, 14, 2, 1, 3, 11, 7, 2, 1, 3,
11, 7, 2, 1, 3, 8, 6, 2, 1, 3,
6, 6, 2, 1, 3, 6, 7, 1, 1, 3,
8, 6, 2, 1, 3, 6, 7, 1, 1, 3,
9, 7, 1, 1, 3, 6, 7, 1, 1, 3 #
length
+% 8, 24, 6, 1362, 9, 10, 26, 5, 5, 5,
11, 14, 4, 1, 3, 16, 14, 4, 1, 3,
16, 14, 4, 1, 3, 27, 12, 4, 1, 3,
9, 9, 2, 1, 3, 14, 14, 4, 1, 3,
12, 14, 2, 1, 3, 11, 7, 2, 1, 3,
11, 7, 2, 1, 3, 8, 6, 2, 1, 3,
6, 6, 2, 1, 3, 6, 7, 2, 1, 3,
8, 7, 2, 1, 3, 6, 7, 2, 1, 3,
9, 7, 1, 1, 3, 6, 7, 1, 1, 3 #
length
[ "bam", "bam_drop_file", "SYSTEM", "create procedure
bam.bam_drop_file(file_id bigint, dbschema smallint) external name
bam.bam_drop_file;", "bam", "MAL", "Procedure", true, false,
false, "file_id", "bigint", 64, 0, "in", "dbschema",
"smallint", 16, 0, "in", NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL ]
[ "bam", "bam_export", "SYSTEM", "create procedure
bam.bam_export(output_path string) external name bam.bam_export;", "bam",
"MAL", "Procedure", true, false, false, "output_path", "clob", 0,
0, "in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
[ "bam", "bam_flag", "SYSTEM", "create function
bam.bam_flag(flag smallint, name string) returns boolean external name
bam.bam_flag;", "bam", "MAL", "Scalar function", false, false, false,
"result", "boolean", 1, 0, "out", "flag", "smallint",
16, 0, "in", "name", "clob", 0, 0, "in", NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
