Changeset: b01af22044a1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b01af22044a1
Modified Files:
sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out
sql/backends/monet5/UDF/cudf/Tests/udf-reverse.stable.out
sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
sql/test/mergetables/Tests/mergequery.stable.out
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
sql/test/mosaic/Tests/xqueries.stable.out
sql/test/mosaic/Tests/xqueries_delta.stable.out
sql/test/mosaic/Tests/xqueries_rle.stable.out
sql/test/remote/Tests/partition_elim.stable.out
Branch: mosaic
Log Message:
Accept output
diffs (truncated from 2741 to 300 lines):
diff --git a/sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out
b/sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out
--- a/sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out
+++ b/sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out
@@ -27,11 +27,11 @@ Ready.
% .explain # table_name
% mal # name
% clob # type
-% 85 # length
+% 87 # length
function user.s4_1():void;
- X_0:void := querylog.define("explain select
fuse(1,2);","sequential_pipe",8:int);
- X_6:sht := udf.fuse(1:bte,2:bte);
- sql.resultSet(".L2","L2","smallint",16:int,0:int,7:int,X_6);
+ X_0:void := querylog.define("explain select fuse(1,2);",
"sequential_pipe", 8:int);
+ X_6:sht := udf.fuse(1:bte, 2:bte);
+ sql.resultSet(".L2", "L2", "smallint", 16:int, 0:int, 7:int, X_6);
end user.s4_1;
#inline actions= 0 time=2 usec
#candidates actions= 1 time=12 usec
@@ -68,11 +68,11 @@ end user.s4_1;
% .explain # table_name
% mal # name
% clob # type
-% 91 # length
+% 93 # length
function user.s6_1():void;
- X_0:void := querylog.define("explain select
fuse(1000,2000);","sequential_pipe",8:int);
- X_6:int := udf.fuse(1000:sht,2000:sht);
- sql.resultSet(".L2","L2","int",32:int,0:int,7:int,X_6);
+ X_0:void := querylog.define("explain select fuse(1000,2000);",
"sequential_pipe", 8:int);
+ X_6:int := udf.fuse(1000:sht, 2000:sht);
+ sql.resultSet(".L2", "L2", "int", 32:int, 0:int, 7:int, X_6);
end user.s6_1;
#inline actions= 0 time=2 usec
#candidates actions= 1 time=10 usec
@@ -109,11 +109,11 @@ end user.s6_1;
% .explain # table_name
% mal # name
% clob # type
-% 97 # length
+% 99 # length
function user.s8_1():void;
- X_0:void := querylog.define("explain select
fuse(1000000,2000000);","sequential_pipe",8:int);
- X_6:lng := udf.fuse(1000000:int,2000000:int);
- sql.resultSet(".L2","L2","bigint",64:int,0:int,7:int,X_6);
+ X_0:void := querylog.define("explain select fuse(1000000,2000000);",
"sequential_pipe", 8:int);
+ X_6:lng := udf.fuse(1000000:int, 2000000:int);
+ sql.resultSet(".L2", "L2", "bigint", 64:int, 0:int, 7:int, X_6);
end user.s8_1;
#inline actions= 0 time=3 usec
#candidates actions= 1 time=10 usec
@@ -168,28 +168,27 @@ end user.s8_1;
% .explain # table_name
% mal # name
% clob # type
-% 100 # length
+% 102 # length
function user.s16_1():void;
- X_0:void := querylog.define("explain select fuse(a,b) from
udf_fuse;","sequential_pipe",27:int);
+ X_0:void := querylog.define("explain select fuse(a,b) from udf_fuse;",
"sequential_pipe", 27:int);
X_28 := bat.new(nil:str);
- X_35 := bat.append(X_28,"sys.L2");
+ X_35 := bat.append(X_28, "sys.L2");
X_30 := bat.new(nil:str);
- X_37 := bat.append(X_30,"L2");
+ X_37 := bat.append(X_30, "L2");
X_31 := bat.new(nil:str);
- X_39 := bat.append(X_31,"smallint");
+ X_39 := bat.append(X_31, "smallint");
X_32 := bat.new(nil:int);
- X_41 := bat.append(X_32,16:int);
+ X_41 := bat.append(X_32, 16:int);
X_34 := bat.new(nil:int);
- X_43 := bat.append(X_34,0:int);
+ X_43 := bat.append(X_34, 0:int);
X_3 := sql.mvc();
- C_4:bat[:oid] := sql.tid(X_3,"sys","udf_fuse");
- X_7:bat[:bte] := sql.bind(X_3,"sys","udf_fuse","a",0:int);
- X_16 := mosaic.projection(C_4,X_7);
- X_17:bat[:bte] := sql.bind(X_3,"sys","udf_fuse","b",0:int);
- X_23 := mosaic.projection(C_4,X_17);
- X_24:bat[:sht] := batudf.fuse(X_16,X_23);
-# querylog.define("explain select fuse(a,b) from udf_fuse;","sequential_pipe")
- sql.resultSet(X_35,X_37,X_39,X_41,X_43,X_24);
+ C_4:bat[:oid] := sql.tid(X_3, "sys", "udf_fuse");
+ X_7:bat[:bte] := sql.bind(X_3, "sys", "udf_fuse", "a", 0:int);
+ X_16 := mosaic.projection(C_4, X_7);
+ X_17:bat[:bte] := sql.bind(X_3, "sys", "udf_fuse", "b", 0:int);
+ X_23 := mosaic.projection(C_4, X_17);
+ X_24:bat[:sht] := batudf.fuse(X_16, X_23);
+ sql.resultSet(X_35, X_37, X_39, X_41, X_43, X_24);
end user.s16_1;
#inline actions= 0 time=4 usec
#candidates actions= 1 time=19 usec
@@ -220,28 +219,27 @@ end user.s16_1;
% .explain # table_name
% mal # name
% clob # type
-% 100 # length
+% 102 # length
function user.s18_1():void;
- X_0:void := querylog.define("explain select fuse(c,d) from
udf_fuse;","sequential_pipe",27:int);
+ X_0:void := querylog.define("explain select fuse(c,d) from udf_fuse;",
"sequential_pipe", 27:int);
X_28 := bat.new(nil:str);
- X_35 := bat.append(X_28,"sys.L2");
+ X_35 := bat.append(X_28, "sys.L2");
X_30 := bat.new(nil:str);
- X_37 := bat.append(X_30,"L2");
+ X_37 := bat.append(X_30, "L2");
X_31 := bat.new(nil:str);
- X_39 := bat.append(X_31,"int");
+ X_39 := bat.append(X_31, "int");
X_32 := bat.new(nil:int);
- X_41 := bat.append(X_32,32:int);
+ X_41 := bat.append(X_32, 32:int);
X_34 := bat.new(nil:int);
- X_43 := bat.append(X_34,0:int);
+ X_43 := bat.append(X_34, 0:int);
X_3 := sql.mvc();
- C_4:bat[:oid] := sql.tid(X_3,"sys","udf_fuse");
- X_7:bat[:sht] := sql.bind(X_3,"sys","udf_fuse","c",0:int);
- X_16 := mosaic.projection(C_4,X_7);
- X_17:bat[:sht] := sql.bind(X_3,"sys","udf_fuse","d",0:int);
- X_23 := mosaic.projection(C_4,X_17);
- X_24:bat[:int] := batudf.fuse(X_16,X_23);
-# querylog.define("explain select fuse(c,d) from udf_fuse;","sequential_pipe")
- sql.resultSet(X_35,X_37,X_39,X_41,X_43,X_24);
+ C_4:bat[:oid] := sql.tid(X_3, "sys", "udf_fuse");
+ X_7:bat[:sht] := sql.bind(X_3, "sys", "udf_fuse", "c", 0:int);
+ X_16 := mosaic.projection(C_4, X_7);
+ X_17:bat[:sht] := sql.bind(X_3, "sys", "udf_fuse", "d", 0:int);
+ X_23 := mosaic.projection(C_4, X_17);
+ X_24:bat[:int] := batudf.fuse(X_16, X_23);
+ sql.resultSet(X_35, X_37, X_39, X_41, X_43, X_24);
end user.s18_1;
#inline actions= 0 time=2 usec
#candidates actions= 1 time=19 usec
@@ -272,28 +270,27 @@ end user.s18_1;
% .explain # table_name
% mal # name
% clob # type
-% 100 # length
+% 102 # length
function user.s20_1():void;
- X_0:void := querylog.define("explain select fuse(e,f) from
udf_fuse;","sequential_pipe",27:int);
+ X_0:void := querylog.define("explain select fuse(e,f) from udf_fuse;",
"sequential_pipe", 27:int);
X_28 := bat.new(nil:str);
- X_35 := bat.append(X_28,"sys.L2");
+ X_35 := bat.append(X_28, "sys.L2");
X_30 := bat.new(nil:str);
- X_37 := bat.append(X_30,"L2");
+ X_37 := bat.append(X_30, "L2");
X_31 := bat.new(nil:str);
- X_39 := bat.append(X_31,"bigint");
+ X_39 := bat.append(X_31, "bigint");
X_32 := bat.new(nil:int);
- X_41 := bat.append(X_32,64:int);
+ X_41 := bat.append(X_32, 64:int);
X_34 := bat.new(nil:int);
- X_43 := bat.append(X_34,0:int);
+ X_43 := bat.append(X_34, 0:int);
X_3 := sql.mvc();
- C_4:bat[:oid] := sql.tid(X_3,"sys","udf_fuse");
- X_7:bat[:int] := sql.bind(X_3,"sys","udf_fuse","e",0:int);
- X_16 := mosaic.projection(C_4,X_7);
- X_17:bat[:int] := sql.bind(X_3,"sys","udf_fuse","f",0:int);
- X_23 := mosaic.projection(C_4,X_17);
- X_24:bat[:lng] := batudf.fuse(X_16,X_23);
-# querylog.define("explain select fuse(e,f) from udf_fuse;","sequential_pipe")
- sql.resultSet(X_35,X_37,X_39,X_41,X_43,X_24);
+ C_4:bat[:oid] := sql.tid(X_3, "sys", "udf_fuse");
+ X_7:bat[:int] := sql.bind(X_3, "sys", "udf_fuse", "e", 0:int);
+ X_16 := mosaic.projection(C_4, X_7);
+ X_17:bat[:int] := sql.bind(X_3, "sys", "udf_fuse", "f", 0:int);
+ X_23 := mosaic.projection(C_4, X_17);
+ X_24:bat[:lng] := batudf.fuse(X_16, X_23);
+ sql.resultSet(X_35, X_37, X_39, X_41, X_43, X_24);
end user.s20_1;
#inline actions= 0 time=2 usec
#candidates actions= 1 time=18 usec
diff --git a/sql/backends/monet5/UDF/cudf/Tests/udf-reverse.stable.out
b/sql/backends/monet5/UDF/cudf/Tests/udf-reverse.stable.out
--- a/sql/backends/monet5/UDF/cudf/Tests/udf-reverse.stable.out
+++ b/sql/backends/monet5/UDF/cudf/Tests/udf-reverse.stable.out
@@ -48,11 +48,11 @@ Ready.
% .explain # table_name
% mal # name
% clob # type
-% 98 # length
+% 100 # length
function user.s4_1():void;
- X_0:void := querylog.define("explain select
reverse(\\'MonetDB\\');","sequential_pipe",7:int);
+ X_0:void := querylog.define("explain select reverse(\\'MonetDB\\');",
"sequential_pipe", 7:int);
X_5:str := udf.reverse("MonetDB");
- sql.resultSet(".L2","L2","clob",0:int,0:int,4:int,X_5);
+ sql.resultSet(".L2", "L2", "clob", 0:int, 0:int, 4:int, X_5);
end user.s4_1;
#inline actions= 0 time=2 usec
#candidates actions= 1 time=8 usec
@@ -107,26 +107,25 @@ end user.s4_1;
% .explain # table_name
% mal # name
% clob # type
-% 104 # length
+% 106 # length
function user.s12_1():void;
- X_0:void := querylog.define("explain select reverse(x) from
udf_reverse;","sequential_pipe",22:int);
+ X_0:void := querylog.define("explain select reverse(x) from udf_reverse;",
"sequential_pipe", 22:int);
X_21 := bat.new(nil:str);
- X_28 := bat.append(X_21,"sys.L2");
+ X_28 := bat.append(X_21, "sys.L2");
X_23 := bat.new(nil:str);
- X_30 := bat.append(X_23,"L2");
+ X_30 := bat.append(X_23, "L2");
X_24 := bat.new(nil:str);
- X_32 := bat.append(X_24,"clob");
+ X_32 := bat.append(X_24, "clob");
X_25 := bat.new(nil:int);
- X_34 := bat.append(X_25,0:int);
+ X_34 := bat.append(X_25, 0:int);
X_27 := bat.new(nil:int);
- X_35 := bat.append(X_27,0:int);
+ X_35 := bat.append(X_27, 0:int);
X_3 := sql.mvc();
- C_4:bat[:oid] := sql.tid(X_3,"sys","udf_reverse");
- X_7:bat[:str] := sql.bind(X_3,"sys","udf_reverse","x",0:int);
- X_16 := mosaic.projection(C_4,X_7);
+ C_4:bat[:oid] := sql.tid(X_3, "sys", "udf_reverse");
+ X_7:bat[:str] := sql.bind(X_3, "sys", "udf_reverse", "x", 0:int);
+ X_16 := mosaic.projection(C_4, X_7);
X_17:bat[:str] := batudf.reverse(X_16);
-# querylog.define("explain select reverse(x) from
udf_reverse;","sequential_pipe")
- sql.resultSet(X_28,X_30,X_32,X_34,X_35,X_17);
+ sql.resultSet(X_28, X_30, X_32, X_34, X_35, X_17);
end user.s12_1;
#inline actions= 0 time=4 usec
#candidates actions= 1 time=15 usec
diff --git
a/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
b/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
--- a/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
+++ b/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
@@ -128,28 +128,28 @@ top N (
% .explain # table_name
% mal # name
% clob # type
-% 85 # length
+% 87 # length
function user.s8_1():void;
- X_0:void := querylog.define("explain select * from
oblo;","minimal_pipe",21:int);
+ X_0:void := querylog.define("explain select * from oblo;", "minimal_pipe",
21:int);
X_3 := sql.mvc();
- C_4:bat[:oid] := sql.tid(X_3,"sys","oblo");
- X_38:bat[:int] := sql.bind(X_3,"sys","oblo","a",0:int);
+ C_4:bat[:oid] := sql.tid(X_3, "sys", "oblo");
+ X_38:bat[:int] := sql.bind(X_3, "sys", "oblo", "a", 0:int);
X_7:bat[:int] := mosaic.decompress(X_38);
- X_10:bat[:int] := sql.emptybind(X_3,"sys","oblo","a",1:int);
- (C_12:bat[:oid],X_13:bat[:int]) :=
sql.emptybind(X_3,"sys","oblo","a",2:int);
- X_15 := sql.delta(X_7,C_12,X_13,X_10);
- X_16 := algebra.projection(C_4,X_15);
+ X_10:bat[:int] := sql.emptybind(X_3, "sys", "oblo", "a", 1:int);
+ (C_12:bat[:oid], X_13:bat[:int]) := sql.emptybind(X_3, "sys", "oblo", "a",
2:int);
+ X_15 := sql.delta(X_7, C_12, X_13, X_10);
+ X_16 := algebra.projection(C_4, X_15);
X_18 := bat.new(nil:str);
X_20 := bat.new(nil:str);
X_21 := bat.new(nil:str);
X_22 := bat.new(nil:int);
X_24 := bat.new(nil:int);
- X_25 := bat.append(X_18,"sys.oblo");
- X_27 := bat.append(X_20,"a");
- X_28 := bat.append(X_21,"int");
- X_30 := bat.append(X_22,32:int);
- X_32 := bat.append(X_24,0:int);
- sql.resultSet(X_25,X_27,X_28,X_30,X_32,X_16);
+ X_25 := bat.append(X_18, "sys.oblo");
+ X_27 := bat.append(X_20, "a");
+ X_28 := bat.append(X_21, "int");
+ X_30 := bat.append(X_22, 32:int);
+ X_32 := bat.append(X_24, 0:int);
+ sql.resultSet(X_25, X_27, X_28, X_30, X_32, X_16);
end user.s8_1;
#inline actions= 0 time=3 usec
#candidates actions= 1 time=22 usec
@@ -164,34 +164,34 @@ end user.s8_1;
% .explain # table_name
% mal # name
% clob # type
-% 94 # length
+% 96 # length
function user.s10_1():void;
- X_0:void := querylog.define("explain select * from oblo offset
2;","minimal_pipe",27:int);
+ X_0:void := querylog.define("explain select * from oblo offset 2;",
"minimal_pipe", 27:int);
X_3 := sql.mvc();
- C_4:bat[:oid] := sql.tid(X_3,"sys","oblo");
- X_46:bat[:int] := sql.bind(X_3,"sys","oblo","a",0:int);
+ C_4:bat[:oid] := sql.tid(X_3, "sys", "oblo");
+ X_46:bat[:int] := sql.bind(X_3, "sys", "oblo", "a", 0:int);
X_7:bat[:int] := mosaic.decompress(X_46);
- X_10:bat[:int] := sql.emptybind(X_3,"sys","oblo","a",1:int);
- (C_12:bat[:oid],X_13:bat[:int]) :=
sql.emptybind(X_3,"sys","oblo","a",2:int);
- X_15 := sql.delta(X_7,C_12,X_13,X_10);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
