Changeset: ac9e95f83a3b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ac9e95f83a3b
Modified Files:
sql/jdbc/tests/Tests/Test_Dobjects.stable.out
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/Tests/setoptimizer.stable.err
sql/test/Tests/setoptimizer.stable.out
sql/test/Tests/setoptimizer.stable.out.Windows
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check1.stable.out.int128
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check2.stable.out.int128
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check3.stable.out.int128
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check4.stable.out.int128
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/check5.stable.out.int128
sql/test/leaks/Tests/drop3.stable.out.int128
sql/test/leaks/Tests/select1.stable.out.int128
sql/test/leaks/Tests/select2.stable.out.int128
sql/test/leaks/Tests/temp1.stable.out.int128
sql/test/leaks/Tests/temp2.stable.out.int128
sql/test/leaks/Tests/temp3.stable.out.int128
Branch: mosaic
Log Message:
Approve output
diffs (truncated from 1063 to 300 lines):
diff --git a/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
--- a/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
+++ b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
@@ -35,6 +35,7 @@ Resultset with 3 columns
TABLE_SCHEM TABLE_CATALOG TABLE_CAT
bam null null
json null null
+mosaic null null
profiler null null
sys null null
tmp null null
diff --git a/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
b/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
--- a/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
+++ b/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
@@ -23,47 +23,8 @@ Ready.
Operation successful
-+------------------------------------------------------------------------------------------------------+
-| mal |
-+======================================================================================================+
-| function user.s2_1():void;
|
-| X_46:void := querylog.define("explain select \"name\" from
\"tables\"\n;","sequential_pipe",33); |
-| X_32 := bat.new(nil:oid,nil:str);
|
-| X_38 := bat.append(X_32,".tables");
|
-| X_33 := bat.new(nil:oid,nil:str);
|
-| X_40 := bat.append(X_33,"name");
|
-| X_34 := bat.new(nil:oid,nil:str);
|
-| X_41 := bat.append(X_34,"varchar");
|
-| X_35 := bat.new(nil:oid,nil:int);
|
-| X_43 := bat.append(X_35,1024);
|
-| X_37 := bat.new(nil:oid,nil:int);
|
-| X_45 := bat.append(X_37,0);
|
-| X_2:bat[:str] := bat.new(nil:oid,nil:str);
|
-| X_1 := sql.mvc();
|
-| X_8:bat[:sht] := sql.bind(X_1,"sys","_tables","type",0);
|
-| C_5:bat[:oid] := sql.tid(X_1,"sys","_tables");
|
-| C_55 := algebra.subselect(X_8,C_5,2,2,true,true,true);
|
-| (C_11,r1_11) := sql.bind(X_1,"sys","_tables","type",2);
|
-| C_56 := algebra.subselect(r1_11,nil:bat[:oid],2,2,true,true,true);
|
-| X_14:bat[:sht] := sql.bind(X_1,"sys","_tables","type",1);
|
-| C_58 := algebra.subselect(X_14,C_5,2,2,true,true,true);
|
-| C_17 := sql.subdelta(C_55,C_5,C_11,C_56,C_58);
|
-| X_19:bat[:str] := sql.bind(X_1,"sys","_tables","name",0);
|
-| (C_21,r1_25) := sql.bind(X_1,"sys","_tables","name",2);
|
-| X_23:bat[:str] := sql.bind(X_1,"sys","_tables","name",1);
|
-| X_24 := sql.projectdelta(C_17,X_19,C_21,r1_25,X_23);
|
-| X_25 := bat.append(X_2,X_24,true);
|
-| C_26:bat[:oid] := sql.tid(X_1,"tmp","_tables");
|
-| X_28:bat[:str] := sql.bind(X_1,"tmp","_tables","name",0);
|
-| X_29 := algebra.projection(C_26,X_28);
|
-| X_30 := bat.append(X_25,X_29,true);
|
-| sql.resultSet(X_38,X_40,X_41,X_43,X_45,X_30);
|
-| end user.s2_1;
|
-+------------------------------------------------------------------------------------------------------+
-33 rows
+# 20:47:54 >
+# 20:47:54 > "Done."
+# 20:47:54 >
-# 15:15:37 >
-# 15:15:37 > Done.
-# 15:15:37 >
-
diff --git a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
--- a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
+++ b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
@@ -45,41 +45,8 @@ 18 rows
Operation successful
-+--------------------------------------------------------------------------------------------------+
-| mal |
-+==================================================================================================+
-| function user.s3_1():void;
|
-| X_41:void := querylog.define("explain select count(*) from
tables\n;","sequential_pipe",27); |
-| X_2:bat[:wrd] := bat.new(nil:oid,nil:wrd);
|
-| X_1 := sql.mvc();
|
-| X_8:bat[:sht] := sql.bind(X_1,"sys","_tables","type",0);
|
-| C_5:bat[:oid] := sql.tid(X_1,"sys","_tables");
|
-| C_50 := algebra.subselect(X_8,C_5,2,2,true,true,true);
|
-| (C_11,r1_11) := sql.bind(X_1,"sys","_tables","type",2);
|
-| C_51 := algebra.subselect(r1_11,nil:bat[:oid],2,2,true,true,true);
|
-| X_14:bat[:sht] := sql.bind(X_1,"sys","_tables","type",1);
|
-| C_53 := algebra.subselect(X_14,C_5,2,2,true,true,true);
|
-| C_17 := sql.subdelta(C_50,C_5,C_11,C_51,C_53);
|
-| X_19:bat[:int] := sql.bind(X_1,"sys","_tables","id",0);
|
-| (C_21,r1_25) := sql.bind(X_1,"sys","_tables","id",2);
|
-| X_23:bat[:int] := sql.bind(X_1,"sys","_tables","id",1);
|
-| X_24 := sql.projectdelta(C_17,X_19,C_21,r1_25,X_23);
|
-| X_25 := aggr.count(X_24);
|
-| X_26 := sql.single(X_25);
|
-| X_27 := bat.append(X_2,X_26,true);
|
-| C_28:bat[:oid] := sql.tid(X_1,"tmp","_tables");
|
-| X_30:bat[:int] := sql.bind(X_1,"tmp","_tables","id",0);
|
-| X_31 := algebra.projection(C_28,X_30);
|
-| X_32 := aggr.count(X_31);
|
-| X_33 := bat.append(X_27,X_32,true);
|
-| X_34:wrd := aggr.sum(X_33);
|
-| sql.resultSet(".L3","L3","wrd",64,0,7,X_34);
|
-| end user.s3_1;
|
-+--------------------------------------------------------------------------------------------------+
-27 rows
+# 20:47:55 >
+# 20:47:55 > "Done."
+# 20:47:55 >
-# 19:39:11 >
-# 19:39:11 > "Done."
-# 19:39:11 >
-
diff --git a/sql/test/Tests/setoptimizer.stable.err
b/sql/test/Tests/setoptimizer.stable.err
--- a/sql/test/Tests/setoptimizer.stable.err
+++ b/sql/test/Tests/setoptimizer.stable.err
@@ -79,11 +79,11 @@ stderr of test 'setoptimizer` in directo
# 12:49:31 > mclient -lsql -i --host=eir --port=36907
# 12:49:31 >
-MAPI = (monetdb) /var/tmp/mtest-12887/.s.monetdb.38476
+MAPI = (monetdb) /var/tmp/mtest-26482/.s.monetdb.32570
QUERY = set optimizer=' optimizer.inline(); optimizer.remap();
optimizer.evaluate(); optimizer.costModel(); optimizer.coercions();
optimizer.emptySet(); optimizer.aliases(); optimizer.mergetable();
optimizer.deadcode(); optimizer.commonTerms(); optimizer.joinPath();
optimizer.reorder(); optimizer.deadcode(); optimizer.reduce();
optimizer.querylog(); optimizer.multiplex(); optimizer.garbageCollector();';
ERROR = !TypeException:user.main[6]:'optimizer.emptySet' undefined in:
optimizer.emptySet();
!Semantic errors detected
-MAPI = (monetdb) /var/tmp/mtest-12887/.s.monetdb.38476
+MAPI = (monetdb) /var/tmp/mtest-26482/.s.monetdb.32570
QUERY = set optimizer='myfamous_pipe';
ERROR = !optimizer 'myfamous_pipe' unknown
diff --git a/sql/test/Tests/setoptimizer.stable.out
b/sql/test/Tests/setoptimizer.stable.out
--- a/sql/test/Tests/setoptimizer.stable.out
+++ b/sql/test/Tests/setoptimizer.stable.out
@@ -65,11 +65,11 @@ Ready.
% name, def, status # name
% clob, clob, clob # type
% 15, 561, 6 # length
-[ "minimal_pipe",
"optimizer.inline();optimizer.candidates();optimizer.remap();optimizer.deadcode();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.garbageCollector();",
"stable" ]
+[ "minimal_pipe",
"optimizer.inline();optimizer.candidates();optimizer.remap();optimizer.deadcode();optimizer.multiplex();optimizer.generator();optimizer.mosaic();optimizer.profiler();optimizer.garbageCollector();",
"stable" ]
[ "default_pipe",
"optimizer.inline();optimizer.candidates();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.garbageCollector();",
"stable" ]
[ "volcano_pipe",
"optimizer.inline();optimizer.candidates();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.volcano();optimizer.profiler();optimizer.garbageCollector();",
"stable" ]
-[ "no_mitosis_pipe",
"optimizer.inline();optimizer.remap();optimizer.candidates();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.aliases();optimizer.pushselect();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.profiler();optimizer.generator();optimizer.garbageCollector();",
"stable" ]
-[ "sequential_pipe",
"optimizer.inline();optimizer.candidates();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.aliases();optimizer.pushselect();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.garbageCollector();",
"stable" ]
+[ "no_mitosis_pipe",
"optimizer.inline();optimizer.remap();optimizer.candidates();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.aliases();optimizer.pushselect();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.profiler();optimizer.generator();optimizer.mosaic();optimizer.garbageCollector();",
"stable" ]
+[ "sequential_pipe",
"optimizer.inline();optimizer.candidates();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.aliases();optimizer.pushselect();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.mosaic();optimizer.profiler();optimizer.garbageCollector();",
"stable" ]
# 02:57:35 >
# 02:57:35 > "Done."
diff --git a/sql/test/Tests/setoptimizer.stable.out.Windows
b/sql/test/Tests/setoptimizer.stable.out.Windows
--- a/sql/test/Tests/setoptimizer.stable.out.Windows
+++ b/sql/test/Tests/setoptimizer.stable.out.Windows
@@ -65,11 +65,11 @@ Ready.
% name, def, status # name
% clob, clob, clob # type
% 15, 561, 6 # length
-[ "minimal_pipe",
"optimizer.inline();optimizer.candidates();optimizer.remap();optimizer.deadcode();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.garbageCollector();",
"stable" ]
+[ "minimal_pipe",
"optimizer.inline();optimizer.candidates();optimizer.remap();optimizer.deadcode();optimizer.multiplex();optimizer.generator();optimizer.mosaic();optimizer.profiler();optimizer.garbageCollector();",
"stable" ]
[ "default_pipe",
"optimizer.inline();optimizer.candidates();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.garbageCollector();",
"stable" ]
[ "volcano_pipe",
"optimizer.inline();optimizer.candidates();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.volcano();optimizer.profiler();optimizer.garbageCollector();",
"stable" ]
-[ "no_mitosis_pipe",
"optimizer.inline();optimizer.remap();optimizer.candidates();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.aliases();optimizer.pushselect();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.profiler();optimizer.generator();optimizer.garbageCollector();",
"stable" ]
-[ "sequential_pipe",
"optimizer.inline();optimizer.candidates();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.aliases();optimizer.pushselect();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.garbageCollector();",
"stable" ]
+[ "no_mitosis_pipe",
"optimizer.inline();optimizer.remap();optimizer.candidates();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.aliases();optimizer.pushselect();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.profiler();optimizer.generator();optimizer.mosaic();optimizer.garbageCollector();",
"stable" ]
+[ "sequential_pipe",
"optimizer.inline();optimizer.candidates();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.aliases();optimizer.pushselect();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.mosaic();optimizer.profiler();optimizer.garbageCollector();",
"stable" ]
# 13:03:42 >
# 13:03:42 > "Done."
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
@@ -132,6 +132,38 @@ Ready.
[ "json", "tojsonarray", 1, "double", "" ]
[ "json", "valuearray", 0, "json", "create function
json.valuearray(js json)\nreturns json external name json.valuearray;" ]
[ "json", "valuearray", 1, "json", "" ]
+[ "mosaic", "analysis", 0, "clob", "-- provide an analysis of the
possible mosaic storage layouts \ncreate function mosaic.analysis(sch string,
tbl string, col string)\nreturns table(\n\ttechnique string, \t-- compression
techniques being used\n\toutputsize bigint,\t-- after compression\n\tfactor
double,\t\t-- compression factor\n\trun\tbigint -- time spent in msec\n)
external name sql.\"mosaicAnalysis\";" ]
+[ "mosaic", "analysis", 1, "bigint", "" ]
+[ "mosaic", "analysis", 2, "double", "" ]
+[ "mosaic", "analysis", 3, "bigint", "" ]
+[ "mosaic", "analysis", 4, "clob", "" ]
+[ "mosaic", "analysis", 5, "clob", "" ]
+[ "mosaic", "analysis", 6, "clob", "" ]
+[ "mosaic", "analysis", 0, "clob", "create function
mosaic.analysis(sch string, tbl string, col string, compressions
string)\nreturns table(\n\ttechnique string, \t-- compression techniques being
used\n\toutputsize bigint,\t-- after compression\n\tfactor double,\t\t--
compression factor\n\trun\tbigint -- time spent in msec\n) external name
sql.\"mosaicAnalysis\";" ]
+[ "mosaic", "analysis", 1, "bigint", "" ]
+[ "mosaic", "analysis", 2, "double", "" ]
+[ "mosaic", "analysis", 3, "bigint", "" ]
+[ "mosaic", "analysis", 4, "clob", "" ]
+[ "mosaic", "analysis", 5, "clob", "" ]
+[ "mosaic", "analysis", 6, "clob", "" ]
+[ "mosaic", "analysis", 7, "clob", "" ]
+[ "mosaic", "layout", 0, "clob", "create function
mosaic.layout(sch string, tbl string, col string)\nreturns table
(\n\t\"technique\" string, \t-- any of the built-in compressors +
header\n\t\"count\" bigint, \t-- entries covered \n\tinputsize bigint,\t--
original storage footprint\n\toutputsize bigint,\t-- after
compression\n\tproperties string\t-- additional information\n\t) external name
sql.\"mosaicLayout\";" ]
+[ "mosaic", "layout", 1, "bigint", "" ]
+[ "mosaic", "layout", 2, "bigint", "" ]
+[ "mosaic", "layout", 3, "bigint", "" ]
+[ "mosaic", "layout", 4, "clob", "" ]
+[ "mosaic", "layout", 5, "clob", "" ]
+[ "mosaic", "layout", 6, "clob", "" ]
+[ "mosaic", "layout", 7, "clob", "" ]
+[ "mosaic", "layout", 0, "clob", "create function
mosaic.layout(sch string, tbl string, col string, compressionscheme
string)\nreturns table (\n\t\"technique\" string, \t-- any of the built-in
compressors + header\n\t\"count\" bigint, \t-- entries covered \n\tinputsize
bigint,\t-- original storage footprint\n\toutputsize bigint,\t-- after
compression\n\tproperties string\t-- additional information\n\t) external name
sql.\"mosaicLayout\";" ]
+[ "mosaic", "layout", 1, "bigint", "" ]
+[ "mosaic", "layout", 2, "bigint", "" ]
+[ "mosaic", "layout", 3, "bigint", "" ]
+[ "mosaic", "layout", 4, "clob", "" ]
+[ "mosaic", "layout", 5, "clob", "" ]
+[ "mosaic", "layout", 6, "clob", "" ]
+[ "mosaic", "layout", 7, "clob", "" ]
+[ "mosaic", "layout", 8, "clob", "" ]
[ "profiler", "setheartbeat", 0, "int", "create procedure
profiler.setheartbeat(beat int) external name profiler.setheartbeat;" ]
[ "profiler", "setpoolsize", 0, "int", "create procedure
profiler.setpoolsize(poolsize int) external name profiler.setpoolsize;" ]
[ "profiler", "setstream", 0, "clob", "create procedure
profiler.setstream(host string, port int) external name profiler.setstream;" ]
@@ -697,7 +729,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", "-- This Source Code Form is
subject to the terms of the Mozilla Public\n-- License, v. 2.0. If a copy of
the MPL was not distributed with this\n-- file, You can obtain one at
http://mozilla.org/MPL/2.0/.\n--\n-- Copyright 1997 - July 2008 CWI, August
2008 - 2016 MonetDB B.V.\n\n-- Author M.Kersten\n-- This script gives the
database administrator insight in the actual\n-- footprint of the persistent
tables and the maximum playground used\n-- when indices are introduced upon
them.\n-- By changing the storagemodelinput table directly, the footprint
for\n-- yet to be loaded databases can be assessed.\n\n-- The actual storage
footprint of an existing database can be\n-- obtained by the table producing
function storage()\n-- It represents the actual state of affairs, i.e. storage
on disk\n-- of columns and foreign key indices, and possible temporary hash
indices.\n-- For strings we take a sample to determine their average
length.\n\ncreate function sys.\"s
torage\"()\nreturns table (\n\t\"schema\" string,\n\t\"table\"
string,\n\t\"column\" string,\n\t\"type\" string,\n\t\"mode\"
string,\n\tlocation string,\n\t\"count\" bigint,\n\ttypewidth
int,\n\tcolumnsize bigint,\n\theapsize bigint,\n\thashes bigint,\n\tphash
boolean,\n\timprints bigint,\n\tsorted boolean\n)\nexternal name
sql.\"storage\";" ]
+[ "sys", "storage", 0, "clob", "-- This Source Code Form is
subject to the terms of the Mozilla Public\n-- License, v. 2.0. If a copy of
the MPL was not distributed with this\n-- file, You can obtain one at
http://mozilla.org/MPL/2.0/.\n--\n-- Copyright 1997 - July 2008 CWI, August
2008 - 2016 MonetDB B.V.\n\n-- Author M.Kersten\n-- This script gives the
database administrator insight in the actual\n-- footprint of the persistent
tables and the maximum playground used\n-- when indices are introduced upon
them.\n-- By changing the storagemodelinput table directly, the footprint
for\n-- yet to be loaded databases can be assessed.\n\n-- The actual storage
footprint of an existing database can be\n-- obtained by the table producing
function storage()\n-- It represents the actual state of affairs, i.e. storage
on disk\n-- of columns and foreign key indices, and possible temporary hash
indices.\n-- For strings we take a sample to determine their average
length.\n\ncreate function sys.\"s
torage\"()\nreturns table (\"schema\" string, \"table\" string, \"column\"
string, \"type\" string, \"mode\" string, location string, \"count\" bigint,
typewidth int, columnsize bigint, heapsize bigint, hashes bigint, phash
boolean, imprints bigint, sorted boolean, compress boolean)\nexternal name
sql.\"storage\";" ]
[ "sys", "storage", 1, "clob", "" ]
[ "sys", "storage", 2, "clob", "" ]
[ "sys", "storage", 3, "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
@@ -135,6 +135,38 @@ Ready.
[ "json", "tojsonarray", 1, "double", "" ]
[ "json", "valuearray", 0, "json", "create function
json.valuearray(js json)\nreturns json external name json.valuearray;" ]
[ "json", "valuearray", 1, "json", "" ]
+[ "mosaic", "analysis", 0, "clob", "-- provide an analysis of the
possible mosaic storage layouts \ncreate function mosaic.analysis(sch string,
tbl string, col string)\nreturns table(\n\ttechnique string, \t-- compression
techniques being used\n\toutputsize bigint,\t-- after compression\n\tfactor
double,\t\t-- compression factor\n\trun\tbigint -- time spent in msec\n)
external name sql.\"mosaicAnalysis\";" ]
+[ "mosaic", "analysis", 1, "bigint", "" ]
+[ "mosaic", "analysis", 2, "double", "" ]
+[ "mosaic", "analysis", 3, "bigint", "" ]
+[ "mosaic", "analysis", 4, "clob", "" ]
+[ "mosaic", "analysis", 5, "clob", "" ]
+[ "mosaic", "analysis", 6, "clob", "" ]
+[ "mosaic", "analysis", 0, "clob", "create function
mosaic.analysis(sch string, tbl string, col string, compressions
string)\nreturns table(\n\ttechnique string, \t-- compression techniques being
used\n\toutputsize bigint,\t-- after compression\n\tfactor double,\t\t--
compression factor\n\trun\tbigint -- time spent in msec\n) external name
sql.\"mosaicAnalysis\";" ]
+[ "mosaic", "analysis", 1, "bigint", "" ]
+[ "mosaic", "analysis", 2, "double", "" ]
+[ "mosaic", "analysis", 3, "bigint", "" ]
+[ "mosaic", "analysis", 4, "clob", "" ]
+[ "mosaic", "analysis", 5, "clob", "" ]
+[ "mosaic", "analysis", 6, "clob", "" ]
+[ "mosaic", "analysis", 7, "clob", "" ]
+[ "mosaic", "layout", 0, "clob", "create function
mosaic.layout(sch string, tbl string, col string)\nreturns table
(\n\t\"technique\" string, \t-- any of the built-in compressors +
header\n\t\"count\" bigint, \t-- entries covered \n\tinputsize bigint,\t--
original storage footprint\n\toutputsize bigint,\t-- after
compression\n\tproperties string\t-- additional information\n\t) external name
sql.\"mosaicLayout\";" ]
+[ "mosaic", "layout", 1, "bigint", "" ]
+[ "mosaic", "layout", 2, "bigint", "" ]
+[ "mosaic", "layout", 3, "bigint", "" ]
+[ "mosaic", "layout", 4, "clob", "" ]
+[ "mosaic", "layout", 5, "clob", "" ]
+[ "mosaic", "layout", 6, "clob", "" ]
+[ "mosaic", "layout", 7, "clob", "" ]
+[ "mosaic", "layout", 0, "clob", "create function
mosaic.layout(sch string, tbl string, col string, compressionscheme
string)\nreturns table (\n\t\"technique\" string, \t-- any of the built-in
compressors + header\n\t\"count\" bigint, \t-- entries covered \n\tinputsize
bigint,\t-- original storage footprint\n\toutputsize bigint,\t-- after
compression\n\tproperties string\t-- additional information\n\t) external name
sql.\"mosaicLayout\";" ]
+[ "mosaic", "layout", 1, "bigint", "" ]
+[ "mosaic", "layout", 2, "bigint", "" ]
+[ "mosaic", "layout", 3, "bigint", "" ]
+[ "mosaic", "layout", 4, "clob", "" ]
+[ "mosaic", "layout", 5, "clob", "" ]
+[ "mosaic", "layout", 6, "clob", "" ]
+[ "mosaic", "layout", 7, "clob", "" ]
+[ "mosaic", "layout", 8, "clob", "" ]
[ "profiler", "setheartbeat", 0, "int", "create procedure
profiler.setheartbeat(beat int) external name profiler.setheartbeat;" ]
[ "profiler", "setpoolsize", 0, "int", "create procedure
profiler.setpoolsize(poolsize int) external name profiler.setpoolsize;" ]
[ "profiler", "setstream", 0, "clob", "create procedure
profiler.setstream(host string, port int) external name profiler.setstream;" ]
@@ -722,7 +754,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", "-- This Source Code Form is
subject to the terms of the Mozilla Public\n-- License, v. 2.0. If a copy of
the MPL was not distributed with this\n-- file, You can obtain one at
http://mozilla.org/MPL/2.0/.\n--\n-- Copyright 1997 - July 2008 CWI, August
2008 - 2016 MonetDB B.V.\n\n-- Author M.Kersten\n-- This script gives the
database administrator insight in the actual\n-- footprint of the persistent
tables and the maximum playground used\n-- when indices are introduced upon
them.\n-- By changing the storagemodelinput table directly, the footprint
for\n-- yet to be loaded databases can be assessed.\n\n-- The actual storage
footprint of an existing database can be\n-- obtained by the table producing
function storage()\n-- It represents the actual state of affairs, i.e. storage
on disk\n-- of columns and foreign key indices, and possible temporary hash
indices.\n-- For strings we take a sample to determine their average
length.\n\ncreate function sys.\"s
torage\"()\nreturns table (\n\t\"schema\" string,\n\t\"table\"
string,\n\t\"column\" string,\n\t\"type\" string,\n\t\"mode\"
string,\n\tlocation string,\n\t\"count\" bigint,\n\ttypewidth
int,\n\tcolumnsize bigint,\n\theapsize bigint,\n\thashes bigint,\n\tphash
boolean,\n\timprints bigint,\n\tsorted boolean\n)\nexternal name
sql.\"storage\";" ]
+[ "sys", "storage", 0, "clob", "-- This Source Code Form is
subject to the terms of the Mozilla Public\n-- License, v. 2.0. If a copy of
the MPL was not distributed with this\n-- file, You can obtain one at
http://mozilla.org/MPL/2.0/.\n--\n-- Copyright 1997 - July 2008 CWI, August
2008 - 2016 MonetDB B.V.\n\n-- Author M.Kersten\n-- This script gives the
database administrator insight in the actual\n-- footprint of the persistent
tables and the maximum playground used\n-- when indices are introduced upon
them.\n-- By changing the storagemodelinput table directly, the footprint
for\n-- yet to be loaded databases can be assessed.\n\n-- The actual storage
footprint of an existing database can be\n-- obtained by the table producing
function storage()\n-- It represents the actual state of affairs, i.e. storage
on disk\n-- of columns and foreign key indices, and possible temporary hash
indices.\n-- For strings we take a sample to determine their average
length.\n\ncreate function sys.\"s
torage\"()\nreturns table (\"schema\" string, \"table\" string, \"column\"
string, \"type\" string, \"mode\" string, location string, \"count\" bigint,
typewidth int, columnsize bigint, heapsize bigint, hashes bigint, phash
boolean, imprints bigint, sorted boolean, compress boolean)\nexternal name
sql.\"storage\";" ]
[ "sys", "storage", 1, "clob", "" ]
[ "sys", "storage", 2, "clob", "" ]
[ "sys", "storage", 3, "clob", "" ]
diff --git a/sql/test/leaks/Tests/check1.stable.out
b/sql/test/leaks/Tests/check1.stable.out
--- a/sql/test/leaks/Tests/check1.stable.out
+++ b/sql/test/leaks/Tests/check1.stable.out
@@ -82,9 +82,9 @@ Ready.
[ "int", 1 ]
[ "int", 3 ]
[ "int", 3 ]
-[ "int", 5 ]
-[ "int", 5 ]
-[ "int", 5 ]
+[ "int", 6 ]
+[ "int", 6 ]
+[ "int", 6 ]
[ "int", 12 ]
[ "int", 12 ]
[ "int", 12 ]
@@ -256,7 +256,7 @@ Ready.
[ "str", 1 ]
[ "str", 1 ]
[ "str", 3 ]
-[ "str", 5 ]
+[ "str", 6 ]
[ "str", 10 ]
[ "str", 12 ]
[ "str", 12 ]
diff --git a/sql/test/leaks/Tests/check1.stable.out.int128
b/sql/test/leaks/Tests/check1.stable.out.int128
--- a/sql/test/leaks/Tests/check1.stable.out.int128
+++ b/sql/test/leaks/Tests/check1.stable.out.int128
@@ -37,13 +37,13 @@ Ready.
[ "bit", 0 ]
[ "bit", 0 ]
[ "bit", 0 ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
