Changeset: 5128dbb7683c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5128dbb7683c
Modified Files:
sql/scripts/75_storagemodel.sql
sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.stable.out
sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.stable.out
sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.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/join.stable.out
sql/test/mosaic/Tests/layout_delta.stable.out
sql/test/mosaic/Tests/layout_dict.stable.out
sql/test/mosaic/Tests/layout_frame.stable.out
sql/test/mosaic/Tests/layout_linear.stable.out
sql/test/mosaic/Tests/layout_prefix.stable.out
sql/test/mosaic/Tests/layout_raw.stable.out
sql/test/mosaic/Tests/mix.stable.out
sql/test/mosaic/Tests/prefix.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/orderidx/Tests/simpletable.stable.out
sql/test/orderidx/Tests/smalltable.stable.out
sql/test/pg_regress/Tests/vacuum.stable.out
sql/test/pg_regress/Tests/without_oid.stable.out
sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out
sql/test/sys-schema/Tests/check_Not_Nullable_columns.stable.out
Branch: mosaic
Log Message:
Fix sys.storage table schema and approve test output.
diffs (truncated from 1283 to 300 lines):
diff --git a/sql/scripts/75_storagemodel.sql b/sql/scripts/75_storagemodel.sql
--- a/sql/scripts/75_storagemodel.sql
+++ b/sql/scripts/75_storagemodel.sql
@@ -117,7 +117,7 @@ returns table (
revsorted boolean,
"unique" boolean,
orderidx bigint,
- compressed boolean
+ compressed bigint
)
external name sql."storage";
diff --git
a/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.stable.out
b/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.stable.out
---
a/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.stable.out
+++
b/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.stable.out
@@ -37,6 +37,7 @@ stdout of test 'table_functions_fail_aft
[ "profiler" ]
[ "wlc" ]
[ "wlr" ]
+[ "mosaic" ]
[ "logging" ]
[ "ft" ]
diff --git
a/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.stable.out
b/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.stable.out
---
a/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.stable.out
+++
b/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.stable.out
@@ -33,6 +33,7 @@ stdout of test 'table_functions_fail_aft
[ "profiler" ]
[ "wlc" ]
[ "wlr" ]
+[ "mosaic" ]
[ "logging" ]
[ "ft" ]
#drop function ft.func;
diff --git
a/sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.out
b/sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.out
--- a/sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.out
+++ b/sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.out
@@ -40,6 +40,7 @@ stdout of test 'groupby_having_charlengt
[ "profiler", 8, 10 ]
[ "wlc", 3, 10 ]
[ "wlr", 3, 10 ]
+[ "mosaic", 6, 10 ]
[ "logging", 7, 10 ]
# 12:48:35 >
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
@@ -190,12 +190,21 @@ end user.s10_0;
#alter table tmp3 alter column i set storage 'raw';
#alter table tmp3 alter column b set storage 'raw';
#alter table tmp3 alter column f set storage 'raw';
+#select compressed from storage where "table"='tmp3';
+% .storage # table_name
+% compressed # name
+% bigint # type
+% 3 # length
+[ 290 ]
+[ 552 ]
+[ 552 ]
+[ NULL ]
#explain select * from tmp3;
% .explain # table_name
% mal # name
% clob # type
% 168 # length
-function user.s22_0():void;
+function user.s24_0():void;
X_1:void := querylog.define("explain select * from tmp3;":str,
"mosaic_pipe":str, 19:int);
X_22:bat[:str] := bat.pack("sys.tmp3":str, "sys.tmp3":str, "sys.tmp3":str,
"sys.tmp3":str);
X_23:bat[:str] := bat.pack("i":str, "b":str, "f":str, "t":str);
@@ -213,7 +222,7 @@ function user.s22_0():void;
X_18:bat[:timestamp] := sql.bind(X_4:int, "sys":str, "tmp3":str, "t":str,
0:int);
X_20:bat[:timestamp] := mosaic.projection(C_5:bat[:oid],
X_18:bat[:timestamp]);
sql.resultSet(X_22:bat[:str], X_23:bat[:str], X_24:bat[:str],
X_25:bat[:int], X_26:bat[:int], X_11:bat[:int], X_14:bat[:bit], X_17:bat[:flt],
X_20:bat[:timestamp]);
-end user.s22_0;
+end user.s24_0;
#inline actions= 0 time=0 usec
#remap actions= 0 time=1 usec
#costmodel actions= 1 time=1 usec
@@ -349,12 +358,21 @@ end user.s22_0;
#alter table tmp3 alter column i set storage NULL;
#alter table tmp3 alter column b set storage NULL;
#alter table tmp3 alter column f set storage NULL;
+#select compressed from storage where "table"='tmp3';
+% .storage # table_name
+% compressed # name
+% bigint # type
+% 3 # length
+[ 290 ]
+[ 552 ]
+[ 552 ]
+[ NULL ]
#explain select * from tmp3;
% .explain # table_name
% mal # name
% clob # type
% 168 # length
-function user.s36_0():void;
+function user.s40_0():void;
X_1:void := querylog.define("explain select * from tmp3;":str,
"mosaic_pipe":str, 19:int);
X_22:bat[:str] := bat.pack("sys.tmp3":str, "sys.tmp3":str, "sys.tmp3":str,
"sys.tmp3":str);
X_23:bat[:str] := bat.pack("i":str, "b":str, "f":str, "t":str);
@@ -372,11 +390,12 @@ function user.s36_0():void;
X_18:bat[:timestamp] := sql.bind(X_4:int, "sys":str, "tmp3":str, "t":str,
0:int);
X_20:bat[:timestamp] := mosaic.projection(C_5:bat[:oid],
X_18:bat[:timestamp]);
sql.resultSet(X_22:bat[:str], X_23:bat[:str], X_24:bat[:str],
X_25:bat[:int], X_26:bat[:int], X_11:bat[:int], X_14:bat[:bit], X_17:bat[:flt],
X_20:bat[:timestamp]);
-end user.s36_0;
-#inline actions= 0 time=1 usec
-#remap actions= 0 time=4 usec
-#costmodel actions= 1 time=2 usec
-#coercion actions= 0 time=2 usec
+end user.s40_0;
+#inline actions= 0 time=0 usec
+#remap actions= 0 time=1 usec
+#costmodel actions= 1 time=1 usec
+#coercion actions= 0 time=1 usec
+#aliases actions= 0 time=0 usec
#evaluate actions= 0 time=4 usec
#aliases actions= 0 time=9 usec
#mergetable actions= 0 time=46 usec
@@ -497,6 +516,17 @@ end user.s36_0;
% real # type
% 15 # length
[ 27.104 ]
+#alter table tmp3 alter column i set storage 'runlength,dict256';
+#alter table tmp3 alter column b set storage 'mosaic';
+#select compressed from storage where "table"='tmp3';
+% .storage # table_name
+% compressed # name
+% bigint # type
+% 3 # length
+[ 290 ]
+[ 552 ]
+[ 552 ]
+[ NULL ]
#alter table tmp3 set read write;
#select * from tmp3;
% sys.tmp3, sys.tmp3, sys.tmp3, sys.tmp3 # table_name
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
@@ -173,12 +173,21 @@ end user.s14_0;
% 9, 2, 4, 3, 70, 1 # length
[ "header", 86, 5504, 212,
"{\"blks\":[{\"runlength\":1}],\"elms\":[{\"runlength\":86}],\"ratio\":3.2452831}",
0 ]
[ "runlength", 86, 688, 16, "{\"value\" : 355009119119733632}",
1 ]
+#select compressed from storage where "table"='tmp3rle';
+% .storage # table_name
+% compressed # name
+% bigint # type
+% 3 # length
+[ 324 ]
+[ 268 ]
+[ 556 ]
+[ 212 ]
#explain select i from tmp3rle;
% .explain # table_name
% mal # name
% clob # type
% 114 # length
-function user.s32_0():void;
+function user.s34_0():void;
X_1:void := querylog.define("explain select i from tmp3rle;":str,
"mosaic_pipe":str, 13:int);
X_13:bat[:str] := bat.pack("sys.tmp3rle":str);
X_14:bat[:str] := bat.pack("i":str);
@@ -190,7 +199,7 @@ function user.s32_0():void;
X_8:bat[:int] := sql.bind(X_4:int, "sys":str, "tmp3rle":str, "i":str,
0:int);
X_11:bat[:int] := mosaic.projection(C_5:bat[:oid], X_8:bat[:int]);
sql.resultSet(X_13:bat[:str], X_14:bat[:str], X_15:bat[:str],
X_16:bat[:int], X_17:bat[:int], X_11:bat[:int]);
-end user.s32_0;
+end user.s34_0;
#inline actions= 0 time=0 usec
#remap actions= 0 time=2 usec
#costmodel actions= 1 time=1 usec
@@ -218,7 +227,7 @@ end user.s32_0;
% mal # name
% clob # type
% 114 # length
-function user.s34_0():void;
+function user.s36_0():void;
X_1:void := querylog.define("explain select b from tmp3rle;":str,
"mosaic_pipe":str, 13:int);
X_13:bat[:str] := bat.pack("sys.tmp3rle":str);
X_14:bat[:str] := bat.pack("b":str);
@@ -230,8 +239,8 @@ function user.s34_0():void;
X_8:bat[:bit] := sql.bind(X_4:int, "sys":str, "tmp3rle":str, "b":str,
0:int);
X_11:bat[:bit] := mosaic.projection(C_5:bat[:oid], X_8:bat[:bit]);
sql.resultSet(X_13:bat[:str], X_14:bat[:str], X_15:bat[:str],
X_16:bat[:int], X_17:bat[:int], X_11:bat[:bit]);
-end user.s34_0;
-#inline actions= 0 time=1 usec
+end user.s36_0;
+#inline actions= 0 time=0 usec
#remap actions= 0 time=1 usec
#costmodel actions= 1 time=1 usec
#coercion actions= 0 time=1 usec
@@ -258,7 +267,7 @@ end user.s34_0;
% mal # name
% clob # type
% 114 # length
-function user.s36_0():void;
+function user.s38_0():void;
X_1:void := querylog.define("explain select f from tmp3rle;":str,
"mosaic_pipe":str, 13:int);
X_13:bat[:str] := bat.pack("sys.tmp3rle":str);
X_14:bat[:str] := bat.pack("f":str);
@@ -270,7 +279,7 @@ function user.s36_0():void;
X_8:bat[:flt] := sql.bind(X_4:int, "sys":str, "tmp3rle":str, "f":str,
0:int);
X_11:bat[:flt] := mosaic.projection(C_5:bat[:oid], X_8:bat[:flt]);
sql.resultSet(X_13:bat[:str], X_14:bat[:str], X_15:bat[:str],
X_16:bat[:int], X_17:bat[:int], X_11:bat[:flt]);
-end user.s36_0;
+end user.s38_0;
#inline actions= 0 time=0 usec
#remap actions= 0 time=1 usec
#costmodel actions= 1 time=1 usec
@@ -298,7 +307,7 @@ end user.s36_0;
% mal # name
% clob # type
% 120 # length
-function user.s38_0():void;
+function user.s40_0():void;
X_1:void := querylog.define("explain select t from tmp3rle;":str,
"mosaic_pipe":str, 13:int);
X_13:bat[:str] := bat.pack("sys.tmp3rle":str);
X_14:bat[:str] := bat.pack("t":str);
@@ -310,10 +319,10 @@ function user.s38_0():void;
X_8:bat[:timestamp] := sql.bind(X_4:int, "sys":str, "tmp3rle":str,
"t":str, 0:int);
X_11:bat[:timestamp] := mosaic.projection(C_5:bat[:oid],
X_8:bat[:timestamp]);
sql.resultSet(X_13:bat[:str], X_14:bat[:str], X_15:bat[:str],
X_16:bat[:int], X_17:bat[:int], X_11:bat[:timestamp]);
-end user.s38_0;
-#inline actions= 0 time=0 usec
-#remap actions= 0 time=2 usec
-#costmodel actions= 1 time=1 usec
+end user.s40_0;
+#inline actions= 0 time=1 usec
+#remap actions= 0 time=0 usec
+#costmodel actions= 1 time=0 usec
#coercion actions= 0 time=1 usec
#evaluate actions= 0 time=2 usec
#emptybind actions= 0 time=6 usec
diff --git a/sql/test/mosaic/Tests/compressionRLE2.stable.out
b/sql/test/mosaic/Tests/compressionRLE2.stable.out
--- a/sql/test/mosaic/Tests/compressionRLE2.stable.out
+++ b/sql/test/mosaic/Tests/compressionRLE2.stable.out
@@ -129,12 +129,21 @@ stdout of test 'compressionRLE2` in dire
#alter table tmp3rle alter column b set storage NULL;
#alter table tmp3rle alter column f set storage NULL;
#alter table tmp3rle alter column t set storage NULL;
+#select compressed from storage where "table"='tmp3rle';
+% .storage # table_name
+% compressed # name
+% bigint # type
+% 3 # length
+[ 324 ]
+[ 268 ]
+[ NULL ]
+[ 212 ]
#explain select * from tmp3rle;
% .explain # table_name
% mal # name
% clob # type
% 168 # length
-function user.s16_0():void;
+function user.s18_0():void;
X_1:void := querylog.define("explain select * from tmp3rle;":str,
"mosaic_pipe":str, 19:int);
X_22:bat[:str] := bat.pack("sys.tmp3rle":str, "sys.tmp3rle":str,
"sys.tmp3rle":str, "sys.tmp3rle":str);
X_23:bat[:str] := bat.pack("i":str, "b":str, "f":str, "t":str);
@@ -152,7 +161,7 @@ function user.s16_0():void;
X_18:bat[:timestamp] := sql.bind(X_4:int, "sys":str, "tmp3rle":str,
"t":str, 0:int);
X_20:bat[:timestamp] := mosaic.projection(C_5:bat[:oid],
X_18:bat[:timestamp]);
sql.resultSet(X_22:bat[:str], X_23:bat[:str], X_24:bat[:str],
X_25:bat[:int], X_26:bat[:int], X_11:bat[:int], X_14:bat[:bit], X_17:bat[:flt],
X_20:bat[:timestamp]);
-end user.s16_0;
+end user.s18_0;
#inline actions= 0 time=0 usec
#remap actions= 0 time=1 usec
#costmodel actions= 1 time=1 usec
diff --git a/sql/test/mosaic/Tests/join.stable.out
b/sql/test/mosaic/Tests/join.stable.out
--- a/sql/test/mosaic/Tests/join.stable.out
+++ b/sql/test/mosaic/Tests/join.stable.out
@@ -56,6 +56,15 @@ stdout of test 'join` in directory 'sql/
[ 20 ]
#alter table tmp3 set read only;
#alter table tmp3 alter column i set storage 'delta';
+#select compressed from storage where "table"='tmp3';
+% .storage # table_name
+% compressed # name
+% bigint # type
+% 3 # length
+[ NULL ]
+[ NULL ]
+[ 224 ]
+[ NULL ]
#create table tmp4( i int, b boolean, f real,t timestamp);
#insert into tmp4 values
#(1, true, 0.314,'2014-08-23 11:34:54.000000'),
@@ -75,7 +84,7 @@ stdout of test 'join` in directory 'sql/
% mal # name
% clob # type
% 135 # length
-function user.s16_0():void;
+function user.s18_0():void;
X_1:void := querylog.define("explain select tmp3.i, tmp4.i from tmp3, tmp4
where tmp3.i = tmp4.i;":str, "mosaic_pipe":str, 19:int);
X_25:bat[:str] := bat.pack("sys.tmp3":str, "sys.tmp4":str);
X_26:bat[:str] := bat.pack("i":str, "i":str);
@@ -93,8 +102,8 @@ function user.s16_0():void;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
