Changeset: 92b637c4db3e for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=92b637c4db3e Modified Files: sql/test/mosaic/Tests/compression.stable.err sql/test/mosaic/Tests/compression.stable.out sql/test/mosaic/Tests/xqueries.stable.out sql/test/mosaic/Tests/xqueries_delta.stable.out Branch: mosaic Log Message:
Approve tests diffs (198 lines): diff --git a/sql/test/mosaic/Tests/compression.stable.err b/sql/test/mosaic/Tests/compression.stable.err --- a/sql/test/mosaic/Tests/compression.stable.err +++ b/sql/test/mosaic/Tests/compression.stable.err @@ -30,7 +30,7 @@ stderr of test 'compression` in director # 14:00:27 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-19726" "--port=38313" # 14:00:27 > -MAPI = (monetdb) /var/tmp/mtest-28373/.s.monetdb.30051 +MAPI = (monetdb) /var/tmp/mtest-30987/.s.monetdb.36867 QUERY = drop table tmp3; ERROR = !DROP TABLE: no such table 'tmp3' diff --git a/sql/test/mosaic/Tests/compression.stable.out b/sql/test/mosaic/Tests/compression.stable.out --- a/sql/test/mosaic/Tests/compression.stable.out +++ b/sql/test/mosaic/Tests/compression.stable.out @@ -44,17 +44,17 @@ Ready. % .explain # table_name % mal # name % clob # type -% 66 # length +% 67 # length function user.s6_1{autoCommit=true}():void; X_2 := sql.mvc(); X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","tmp3"); - X_6 := sql.bind(X_2,"sys","tmp3","i",0); + X_6:bat[:oid,:int] := sql.bind(X_2,"sys","tmp3","i",0); X_9 := mosaic.leftfetchjoin(X_3,X_6); - X_16 := sql.bind(X_2,"sys","tmp3","t",0); + X_16:bat[:oid,:timestamp] := sql.bind(X_2,"sys","tmp3","t",0); X_18 := mosaic.leftfetchjoin(X_3,X_16); - X_13 := sql.bind(X_2,"sys","tmp3","f",0); + X_13:bat[:oid,:flt] := sql.bind(X_2,"sys","tmp3","f",0); X_15 := mosaic.leftfetchjoin(X_3,X_13); - X_10 := sql.bind(X_2,"sys","tmp3","b",0); + X_10:bat[:oid,:bit] := sql.bind(X_2,"sys","tmp3","b",0); X_12 := mosaic.leftfetchjoin(X_3,X_10); X_19 := sql.resultSet(4,1,X_9); sql.rsColumn(X_19,"sys.tmp3","i","int",32,0,X_9); @@ -163,17 +163,17 @@ end s6_1; % .explain # table_name % mal # name % clob # type -% 66 # length +% 67 # length function user.s10_1{autoCommit=true}():void; X_2 := sql.mvc(); X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","tmp3"); - X_6 := sql.bind(X_2,"sys","tmp3","i",0); + X_6:bat[:oid,:int] := sql.bind(X_2,"sys","tmp3","i",0); X_9 := mosaic.leftfetchjoin(X_3,X_6); - X_16 := sql.bind(X_2,"sys","tmp3","t",0); + X_16:bat[:oid,:timestamp] := sql.bind(X_2,"sys","tmp3","t",0); X_18 := mosaic.leftfetchjoin(X_3,X_16); - X_13 := sql.bind(X_2,"sys","tmp3","f",0); + X_13:bat[:oid,:flt] := sql.bind(X_2,"sys","tmp3","f",0); X_15 := mosaic.leftfetchjoin(X_3,X_13); - X_10 := sql.bind(X_2,"sys","tmp3","b",0); + X_10:bat[:oid,:bit] := sql.bind(X_2,"sys","tmp3","b",0); X_12 := mosaic.leftfetchjoin(X_3,X_10); X_19 := sql.resultSet(4,1,X_9); sql.rsColumn(X_19,"sys.tmp3","i","int",32,0,X_9); @@ -282,17 +282,17 @@ end s10_1; % .explain # table_name % mal # name % clob # type -% 66 # length +% 67 # length function user.s14_1{autoCommit=true}():void; X_2 := sql.mvc(); X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","tmp3"); - X_6 := sql.bind(X_2,"sys","tmp3","i",0); + X_6:bat[:oid,:int] := sql.bind(X_2,"sys","tmp3","i",0); X_9 := mosaic.leftfetchjoin(X_3,X_6); - X_16 := sql.bind(X_2,"sys","tmp3","t",0); + X_16:bat[:oid,:timestamp] := sql.bind(X_2,"sys","tmp3","t",0); X_18 := mosaic.leftfetchjoin(X_3,X_16); - X_13 := sql.bind(X_2,"sys","tmp3","f",0); + X_13:bat[:oid,:flt] := sql.bind(X_2,"sys","tmp3","f",0); X_15 := mosaic.leftfetchjoin(X_3,X_13); - X_10 := sql.bind(X_2,"sys","tmp3","b",0); + X_10:bat[:oid,:bit] := sql.bind(X_2,"sys","tmp3","b",0); X_12 := mosaic.leftfetchjoin(X_3,X_10); X_19 := sql.resultSet(4,1,X_9); sql.rsColumn(X_19,"sys.tmp3","i","int",32,0,X_9); diff --git a/sql/test/mosaic/Tests/xqueries.stable.out b/sql/test/mosaic/Tests/xqueries.stable.out --- a/sql/test/mosaic/Tests/xqueries.stable.out +++ b/sql/test/mosaic/Tests/xqueries.stable.out @@ -49,7 +49,7 @@ Ready. % 84 # length function user.s6_1{autoCommit=true}(A0:int):void; X_3 := sql.mvc(); - X_7 := sql.bind(X_3,"sys","tmp3","i",0); + X_7:bat[:oid,:int] := sql.bind(X_3,"sys","tmp3","i",0); X_10 := X_7; X_4:bat[:oid,:oid] := sql.tid(X_3,"sys","tmp3"); X_11 := mosaic.thetasubselect(X_10,X_4,A0,"<"); @@ -71,7 +71,7 @@ end s6_1; % 85 # length function user.s7_1{autoCommit=true}(A0:int):void; X_3 := sql.mvc(); - X_7 := sql.bind(X_3,"sys","tmp3","i",0); + X_7:bat[:oid,:int] := sql.bind(X_3,"sys","tmp3","i",0); X_10 := X_7; X_4:bat[:oid,:oid] := sql.tid(X_3,"sys","tmp3"); X_11 := mosaic.subselect(X_10,X_4,A0,A0,true,true,false); @@ -108,7 +108,7 @@ end s7_1; % 84 # length function user.s13_1{autoCommit=true}(A0:int):void; X_3 := sql.mvc(); - X_7 := sql.bind(X_3,"sys","tmp3","i",0); + X_7:bat[:oid,:int] := sql.bind(X_3,"sys","tmp3","i",0); X_10 := X_7; X_4:bat[:oid,:oid] := sql.tid(X_3,"sys","tmp3"); X_11 := mosaic.thetasubselect(X_10,X_4,A0,"<"); @@ -130,7 +130,7 @@ end s13_1; % 85 # length function user.s14_1{autoCommit=true}(A0:int):void; X_3 := sql.mvc(); - X_7 := sql.bind(X_3,"sys","tmp3","i",0); + X_7:bat[:oid,:int] := sql.bind(X_3,"sys","tmp3","i",0); X_10 := X_7; X_4:bat[:oid,:oid] := sql.tid(X_3,"sys","tmp3"); X_11 := mosaic.subselect(X_10,X_4,A0,A0,true,true,false); @@ -167,7 +167,7 @@ end s14_1; % 84 # length function user.s20_1{autoCommit=true}(A0:int):void; X_3 := sql.mvc(); - X_7 := sql.bind(X_3,"sys","tmp3","i",0); + X_7:bat[:oid,:int] := sql.bind(X_3,"sys","tmp3","i",0); X_10 := X_7; X_4:bat[:oid,:oid] := sql.tid(X_3,"sys","tmp3"); X_11 := mosaic.thetasubselect(X_10,X_4,A0,"<"); @@ -189,7 +189,7 @@ end s20_1; % 85 # length function user.s21_1{autoCommit=true}(A0:int):void; X_3 := sql.mvc(); - X_7 := sql.bind(X_3,"sys","tmp3","i",0); + X_7:bat[:oid,:int] := sql.bind(X_3,"sys","tmp3","i",0); X_10 := X_7; X_4:bat[:oid,:oid] := sql.tid(X_3,"sys","tmp3"); X_11 := mosaic.subselect(X_10,X_4,A0,A0,true,true,false); diff --git a/sql/test/mosaic/Tests/xqueries_delta.stable.out b/sql/test/mosaic/Tests/xqueries_delta.stable.out --- a/sql/test/mosaic/Tests/xqueries_delta.stable.out +++ b/sql/test/mosaic/Tests/xqueries_delta.stable.out @@ -49,7 +49,7 @@ Ready. % 84 # length function user.s6_1{autoCommit=true}(A0:int):void; X_3 := sql.mvc(); - X_7 := sql.bind(X_3,"sys","tmp3","i",0); + X_7:bat[:oid,:int] := sql.bind(X_3,"sys","tmp3","i",0); X_10 := X_7; X_4:bat[:oid,:oid] := sql.tid(X_3,"sys","tmp3"); X_11 := mosaic.thetasubselect(X_10,X_4,A0,"<"); @@ -71,7 +71,7 @@ end s6_1; % 85 # length function user.s7_1{autoCommit=true}(A0:int):void; X_3 := sql.mvc(); - X_7 := sql.bind(X_3,"sys","tmp3","i",0); + X_7:bat[:oid,:int] := sql.bind(X_3,"sys","tmp3","i",0); X_10 := X_7; X_4:bat[:oid,:oid] := sql.tid(X_3,"sys","tmp3"); X_11 := mosaic.subselect(X_10,X_4,A0,A0,true,true,false); @@ -108,7 +108,7 @@ end s7_1; % 84 # length function user.s13_1{autoCommit=true}(A0:int):void; X_3 := sql.mvc(); - X_7 := sql.bind(X_3,"sys","tmp3","i",0); + X_7:bat[:oid,:int] := sql.bind(X_3,"sys","tmp3","i",0); X_10 := X_7; X_4:bat[:oid,:oid] := sql.tid(X_3,"sys","tmp3"); X_11 := mosaic.thetasubselect(X_10,X_4,A0,"<"); @@ -130,7 +130,7 @@ end s13_1; % 85 # length function user.s14_1{autoCommit=true}(A0:int):void; X_3 := sql.mvc(); - X_7 := sql.bind(X_3,"sys","tmp3","i",0); + X_7:bat[:oid,:int] := sql.bind(X_3,"sys","tmp3","i",0); X_10 := X_7; X_4:bat[:oid,:oid] := sql.tid(X_3,"sys","tmp3"); X_11 := mosaic.subselect(X_10,X_4,A0,A0,true,true,false); @@ -167,7 +167,7 @@ end s14_1; % 84 # length function user.s20_1{autoCommit=true}(A0:int):void; X_3 := sql.mvc(); - X_7 := sql.bind(X_3,"sys","tmp3","i",0); + X_7:bat[:oid,:int] := sql.bind(X_3,"sys","tmp3","i",0); X_10 := X_7; X_4:bat[:oid,:oid] := sql.tid(X_3,"sys","tmp3"); X_11 := mosaic.thetasubselect(X_10,X_4,A0,"<"); @@ -189,7 +189,7 @@ end s20_1; % 85 # length function user.s21_1{autoCommit=true}(A0:int):void; X_3 := sql.mvc(); - X_7 := sql.bind(X_3,"sys","tmp3","i",0); + X_7:bat[:oid,:int] := sql.bind(X_3,"sys","tmp3","i",0); X_10 := X_7; X_4:bat[:oid,:oid] := sql.tid(X_3,"sys","tmp3"); X_11 := mosaic.subselect(X_10,X_4,A0,A0,true,true,false); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list