Changeset: 39805d36a889 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=39805d36a889 Modified Files: monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows Branch: default Log Message:
Approve Windows output. diffs (72 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,16 +71,16 @@ Ready. % .explain # table_name % mal # name % clob # type -% 177 # length +% 184 # length function user.s10_1():void; - X_1:void := querylog.define("explain copy into ttt from \\'a:\\\\tmp/xyz\\';":str, "sequential_pipe":str, 21:int); + X_1:void := querylog.define("explain copy into ttt from \\'a:\\\\tmp/xyz\\';":str, "sequential_pipe":str, 22:int); X_4:int := sql.mvc(); - (X_25:bat[:int], X_26:bat[:int], X_27: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); - X_29:int := sql.append(X_4:int, "sys":str, "ttt":str, "a":str, X_25:bat[:int]); - X_34:int := sql.append(X_29:int, "sys":str, "ttt":str, "b":str, X_26:bat[:int]); - X_37:int := sql.append(X_34:int, "sys":str, "ttt":str, "c":str, X_27:bat[:int]); - X_39:lng := aggr.count(X_27:bat[:int]); - sql.affectedRows(X_37:int, X_39:lng); + (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); + X_30:int := sql.append(X_4:int, "sys":str, "ttt":str, "a":str, X_26:bat[:int]); + X_35:int := sql.append(X_30:int, "sys":str, "ttt":str, "b":str, X_27:bat[:int]); + 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; #inline actions= 0 time=1 usec #remap actions= 0 time=2 usec @@ -126,16 +126,16 @@ end user.s10_1; % .explain # table_name % mal # name % clob # type -% 176 # length +% 183 # length function user.s26_1():void; - X_1:void := querylog.define("explain copy into ttt from \\'Z:/tmp/xyz\\';":str, "user_1":str, 21:int); + X_1:void := querylog.define("explain copy into ttt from \\'Z:/tmp/xyz\\';":str, "user_1":str, 22:int); X_4:int := sql.mvc(); - (X_25:bat[:int], X_26:bat[:int], X_27: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); - X_29:int := sql.append(X_4:int, "sys":str, "ttt":str, "a":str, X_25:bat[:int]); - X_34:int := sql.append(X_29:int, "sys":str, "ttt":str, "b":str, X_26:bat[:int]); - X_39:lng := aggr.count(X_27:bat[:int]); - X_37:int := sql.append(X_34:int, "sys":str, "ttt":str, "c":str, X_27:bat[:int]); - sql.affectedRows(X_37:int, X_39:lng); + (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]); + X_35:int := sql.append(X_30:int, "sys":str, "ttt":str, "b":str, X_27:bat[:int]); + 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; #inline actions= 0 time=0 usec #remap actions= 0 time=2 usec diff --git a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows --- a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows +++ b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows @@ -28,12 +28,12 @@ Ready. % .plan # table_name % rel # name % clob # type -% 202 # length +% 211 # length insert( | table(sys.cm_tmp) [ "cm_tmp"."i", "cm_tmp"."%TID%" NOT NULL ] | union ( -| | table sys.copyfrom(table(cm_tmp), varchar "|", varchar "\n", varchar "NULL", varchar "null", varchar "a:\file1", bigint "-1", bigint "0", int "0", int "0", varchar "NULL"), [ "cm_tmp"."i" ] COUNT , -| | table sys.copyfrom(table(cm_tmp), varchar "|", varchar "\n", varchar "NULL", varchar "null", varchar "Z:/file2", bigint "-1", bigint "0", int "0", int "0", varchar "NULL"), [ "cm_tmp"."i" ] COUNT +| | table sys.copyfrom(table(cm_tmp), varchar "|", varchar "\n", varchar "NULL", varchar "null", varchar "a:\file1", bigint "-1", bigint "0", int "0", int "0", varchar "NULL", int "0"), [ "cm_tmp"."i" ] COUNT , +| | table sys.copyfrom(table(cm_tmp), varchar "|", varchar "\n", varchar "NULL", varchar "null", varchar "Z:/file2", bigint "-1", bigint "0", int "0", int "0", varchar "NULL", int "0"), [ "cm_tmp"."i" ] COUNT | ) [ int "NULL" ] ) _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list