Changeset: 9fec1c28609f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9fec1c28609f
Modified Files:
sql/test/mosaic/Tests/compressionRLE.stable.out
sql/test/mosaic/Tests/mix.stable.out
sql/test/mosaic/Tests/xqueries_delta.stable.out
Branch: mosaic
Log Message:
Approve tests.
diffs (truncated from 341 to 300 lines):
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
@@ -43,13 +43,13 @@ Ready.
[ 86 ]
#alter table tmp3RLE set read only;
#select sum(i) from tmp3RLE;
-% sys.L4 # table_name
+% sys.L3 # table_name
% L3 # name
% hugeint # type
% 3 # length
[ 270 ]
#select sum(f) from tmp3RLE;
-% sys.L4 # table_name
+% sys.L3 # table_name
% L3 # name
% real # type
% 15 # length
@@ -67,8 +67,8 @@ function user.s14_1():void;
X_25:bat[:str] := bat.new(nil:str);
X_24:bat[:str] := bat.new(nil:str);
X_4:int := sql.mvc();
- C_104:bat[:oid] := sql.tid(X_4:int, "sys":str, "tmp3rle":str);
- X_5:bat[:oid] := mosaic.decompress(C_104:bat[:oid]);
+ C_106:bat[:oid] := sql.tid(X_4:int, "sys":str, "tmp3rle":str);
+ X_5:bat[:oid] := mosaic.decompress(C_106:bat[:oid]);
X_18:bat[:timestamp] := sql.bind(X_4:int, "sys":str, "tmp3rle":str,
"t":str, 0:int);
X_20:bat[:timestamp] := mosaic.projection(X_5:bat[:oid],
X_18:bat[:timestamp]);
X_15:bat[:flt] := sql.bind(X_4:int, "sys":str, "tmp3rle":str, "f":str,
0:int);
@@ -122,9 +122,29 @@ end user.s14_1;
#garbagecollector actions= 1 time=18 usec
#total actions= 1 time=274 usec
#alter table tmp3RLE alter column i set storage 'runlength';
+#select * from mosaic.layout('sys','tmp3RLE','i') limit 25;
+% .L4, .L4, .L4, .L4, .L4 # table_name
+% technique, count, inputsize, outputsize, properties # name
+% clob, bigint, bigint, bigint, clob # type
+% 0, 1, 1, 1, 0 # length
#alter table tmp3RLE alter column b set storage 'runlength';
+#select * from mosaic.layout('sys','tmp3RLE','b') limit 25;
+% .L4, .L4, .L4, .L4, .L4 # table_name
+% technique, count, inputsize, outputsize, properties # name
+% clob, bigint, bigint, bigint, clob # type
+% 0, 1, 1, 1, 0 # length
#alter table tmp3RLE alter column f set storage 'runlength';
+#select * from mosaic.layout('sys','tmp3RLE','f') limit 25;
+% .L4, .L4, .L4, .L4, .L4 # table_name
+% technique, count, inputsize, outputsize, properties # name
+% clob, bigint, bigint, bigint, clob # type
+% 0, 1, 1, 1, 0 # length
#alter table tmp3RLE alter column t set storage 'runlength';
+#select * from mosaic.layout('sys','tmp3RLE','t') limit 25;
+% .L4, .L4, .L4, .L4, .L4 # table_name
+% technique, count, inputsize, outputsize, properties # name
+% clob, bigint, bigint, bigint, clob # type
+% 0, 1, 1, 1, 0 # length
#explain select i from tmp3RLE;
% .explain # table_name
% mal # name
@@ -138,8 +158,8 @@ function user.s32_1():void;
X_16:bat[:str] := bat.new(nil:str);
X_15:bat[:str] := bat.new(nil:str);
X_4:int := sql.mvc();
- C_72:bat[:oid] := sql.tid(X_4:int, "sys":str, "tmp3rle":str);
- X_5:bat[:oid] := mosaic.decompress(C_72:bat[:oid]);
+ C_74:bat[:oid] := sql.tid(X_4:int, "sys":str, "tmp3rle":str);
+ X_5:bat[:oid] := mosaic.decompress(C_74:bat[:oid]);
X_8:bat[:int] := sql.bind(X_4:int, "sys":str, "tmp3rle":str, "i":str,
0:int);
X_11:bat[:int] := mosaic.projection(X_5:bat[:oid], X_8:bat[:int]);
X_20:bat[:str] := bat.append(X_13:bat[:str], "sys.tmp3rle":str);
@@ -184,8 +204,8 @@ function user.s34_1():void;
X_16:bat[:str] := bat.new(nil:str);
X_15:bat[:str] := bat.new(nil:str);
X_4:int := sql.mvc();
- C_72:bat[:oid] := sql.tid(X_4:int, "sys":str, "tmp3rle":str);
- X_5:bat[:oid] := mosaic.decompress(C_72:bat[:oid]);
+ C_74:bat[:oid] := sql.tid(X_4:int, "sys":str, "tmp3rle":str);
+ X_5:bat[:oid] := mosaic.decompress(C_74:bat[:oid]);
X_8:bat[:bit] := sql.bind(X_4:int, "sys":str, "tmp3rle":str, "b":str,
0:int);
X_11:bat[:bit] := mosaic.projection(X_5:bat[:oid], X_8:bat[:bit]);
X_20:bat[:str] := bat.append(X_13:bat[:str], "sys.tmp3rle":str);
@@ -230,8 +250,8 @@ function user.s36_1():void;
X_16:bat[:str] := bat.new(nil:str);
X_15:bat[:str] := bat.new(nil:str);
X_4:int := sql.mvc();
- C_72:bat[:oid] := sql.tid(X_4:int, "sys":str, "tmp3rle":str);
- X_5:bat[:oid] := mosaic.decompress(C_72:bat[:oid]);
+ C_74:bat[:oid] := sql.tid(X_4:int, "sys":str, "tmp3rle":str);
+ X_5:bat[:oid] := mosaic.decompress(C_74:bat[:oid]);
X_8:bat[:flt] := sql.bind(X_4:int, "sys":str, "tmp3rle":str, "f":str,
0:int);
X_11:bat[:flt] := mosaic.projection(X_5:bat[:oid], X_8:bat[:flt]);
X_20:bat[:str] := bat.append(X_13:bat[:str], "sys.tmp3rle":str);
@@ -276,8 +296,8 @@ function user.s38_1():void;
X_16:bat[:str] := bat.new(nil:str);
X_15:bat[:str] := bat.new(nil:str);
X_4:int := sql.mvc();
- C_72:bat[:oid] := sql.tid(X_4:int, "sys":str, "tmp3rle":str);
- X_5:bat[:oid] := mosaic.decompress(C_72:bat[:oid]);
+ C_74:bat[:oid] := sql.tid(X_4:int, "sys":str, "tmp3rle":str);
+ X_5:bat[:oid] := mosaic.decompress(C_74:bat[:oid]);
X_8:bat[:timestamp] := sql.bind(X_4:int, "sys":str, "tmp3rle":str,
"t":str, 0:int);
X_11:bat[:timestamp] := mosaic.projection(X_5:bat[:oid],
X_8:bat[:timestamp]);
X_20:bat[:str] := bat.append(X_13:bat[:str], "sys.tmp3rle":str);
@@ -401,13 +421,13 @@ end user.s38_1;
[ 9, false, 0.317, 2014-08-23 11:34:54.000000 ]
[ 10, false, 0.317, 2014-08-23 11:34:54.000000 ]
#select sum(i) from tmp3RLE;
-% sys.L4 # table_name
+% sys.L3 # table_name
% L3 # name
% hugeint # type
% 3 # length
[ 270 ]
#select sum(f) from tmp3RLE;
-% sys.L4 # table_name
+% sys.L3 # table_name
% L3 # name
% real # type
% 15 # length
diff --git a/sql/test/mosaic/Tests/mix.stable.out
b/sql/test/mosaic/Tests/mix.stable.out
--- a/sql/test/mosaic/Tests/mix.stable.out
+++ b/sql/test/mosaic/Tests/mix.stable.out
@@ -134,6 +134,11 @@ Ready.
[ 9 ]
#alter table mix0 set read only;
#alter table mix0 alter column i set storage 'mosaic';
+#select * from mosaic.layout('sys','mix0','i') ;
+% .L4, .L4, .L4, .L4, .L4 # table_name
+% technique, count, inputsize, outputsize, properties # name
+% clob, bigint, bigint, bigint, clob # type
+% 0, 1, 1, 1, 0 # length
#drop table mix0;
# 21:39:24 >
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
@@ -56,7 +56,7 @@ function user.s10_1():void;
X_15:bat[:oid] := mosaic.thetaselect(X_9:bat[:int], X_6:bat[:oid], 4:int,
"<":str);
X_17:bat[:int] := mosaic.projection(X_15:bat[:oid], X_9:bat[:int]);
X_18:lng := aggr.count(X_17:bat[:int]);
- sql.resultSet("sys.L4":str, "L3":str, "bigint":str, 64:int, 0:int, 7:int,
X_18:lng);
+ sql.resultSet("sys.L3":str, "L3":str, "bigint":str, 64:int, 0:int, 7:int,
X_18:lng);
end user.s10_1;
#inline actions= 0 time=0 usec
#remap actions= 0 time=2 usec
@@ -81,7 +81,7 @@ end user.s10_1;
#garbagecollector actions= 1 time=9 usec
#total actions= 1 time=185 usec
#select count(*) from dtmp3 where i <4;
-% sys.L4 # table_name
+% sys.L3 # table_name
% L3 # name
% bigint # type
% 2 # length
@@ -100,7 +100,7 @@ function user.s12_1():void;
X_15:bat[:oid] := mosaic.thetaselect(X_9:bat[:int], X_6:bat[:oid], 7:int,
"==":str);
X_17:bat[:int] := mosaic.projection(X_15:bat[:oid], X_9:bat[:int]);
X_18:lng := aggr.count(X_17:bat[:int]);
- sql.resultSet("sys.L4":str, "L3":str, "bigint":str, 64:int, 0:int, 7:int,
X_18:lng);
+ sql.resultSet("sys.L3":str, "L3":str, "bigint":str, 64:int, 0:int, 7:int,
X_18:lng);
end user.s12_1;
#inline actions= 0 time=1 usec
#remap actions= 0 time=2 usec
@@ -124,31 +124,31 @@ end user.s12_1;
#garbagecollector actions= 1 time=10 usec
#total actions= 1 time=207 usec
#select count(*) from dtmp3 where i = 7;
-% sys.L4 # table_name
+% sys.L3 # table_name
% L3 # name
% bigint # type
% 1 # length
[ 2 ]
#select count(*) from dtmp3 where f <0.316;
-% sys.L4 # table_name
+% sys.L3 # table_name
% L3 # name
% bigint # type
% 2 # length
[ 42 ]
#select count(*) from dtmp3 where b = true;
-% sys.L4 # table_name
+% sys.L3 # table_name
% L3 # name
% bigint # type
% 2 # length
[ 66 ]
#select sum(i) from dtmp3;
-% sys.L4 # table_name
+% sys.L3 # table_name
% L3 # name
% hugeint # type
% 3 # length
[ 270 ]
#select sum(f) from dtmp3;
-% sys.L4 # table_name
+% sys.L3 # table_name
% L3 # name
% real # type
% 15 # length
@@ -157,19 +157,19 @@ end user.s12_1;
#alter table dtmp3 alter column b set storage 'delta';
#alter table dtmp3 alter column f set storage 'delta';
#select count(*) from dtmp3;
-% sys.L4 # table_name
+% sys.L3 # table_name
% L3 # name
% bigint # type
% 2 # length
[ 86 ]
#select sum(i) from dtmp3;
-% sys.L4 # table_name
+% sys.L3 # table_name
% L3 # name
% hugeint # type
% 3 # length
[ 270 ]
#select sum(f) from dtmp3;
-% sys.L4 # table_name
+% sys.L3 # table_name
% L3 # name
% real # type
% 15 # length
@@ -188,7 +188,7 @@ function user.s34_1():void;
X_15:bat[:oid] := mosaic.thetaselect(X_9:bat[:int], X_6:bat[:oid], 4:int,
"<":str);
X_17:bat[:int] := mosaic.projection(X_15:bat[:oid], X_9:bat[:int]);
X_18:lng := aggr.count(X_17:bat[:int]);
- sql.resultSet("sys.L4":str, "L3":str, "bigint":str, 64:int, 0:int, 7:int,
X_18:lng);
+ sql.resultSet("sys.L3":str, "L3":str, "bigint":str, 64:int, 0:int, 7:int,
X_18:lng);
end user.s34_1;
#inline actions= 0 time=0 usec
#remap actions= 0 time=1 usec
@@ -212,7 +212,7 @@ end user.s34_1;
#garbagecollector actions= 1 time=9 usec
#total actions= 1 time=165 usec
#select count(*) from dtmp3 where i <4;
-% sys.L4 # table_name
+% sys.L3 # table_name
% L3 # name
% bigint # type
% 2 # length
@@ -231,7 +231,7 @@ function user.s36_1():void;
X_15:bat[:oid] := mosaic.thetaselect(X_9:bat[:int], X_6:bat[:oid], 7:int,
"==":str);
X_17:bat[:int] := mosaic.projection(X_15:bat[:oid], X_9:bat[:int]);
X_18:lng := aggr.count(X_17:bat[:int]);
- sql.resultSet("sys.L4":str, "L3":str, "bigint":str, 64:int, 0:int, 7:int,
X_18:lng);
+ sql.resultSet("sys.L3":str, "L3":str, "bigint":str, 64:int, 0:int, 7:int,
X_18:lng);
end user.s36_1;
#inline actions= 0 time=1 usec
#remap actions= 0 time=2 usec
@@ -255,19 +255,19 @@ end user.s36_1;
#garbagecollector actions= 1 time=10 usec
#total actions= 1 time=167 usec
#select count(*) from dtmp3 where i = 7;
-% sys.L4 # table_name
+% sys.L3 # table_name
% L3 # name
% bigint # type
% 1 # length
[ 2 ]
#select count(*) from dtmp3 where f <0.316;
-% sys.L4 # table_name
+% sys.L3 # table_name
% L3 # name
% bigint # type
% 2 # length
[ 42 ]
#select count(*) from dtmp3 where b = true;
-% sys.L4 # table_name
+% sys.L3 # table_name
% L3 # name
% bigint # type
% 2 # length
@@ -276,13 +276,13 @@ end user.s36_1;
#alter table dtmp3 alter column b set storage NULL;
#alter table dtmp3 alter column f set storage NULL;
#select sum(i) from dtmp3;
-% sys.L4 # table_name
+% sys.L3 # table_name
% L3 # name
% hugeint # type
% 3 # length
[ 270 ]
#select sum(f) from dtmp3;
-% sys.L4 # table_name
+% sys.L3 # table_name
% L3 # name
% real # type
% 15 # length
@@ -301,7 +301,7 @@ function user.s52_1():void;
X_15:bat[:oid] := mosaic.thetaselect(X_9:bat[:int], X_6:bat[:oid], 4:int,
"<":str);
X_17:bat[:int] := mosaic.projection(X_15:bat[:oid], X_9:bat[:int]);
X_18:lng := aggr.count(X_17:bat[:int]);
- sql.resultSet("sys.L4":str, "L3":str, "bigint":str, 64:int, 0:int, 7:int,
X_18:lng);
+ sql.resultSet("sys.L3":str, "L3":str, "bigint":str, 64:int, 0:int, 7:int,
X_18:lng);
end user.s52_1;
#inline actions= 0 time=0 usec
#remap actions= 0 time=2 usec
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
