Changeset: d1fccc38527a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d1fccc38527a
Modified Files:
monetdb5/modules/mosaic/Tests/mosaic_frame_joins.stable.out
sql/scripts/75_storagemodel.sql
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
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/mix.stable.err
sql/test/mosaic/Tests/mix.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
Branch: mosaic
Log Message:
Some fixes in storage()
diffs (truncated from 1663 to 300 lines):
diff --git a/monetdb5/modules/mosaic/Tests/mosaic_frame_joins.stable.out
b/monetdb5/modules/mosaic/Tests/mosaic_frame_joins.stable.out
--- a/monetdb5/modules/mosaic/Tests/mosaic_frame_joins.stable.out
+++ b/monetdb5/modules/mosaic/Tests/mosaic_frame_joins.stable.out
@@ -55,16 +55,16 @@ Ready.
# h t # name
# void timestamp # type
#--------------------------#
-[ 0@0, "2014-08-14 12:00:00.000" ]
-[ 1@0, "2014-08-14 12:01:00.000" ]
-[ 2@0, "2014-08-14 12:00:00.000" ]
+[ 0@0, 2014-08-14 12:00:00.000 ]
+[ 1@0, 2014-08-14 12:01:00.000 ]
+[ 2@0, 2014-08-14 12:00:00.000 ]
#--------------------------#
# h t # name
# void timestamp # type
#--------------------------#
-[ 0@0, "2014-08-14 12:00:00.000" ]
-[ 1@0, "2014-08-14 12:01:00.000" ]
-[ 2@0, "2014-08-14 12:00:00.000" ]
+[ 0@0, 2014-08-14 12:00:00.000 ]
+[ 1@0, 2014-08-14 12:01:00.000 ]
+[ 2@0, 2014-08-14 12:00:00.000 ]
#--------------------------#
# t t t # name
# void oid oid # type
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
@@ -35,7 +35,8 @@ returns table (
sorted boolean,
revsorted boolean,
"unique" boolean,
- orderidx bigint
+ orderidx bigint,
+ compressed boolean
)
external name sql."storage";
@@ -60,7 +61,8 @@ returns table (
sorted boolean,
revsorted boolean,
"unique" boolean,
- orderidx bigint
+ orderidx bigint,
+ compressed boolean
)
external name sql."storage";
@@ -82,7 +84,8 @@ returns table (
sorted boolean,
revsorted boolean,
"unique" boolean,
- orderidx bigint
+ orderidx bigint,
+ compressed boolean
)
external name sql."storage";
@@ -104,7 +107,8 @@ returns table (
sorted boolean,
revsorted boolean,
"unique" boolean,
- orderidx bigint
+ orderidx bigint,
+ compressed boolean
)
external name sql."storage";
@@ -124,7 +128,8 @@ create table sys.storagemodelinput(
"sorted" boolean, -- if set there is no need for an index
revsorted boolean,
"unique" boolean,
- "orderidx" bigint -- an ordered oid index
+ "orderidx" bigint,
+ compressed boolean
);
-- this table can be adjusted to reflect the anticipated final database size
@@ -134,7 +139,7 @@ begin
delete from sys.storagemodelinput;
insert into sys.storagemodelinput
- select X."schema", X."table", X."column", X."type", X.typewidth,
X.count, 0, X.typewidth, false, X.sorted, X.revsorted, X."unique", X.orderidx
from sys."storage"() X;
+ select X."schema", X."table", X."column", X."type", X.typewidth,
X.count, 0, X.typewidth, false, X.sorted, X.revsorted, X."unique", X.orderidx,
X.compressed from sys."storage"() X;
update sys.storagemodelinput
set reference = true
@@ -236,14 +241,15 @@ returns table (
sorted boolean,
revsorted boolean,
"unique" boolean,
- orderidx bigint)
+ orderidx bigint,
+ compressed boolean)
begin
return select I."schema", I."table", I."column", I."type", I."count",
columnsize(I."type", I.count, I."distinct"),
heapsize(I."type", I."distinct", I."atomwidth"),
hashsize(I."reference", I."count"),
imprintsize(I."count",I."type"),
- I.sorted, I.revsorted, I."unique", I.orderidx
+ I.sorted, I.revsorted, I."unique", I.orderidx, I.compressed
from sys.storagemodelinput I;
end;
diff --git a/sql/test/Tests/systemfunctions.stable.out
b/sql/test/Tests/systemfunctions.stable.out
--- a/sql/test/Tests/systemfunctions.stable.out
+++ b/sql/test/Tests/systemfunctions.stable.out
@@ -4189,7 +4189,7 @@ Ready.
[ "sys", "stddev_samp", 1, "timestamp", "" ]
[ "sys", "stop", 0, "int", "create procedure sys.stop(tag
int)\nexternal name sql.sysmon_stop;" ]
[ "sys", "stop", 0, "bigint", "create procedure sys.stop(tag
bigint)\nexternal name sql.sysmon_stop;" ]
-[ "sys", "storage", 0, "clob", "create function
sys.\"storage\"()\nreturns table (\n \"schema\" string,\n \"table\" string,\n
\"column\" string,\n \"type\" string,\n \"mode\" string,\n location string,\n
\"count\" bigint,\n typewidth int,\n columnsize bigint,\n heapsize bigint,\n
hashes bigint,\n phash boolean,\n \"imprints\" bigint,\n sorted boolean,\n
revsorted boolean,\n \"unique\" boolean,\n orderidx bigint\n)\nexternal name
sql.\"storage\";" ]
+[ "sys", "storage", 0, "clob", "create function
sys.\"storage\"()\nreturns table (\n \"schema\" string,\n \"table\" string,\n
\"column\" string,\n \"type\" string,\n \"mode\" string,\n location string,\n
\"count\" bigint,\n typewidth int,\n columnsize bigint,\n heapsize bigint,\n
hashes bigint,\n phash boolean,\n \"imprints\" bigint,\n sorted boolean,\n
revsorted boolean,\n \"unique\" boolean,\n orderidx bigint,\n compressed
boolean\n)\nexternal name sql.\"storage\";" ]
[ "sys", "storage", 1, "clob", "" ]
[ "sys", "storage", 2, "clob", "" ]
[ "sys", "storage", 3, "clob", "" ]
@@ -4206,7 +4206,8 @@ Ready.
[ "sys", "storage", 14, "boolean", "" ]
[ "sys", "storage", 15, "boolean", "" ]
[ "sys", "storage", 16, "bigint", "" ]
-[ "sys", "storage", 0, "clob", "create function
sys.\"storage\"( sname string)\nreturns table (\n \"schema\" string,\n
\"table\" string,\n \"column\" string,\n \"type\" string,\n \"mode\" string,\n
location string,\n \"count\" bigint,\n typewidth int,\n columnsize bigint,\n
heapsize bigint,\n hashes bigint,\n phash boolean,\n \"imprints\" bigint,\n
sorted boolean,\n revsorted boolean,\n \"unique\" boolean,\n orderidx
bigint\n)\nexternal name sql.\"storage\";" ]
+[ "sys", "storage", 17, "boolean", "" ]
+[ "sys", "storage", 0, "clob", "create function
sys.\"storage\"( sname string)\nreturns table (\n \"schema\" string,\n
\"table\" string,\n \"column\" string,\n \"type\" string,\n \"mode\" string,\n
location string,\n \"count\" bigint,\n typewidth int,\n columnsize bigint,\n
heapsize bigint,\n hashes bigint,\n phash boolean,\n \"imprints\" bigint,\n
sorted boolean,\n revsorted boolean,\n \"unique\" boolean,\n orderidx bigint,\n
compressed boolean\n)\nexternal name sql.\"storage\";" ]
[ "sys", "storage", 1, "clob", "" ]
[ "sys", "storage", 2, "clob", "" ]
[ "sys", "storage", 3, "clob", "" ]
@@ -4223,7 +4224,8 @@ Ready.
[ "sys", "storage", 14, "boolean", "" ]
[ "sys", "storage", 15, "boolean", "" ]
[ "sys", "storage", 16, "bigint", "" ]
-[ "sys", "storage", 17, "clob", "" ]
+[ "sys", "storage", 17, "boolean", "" ]
+[ "sys", "storage", 18, "clob", "" ]
[ "sys", "storage", 0, "clob", "create function
sys.\"storage\"( sname string, tname string)\nreturns table (\n \"schema\"
string,\n \"table\" string,\n \"column\" string,\n \"type\" string,\n \"mode\"
string,\n location string,\n \"count\" bigint,\n typewidth int,\n columnsize
bigint,\n heapsize bigint,\n hashes bigint,\n phash boolean,\n \"imprints\"
bigint,\n sorted boolean,\n revsorted boolean,\n \"unique\" boolean,\n orderidx
bigint\n)\nexternal name sql.\"storage\";" ]
[ "sys", "storage", 1, "clob", "" ]
[ "sys", "storage", 2, "clob", "" ]
diff --git a/sql/test/Tests/systemfunctions.stable.out.int128
b/sql/test/Tests/systemfunctions.stable.out.int128
--- a/sql/test/Tests/systemfunctions.stable.out.int128
+++ b/sql/test/Tests/systemfunctions.stable.out.int128
@@ -4737,7 +4737,7 @@ Ready.
[ "sys", "stddev_samp", 1, "hugeint", "" ]
[ "sys", "stop", 0, "int", "create procedure sys.stop(tag
int)\nexternal name sql.sysmon_stop;" ]
[ "sys", "stop", 0, "bigint", "create procedure sys.stop(tag
bigint)\nexternal name sql.sysmon_stop;" ]
-[ "sys", "storage", 0, "clob", "create function
sys.\"storage\"()\nreturns table (\n \"schema\" string,\n \"table\" string,\n
\"column\" string,\n \"type\" string,\n \"mode\" string,\n location string,\n
\"count\" bigint,\n typewidth int,\n columnsize bigint,\n heapsize bigint,\n
hashes bigint,\n phash boolean,\n \"imprints\" bigint,\n sorted boolean,\n
revsorted boolean,\n \"unique\" boolean,\n orderidx bigint\n)\nexternal name
sql.\"storage\";" ]
+[ "sys", "storage", 0, "clob", "create function
sys.\"storage\"()\nreturns table (\n \"schema\" string,\n \"table\" string,\n
\"column\" string,\n \"type\" string,\n \"mode\" string,\n location string,\n
\"count\" bigint,\n typewidth int,\n columnsize bigint,\n heapsize bigint,\n
hashes bigint,\n phash boolean,\n \"imprints\" bigint,\n sorted boolean,\n
revsorted boolean,\n \"unique\" boolean,\n orderidx bigint,\n compressed
boolean\n)\nexternal name sql.\"storage\";" ]
[ "sys", "storage", 1, "clob", "" ]
[ "sys", "storage", 2, "clob", "" ]
[ "sys", "storage", 3, "clob", "" ]
@@ -4754,7 +4754,8 @@ Ready.
[ "sys", "storage", 14, "boolean", "" ]
[ "sys", "storage", 15, "boolean", "" ]
[ "sys", "storage", 16, "bigint", "" ]
-[ "sys", "storage", 0, "clob", "create function
sys.\"storage\"( sname string)\nreturns table (\n \"schema\" string,\n
\"table\" string,\n \"column\" string,\n \"type\" string,\n \"mode\" string,\n
location string,\n \"count\" bigint,\n typewidth int,\n columnsize bigint,\n
heapsize bigint,\n hashes bigint,\n phash boolean,\n \"imprints\" bigint,\n
sorted boolean,\n revsorted boolean,\n \"unique\" boolean,\n orderidx
bigint\n)\nexternal name sql.\"storage\";" ]
+[ "sys", "storage", 17, "boolean", "" ]
+[ "sys", "storage", 0, "clob", "create function
sys.\"storage\"( sname string)\nreturns table (\n \"schema\" string,\n
\"table\" string,\n \"column\" string,\n \"type\" string,\n \"mode\" string,\n
location string,\n \"count\" bigint,\n typewidth int,\n columnsize bigint,\n
heapsize bigint,\n hashes bigint,\n phash boolean,\n \"imprints\" bigint,\n
sorted boolean,\n revsorted boolean,\n \"unique\" boolean,\n orderidx bigint,\n
compressed boolean\n)\nexternal name sql.\"storage\";" ]
[ "sys", "storage", 1, "clob", "" ]
[ "sys", "storage", 2, "clob", "" ]
[ "sys", "storage", 3, "clob", "" ]
@@ -4771,7 +4772,8 @@ Ready.
[ "sys", "storage", 14, "boolean", "" ]
[ "sys", "storage", 15, "boolean", "" ]
[ "sys", "storage", 16, "bigint", "" ]
-[ "sys", "storage", 17, "clob", "" ]
+[ "sys", "storage", 17, "boolean", "" ]
+[ "sys", "storage", 18, "clob", "" ]
[ "sys", "storage", 0, "clob", "create function
sys.\"storage\"( sname string, tname string)\nreturns table (\n \"schema\"
string,\n \"table\" string,\n \"column\" string,\n \"type\" string,\n \"mode\"
string,\n location string,\n \"count\" bigint,\n typewidth int,\n columnsize
bigint,\n heapsize bigint,\n hashes bigint,\n phash boolean,\n \"imprints\"
bigint,\n sorted boolean,\n revsorted boolean,\n \"unique\" boolean,\n orderidx
bigint\n)\nexternal name sql.\"storage\";" ]
[ "sys", "storage", 1, "clob", "" ]
[ "sys", "storage", 2, "clob", "" ]
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,46 +44,46 @@ Ready.
% .explain # table_name
% mal # name
% clob # type
-% 90 # length
+% 168 # length
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_28 := bat.new(nil:int);
- X_26 := bat.new(nil:int);
- X_25 := bat.new(nil:str);
- X_24 := bat.new(nil:str);
- X_4 := sql.mvc();
- C_104:bat[:oid] := sql.tid(X_4, "sys", "tmp3");
- X_5:bat[:oid] := mosaic.decompress(C_104);
- 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_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);
+ X_1:void := querylog.define("explain select * from tmp3;":str,
"sequential_pipe":str, 39:int);
+ X_22:bat[:str] := bat.new(nil:str);
+ X_28:bat[:int] := bat.new(nil:int);
+ X_26:bat[:int] := bat.new(nil:int);
+ 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, "tmp3":str);
+ X_5:bat[:oid] := mosaic.decompress(C_104:bat[:oid]);
+ X_18:bat[:timestamp] := sql.bind(X_4:int, "sys":str, "tmp3":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, "tmp3":str, "f":str, 0:int);
+ X_17:bat[:flt] := mosaic.projection(X_5:bat[:oid], X_15:bat[:flt]);
+ X_12:bat[:bit] := sql.bind(X_4:int, "sys":str, "tmp3":str, "b":str, 0:int);
+ X_14:bat[:bit] := mosaic.projection(X_5:bat[:oid], X_12:bat[:bit]);
+ X_8:bat[:int] := sql.bind(X_4:int, "sys":str, "tmp3":str, "i":str, 0:int);
+ X_11:bat[:int] := mosaic.projection(X_5:bat[:oid], X_8:bat[:int]);
+ X_29:bat[:str] := bat.append(X_22:bat[:str], "sys.tmp3":str);
+ X_31:bat[:str] := bat.append(X_24:bat[:str], "i":str);
+ X_32:bat[:str] := bat.append(X_25:bat[:str], "int":str);
+ X_34:bat[:int] := bat.append(X_26:bat[:int], 32:int);
+ X_36:bat[:int] := bat.append(X_28:bat[:int], 0:int);
+ X_37:bat[:str] := bat.append(X_29:bat[:str], "sys.tmp3":str);
+ X_38:bat[:str] := bat.append(X_31:bat[:str], "b":str);
+ X_39:bat[:str] := bat.append(X_32:bat[:str], "boolean":str);
+ X_41:bat[:int] := bat.append(X_34:bat[:int], 1:int);
+ X_43:bat[:int] := bat.append(X_36:bat[:int], 0:int);
+ X_45:bat[:str] := bat.append(X_37:bat[:str], "sys.tmp3":str);
+ X_46:bat[:str] := bat.append(X_38:bat[:str], "f":str);
+ X_47:bat[:str] := bat.append(X_39:bat[:str], "real":str);
+ X_49:bat[:int] := bat.append(X_41:bat[:int], 24:int);
+ X_51:bat[:int] := bat.append(X_43:bat[:int], 0:int);
+ X_52:bat[:str] := bat.append(X_45:bat[:str], "sys.tmp3":str);
+ X_53:bat[:str] := bat.append(X_46:bat[:str], "t":str);
+ X_55:bat[:str] := bat.append(X_47:bat[:str], "timestamp":str);
+ X_57:bat[:int] := bat.append(X_49:bat[:int], 7:int);
+ X_59:bat[:int] := bat.append(X_51:bat[:int], 0:int);
+ sql.resultSet(X_52:bat[:str], X_53:bat[:str], X_55:bat[:str],
X_57:bat[:int], X_59:bat[:int], X_11:bat[:int], X_14:bat[:bit], X_17:bat[:flt],
X_20:bat[:timestamp]);
end user.s10_1;
#inline actions= 0 time=1 usec
#remap actions= 0 time=2 usec
@@ -217,46 +217,46 @@ end user.s10_1;
% .explain # table_name
% mal # name
% clob # type
-% 90 # length
+% 168 # length
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_28 := bat.new(nil:int);
- X_26 := bat.new(nil:int);
- X_25 := bat.new(nil:str);
- X_24 := bat.new(nil:str);
- X_4 := sql.mvc();
- C_104:bat[:oid] := sql.tid(X_4, "sys", "tmp3");
- X_5:bat[:oid] := mosaic.decompress(C_104);
- 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_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");
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
