Changeset: 545ca1f81b90 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=545ca1f81b90 Modified Files: sql/test/mosaic/Tests/compression.stable.out sql/test/mosaic/Tests/compressionRLE.stable.out sql/test/mosaic/Tests/compressionRLE2.stable.out sql/test/mosaic/Tests/session_exit.stable.out Branch: mosaic Log Message:
Approve output diffs (truncated from 696 to 300 lines): 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 @@ -48,41 +48,41 @@ Ready. function user.s10_1():void; X_1:void := querylog.define("explain select * from tmp3;", "sequential_pipe", 39:int); X_22 := bat.new(nil:str); - X_29 := bat.append(X_22, "sys.tmp3"); - X_37 := bat.append(X_29, "sys.tmp3"); - X_45 := bat.append(X_37, "sys.tmp3"); - X_52 := bat.append(X_45, "sys.tmp3"); + X_28 := bat.new(nil:int); + X_26 := bat.new(nil:int); + X_25 := bat.new(nil:str); X_24 := bat.new(nil:str); - X_31 := bat.append(X_24, "i"); - X_38 := bat.append(X_31, "b"); - X_46 := bat.append(X_38, "f"); - X_53 := bat.append(X_46, "t"); - X_25 := bat.new(nil:str); - X_32 := bat.append(X_25, "int"); - X_39 := bat.append(X_32, "boolean"); - X_47 := bat.append(X_39, "real"); - X_55 := bat.append(X_47, "timestamp"); - X_26 := bat.new(nil:int); - X_34 := bat.append(X_26, 32:int); - X_41 := bat.append(X_34, 1:int); - X_49 := bat.append(X_41, 24:int); - X_57 := bat.append(X_49, 7:int); - X_28 := bat.new(nil:int); - X_36 := bat.append(X_28, 0:int); - X_43 := bat.append(X_36, 0:int); - X_51 := bat.append(X_43, 0:int); - X_59 := bat.append(X_51, 0:int); X_4 := sql.mvc(); C_103:bat[:oid] := sql.tid(X_4, "sys", "tmp3"); X_5:bat[:oid] := mosaic.decompress(C_103); + X_18:bat[:timestamp] := sql.bind(X_4, "sys", "tmp3", "t", 0:int); + X_20 := mosaic.projection(X_5, X_18); + X_15:bat[:flt] := sql.bind(X_4, "sys", "tmp3", "f", 0:int); + X_17 := mosaic.projection(X_5, X_15); + X_12:bat[:bit] := sql.bind(X_4, "sys", "tmp3", "b", 0:int); + X_14 := mosaic.projection(X_5, X_12); X_8:bat[:int] := sql.bind(X_4, "sys", "tmp3", "i", 0:int); X_11 := mosaic.projection(X_5, X_8); - X_12:bat[:bit] := sql.bind(X_4, "sys", "tmp3", "b", 0:int); - X_14 := mosaic.projection(X_5, X_12); - X_15:bat[:flt] := sql.bind(X_4, "sys", "tmp3", "f", 0:int); - X_17 := mosaic.projection(X_5, X_15); - X_18:bat[:timestamp] := sql.bind(X_4, "sys", "tmp3", "t", 0:int); - X_20 := mosaic.projection(X_5, X_18); + X_29 := bat.append(X_22, "sys.tmp3"); + X_31 := bat.append(X_24, "i"); + X_32 := bat.append(X_25, "int"); + X_34 := bat.append(X_26, 32:int); + X_36 := bat.append(X_28, 0:int); + X_37 := bat.append(X_29, "sys.tmp3"); + X_38 := bat.append(X_31, "b"); + X_39 := bat.append(X_32, "boolean"); + X_41 := bat.append(X_34, 1:int); + X_43 := bat.append(X_36, 0:int); + X_45 := bat.append(X_37, "sys.tmp3"); + X_46 := bat.append(X_38, "f"); + X_47 := bat.append(X_39, "real"); + X_49 := bat.append(X_41, 24:int); + X_51 := bat.append(X_43, 0:int); + X_52 := bat.append(X_45, "sys.tmp3"); + X_53 := bat.append(X_46, "t"); + X_55 := bat.append(X_47, "timestamp"); + X_57 := bat.append(X_49, 7:int); + X_59 := bat.append(X_51, 0:int); sql.resultSet(X_52, X_53, X_55, X_57, X_59, X_11, X_14, X_17, X_20); end user.s10_1; #inline actions= 0 time=1 usec @@ -221,41 +221,41 @@ end user.s10_1; function user.s22_1():void; X_1:void := querylog.define("explain select * from tmp3;", "sequential_pipe", 39:int); X_22 := bat.new(nil:str); - X_29 := bat.append(X_22, "sys.tmp3"); - X_37 := bat.append(X_29, "sys.tmp3"); - X_45 := bat.append(X_37, "sys.tmp3"); - X_52 := bat.append(X_45, "sys.tmp3"); + X_28 := bat.new(nil:int); + X_26 := bat.new(nil:int); + X_25 := bat.new(nil:str); X_24 := bat.new(nil:str); - X_31 := bat.append(X_24, "i"); - X_38 := bat.append(X_31, "b"); - X_46 := bat.append(X_38, "f"); - X_53 := bat.append(X_46, "t"); - X_25 := bat.new(nil:str); - X_32 := bat.append(X_25, "int"); - X_39 := bat.append(X_32, "boolean"); - X_47 := bat.append(X_39, "real"); - X_55 := bat.append(X_47, "timestamp"); - X_26 := bat.new(nil:int); - X_34 := bat.append(X_26, 32:int); - X_41 := bat.append(X_34, 1:int); - X_49 := bat.append(X_41, 24:int); - X_57 := bat.append(X_49, 7:int); - X_28 := bat.new(nil:int); - X_36 := bat.append(X_28, 0:int); - X_43 := bat.append(X_36, 0:int); - X_51 := bat.append(X_43, 0:int); - X_59 := bat.append(X_51, 0:int); X_4 := sql.mvc(); C_103:bat[:oid] := sql.tid(X_4, "sys", "tmp3"); X_5:bat[:oid] := mosaic.decompress(C_103); + X_18:bat[:timestamp] := sql.bind(X_4, "sys", "tmp3", "t", 0:int); + X_20 := mosaic.projection(X_5, X_18); + X_15:bat[:flt] := sql.bind(X_4, "sys", "tmp3", "f", 0:int); + X_17 := mosaic.projection(X_5, X_15); + X_12:bat[:bit] := sql.bind(X_4, "sys", "tmp3", "b", 0:int); + X_14 := mosaic.projection(X_5, X_12); X_8:bat[:int] := sql.bind(X_4, "sys", "tmp3", "i", 0:int); X_11 := mosaic.projection(X_5, X_8); - X_12:bat[:bit] := sql.bind(X_4, "sys", "tmp3", "b", 0:int); - X_14 := mosaic.projection(X_5, X_12); - X_15:bat[:flt] := sql.bind(X_4, "sys", "tmp3", "f", 0:int); - X_17 := mosaic.projection(X_5, X_15); - X_18:bat[:timestamp] := sql.bind(X_4, "sys", "tmp3", "t", 0:int); - X_20 := mosaic.projection(X_5, X_18); + X_29 := bat.append(X_22, "sys.tmp3"); + X_31 := bat.append(X_24, "i"); + X_32 := bat.append(X_25, "int"); + X_34 := bat.append(X_26, 32:int); + X_36 := bat.append(X_28, 0:int); + X_37 := bat.append(X_29, "sys.tmp3"); + X_38 := bat.append(X_31, "b"); + X_39 := bat.append(X_32, "boolean"); + X_41 := bat.append(X_34, 1:int); + X_43 := bat.append(X_36, 0:int); + X_45 := bat.append(X_37, "sys.tmp3"); + X_46 := bat.append(X_38, "f"); + X_47 := bat.append(X_39, "real"); + X_49 := bat.append(X_41, 24:int); + X_51 := bat.append(X_43, 0:int); + X_52 := bat.append(X_45, "sys.tmp3"); + X_53 := bat.append(X_46, "t"); + X_55 := bat.append(X_47, "timestamp"); + X_57 := bat.append(X_49, 7:int); + X_59 := bat.append(X_51, 0:int); sql.resultSet(X_52, X_53, X_55, X_57, X_59, X_11, X_14, X_17, X_20); end user.s22_1; #inline actions= 0 time=1 usec @@ -399,41 +399,41 @@ end user.s22_1; function user.s36_1():void; X_1:void := querylog.define("explain select * from tmp3;", "sequential_pipe", 39:int); X_22 := bat.new(nil:str); - X_29 := bat.append(X_22, "sys.tmp3"); - X_37 := bat.append(X_29, "sys.tmp3"); - X_45 := bat.append(X_37, "sys.tmp3"); - X_52 := bat.append(X_45, "sys.tmp3"); + X_28 := bat.new(nil:int); + X_26 := bat.new(nil:int); + X_25 := bat.new(nil:str); X_24 := bat.new(nil:str); - X_31 := bat.append(X_24, "i"); - X_38 := bat.append(X_31, "b"); - X_46 := bat.append(X_38, "f"); - X_53 := bat.append(X_46, "t"); - X_25 := bat.new(nil:str); - X_32 := bat.append(X_25, "int"); - X_39 := bat.append(X_32, "boolean"); - X_47 := bat.append(X_39, "real"); - X_55 := bat.append(X_47, "timestamp"); - X_26 := bat.new(nil:int); - X_34 := bat.append(X_26, 32:int); - X_41 := bat.append(X_34, 1:int); - X_49 := bat.append(X_41, 24:int); - X_57 := bat.append(X_49, 7:int); - X_28 := bat.new(nil:int); - X_36 := bat.append(X_28, 0:int); - X_43 := bat.append(X_36, 0:int); - X_51 := bat.append(X_43, 0:int); - X_59 := bat.append(X_51, 0:int); X_4 := sql.mvc(); C_103:bat[:oid] := sql.tid(X_4, "sys", "tmp3"); X_5:bat[:oid] := mosaic.decompress(C_103); + X_18:bat[:timestamp] := sql.bind(X_4, "sys", "tmp3", "t", 0:int); + X_20 := mosaic.projection(X_5, X_18); + X_15:bat[:flt] := sql.bind(X_4, "sys", "tmp3", "f", 0:int); + X_17 := mosaic.projection(X_5, X_15); + X_12:bat[:bit] := sql.bind(X_4, "sys", "tmp3", "b", 0:int); + X_14 := mosaic.projection(X_5, X_12); X_8:bat[:int] := sql.bind(X_4, "sys", "tmp3", "i", 0:int); X_11 := mosaic.projection(X_5, X_8); - X_12:bat[:bit] := sql.bind(X_4, "sys", "tmp3", "b", 0:int); - X_14 := mosaic.projection(X_5, X_12); - X_15:bat[:flt] := sql.bind(X_4, "sys", "tmp3", "f", 0:int); - X_17 := mosaic.projection(X_5, X_15); - X_18:bat[:timestamp] := sql.bind(X_4, "sys", "tmp3", "t", 0:int); - X_20 := mosaic.projection(X_5, X_18); + X_29 := bat.append(X_22, "sys.tmp3"); + X_31 := bat.append(X_24, "i"); + X_32 := bat.append(X_25, "int"); + X_34 := bat.append(X_26, 32:int); + X_36 := bat.append(X_28, 0:int); + X_37 := bat.append(X_29, "sys.tmp3"); + X_38 := bat.append(X_31, "b"); + X_39 := bat.append(X_32, "boolean"); + X_41 := bat.append(X_34, 1:int); + X_43 := bat.append(X_36, 0:int); + X_45 := bat.append(X_37, "sys.tmp3"); + X_46 := bat.append(X_38, "f"); + X_47 := bat.append(X_39, "real"); + X_49 := bat.append(X_41, 24:int); + X_51 := bat.append(X_43, 0:int); + X_52 := bat.append(X_45, "sys.tmp3"); + X_53 := bat.append(X_46, "t"); + X_55 := bat.append(X_47, "timestamp"); + X_57 := bat.append(X_49, 7:int); + X_59 := bat.append(X_51, 0:int); sql.resultSet(X_52, X_53, X_55, X_57, X_59, X_11, X_14, X_17, X_20); end user.s36_1; #inline actions= 0 time=1 usec diff --git a/sql/test/mosaic/Tests/compressionRLE.stable.out b/sql/test/mosaic/Tests/compressionRLE.stable.out --- a/sql/test/mosaic/Tests/compressionRLE.stable.out +++ b/sql/test/mosaic/Tests/compressionRLE.stable.out @@ -62,41 +62,41 @@ Ready. function user.s14_1():void; X_1:void := querylog.define("explain select * from tmp3rle;", "sequential_pipe", 39:int); X_22 := bat.new(nil:str); - X_29 := bat.append(X_22, "sys.tmp3rle"); - X_37 := bat.append(X_29, "sys.tmp3rle"); - X_45 := bat.append(X_37, "sys.tmp3rle"); - X_52 := bat.append(X_45, "sys.tmp3rle"); + X_28 := bat.new(nil:int); + X_26 := bat.new(nil:int); + X_25 := bat.new(nil:str); X_24 := bat.new(nil:str); - X_31 := bat.append(X_24, "i"); - X_38 := bat.append(X_31, "b"); - X_46 := bat.append(X_38, "f"); - X_53 := bat.append(X_46, "t"); - X_25 := bat.new(nil:str); - X_32 := bat.append(X_25, "int"); - X_39 := bat.append(X_32, "boolean"); - X_47 := bat.append(X_39, "real"); - X_55 := bat.append(X_47, "timestamp"); - X_26 := bat.new(nil:int); - X_34 := bat.append(X_26, 32:int); - X_41 := bat.append(X_34, 1:int); - X_49 := bat.append(X_41, 24:int); - X_57 := bat.append(X_49, 7:int); - X_28 := bat.new(nil:int); - X_36 := bat.append(X_28, 0:int); - X_43 := bat.append(X_36, 0:int); - X_51 := bat.append(X_43, 0:int); - X_59 := bat.append(X_51, 0:int); X_4 := sql.mvc(); C_103:bat[:oid] := sql.tid(X_4, "sys", "tmp3rle"); X_5:bat[:oid] := mosaic.decompress(C_103); + X_18:bat[:timestamp] := sql.bind(X_4, "sys", "tmp3rle", "t", 0:int); + X_20 := mosaic.projection(X_5, X_18); + X_15:bat[:flt] := sql.bind(X_4, "sys", "tmp3rle", "f", 0:int); + X_17 := mosaic.projection(X_5, X_15); + X_12:bat[:bit] := sql.bind(X_4, "sys", "tmp3rle", "b", 0:int); + X_14 := mosaic.projection(X_5, X_12); X_8:bat[:int] := sql.bind(X_4, "sys", "tmp3rle", "i", 0:int); X_11 := mosaic.projection(X_5, X_8); - X_12:bat[:bit] := sql.bind(X_4, "sys", "tmp3rle", "b", 0:int); - X_14 := mosaic.projection(X_5, X_12); - X_15:bat[:flt] := sql.bind(X_4, "sys", "tmp3rle", "f", 0:int); - X_17 := mosaic.projection(X_5, X_15); - X_18:bat[:timestamp] := sql.bind(X_4, "sys", "tmp3rle", "t", 0:int); - X_20 := mosaic.projection(X_5, X_18); + X_29 := bat.append(X_22, "sys.tmp3rle"); + X_31 := bat.append(X_24, "i"); + X_32 := bat.append(X_25, "int"); + X_34 := bat.append(X_26, 32:int); + X_36 := bat.append(X_28, 0:int); + X_37 := bat.append(X_29, "sys.tmp3rle"); + X_38 := bat.append(X_31, "b"); + X_39 := bat.append(X_32, "boolean"); + X_41 := bat.append(X_34, 1:int); + X_43 := bat.append(X_36, 0:int); + X_45 := bat.append(X_37, "sys.tmp3rle"); + X_46 := bat.append(X_38, "f"); + X_47 := bat.append(X_39, "real"); + X_49 := bat.append(X_41, 24:int); + X_51 := bat.append(X_43, 0:int); + X_52 := bat.append(X_45, "sys.tmp3rle"); + X_53 := bat.append(X_46, "t"); + X_55 := bat.append(X_47, "timestamp"); + X_57 := bat.append(X_49, 7:int); + X_59 := bat.append(X_51, 0:int); sql.resultSet(X_52, X_53, X_55, X_57, X_59, X_11, X_14, X_17, X_20); end user.s14_1; #inline actions= 0 time=1 usec @@ -153,20 +153,20 @@ end user.s14_1; function user.s32_1():void; X_1:void := querylog.define("explain select i from tmp3rle;", "sequential_pipe", 18:int); X_13 := bat.new(nil:str); - X_20 := bat.append(X_13, "sys.tmp3rle"); + X_19 := bat.new(nil:int); + X_17 := bat.new(nil:int); + X_16 := bat.new(nil:str); X_15 := bat.new(nil:str); - X_22 := bat.append(X_15, "i"); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list