Changeset: 6bbe0bdea1df for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6bbe0bdea1df
Modified Files:
sql/jdbc/tests/Tests/Test_Dobjects.stable.out
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
Branch: mosaic
Log Message:
Approve output
diffs (187 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
@@ -61,6 +61,7 @@ Resultset with 3 columns
TABLE_SCHEM TABLE_CATALOG TABLE_CAT
bam mTests_sql_jdbc_tests mTests_sql_jdbc_tests
json mTests_sql_jdbc_tests mTests_sql_jdbc_tests
+mosaic mTests_sql_jdbc_tests mTests_sql_jdbc_tests
sys mTests_sql_jdbc_tests mTests_sql_jdbc_tests
tmp mTests_sql_jdbc_tests mTests_sql_jdbc_tests
Resultset with 3 columns
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
@@ -58,7 +58,7 @@ Ready.
% sys.L3, sys.L3, sys.L3, sys.L3, sys.L3 # table_name
% schema, function, argno, argtype, definition # name
% varchar, varchar, int, varchar, varchar # type
-% 4, 35, 2, 15, 1328 # length
+% 6, 35, 2, 15, 1328 # length
[ "bam", "bam_drop_file", 0, "bigint", "create
procedure bam.bam_drop_file(file_id bigint, dbschema smallint)\nexternal name
bam.bam_drop_file;" ]
[ "bam", "bam_drop_file", 1, "smallint", "" ]
[ "bam", "bam_export", 0, "clob", "create procedure
bam.bam_export(output_path string)\nexternal name bam.bam_export;" ]
@@ -129,6 +129,36 @@ 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) external name sql.\"mosaicAnalysis\";"
]
+[ "mosaic", "analysis", 1, "bigint", "" ]
+[ "mosaic", "analysis", 2, "double", "" ]
+[ "mosaic", "analysis", 3, "clob", "" ]
+[ "mosaic", "analysis", 4, "clob", "" ]
+[ "mosaic", "analysis", 5, "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) external name sql.\"mosaicAnalysis\";" ]
+[ "mosaic", "analysis", 1, "bigint", "" ]
+[ "mosaic", "analysis", 2, "double", "" ]
+[ "mosaic", "analysis", 3, "clob", "" ]
+[ "mosaic", "analysis", 4, "clob", "" ]
+[ "mosaic", "analysis", 5, "clob", "" ]
+[ "mosaic", "analysis", 6, "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", "" ]
[ "sys", "Intersect", 0, "boolean", "create function
\"Intersect\"(a geometry, b geometry) returns boolean external name
geom.\"Intersect\";" ]
[ "sys", "Intersect", 1, "geometry", "" ]
[ "sys", "Intersect", 2, "geometry", "" ]
@@ -140,16 +170,16 @@ Ready.
[ "sys", "alpha", 0, "double", "create function
alpha(pdec double, pradius double)\nreturns double external name sql.alpha;" ]
[ "sys", "alpha", 1, "double", "" ]
[ "sys", "alpha", 2, "double", "" ]
-[ "sys", "analyze", 0, "int", "create procedure
analyze(minmax int, \"sample\" bigint)\nexternal name sql.analyze;" ]
+[ "sys", "analyze", 0, "int", "create procedure
sys.analyze(minmax int, \"sample\" bigint)\nexternal name sql.analyze;" ]
[ "sys", "analyze", 1, "bigint", "" ]
-[ "sys", "analyze", 0, "int", "create procedure
analyze(minmax int, \"sample\" bigint, sch string)\nexternal name sql.analyze;"
]
+[ "sys", "analyze", 0, "int", "create procedure
sys.analyze(minmax int, \"sample\" bigint, sch string)\nexternal name
sql.analyze;" ]
[ "sys", "analyze", 1, "bigint", "" ]
[ "sys", "analyze", 2, "clob", "" ]
-[ "sys", "analyze", 0, "int", "create procedure
analyze(minmax int, \"sample\" bigint, sch string, tbl string)\nexternal name
sql.analyze;" ]
+[ "sys", "analyze", 0, "int", "create procedure
sys.analyze(minmax int, \"sample\" bigint, sch string, tbl string)\nexternal
name sql.analyze;" ]
[ "sys", "analyze", 1, "bigint", "" ]
[ "sys", "analyze", 2, "clob", "" ]
[ "sys", "analyze", 3, "clob", "" ]
-[ "sys", "analyze", 0, "int", "create procedure
analyze(minmax int, \"sample\" bigint, sch string, tbl string, col
string)\nexternal name sql.analyze;" ]
+[ "sys", "analyze", 0, "int", "create procedure
sys.analyze(minmax int, \"sample\" bigint, sch string, tbl string, col
string)\nexternal name sql.analyze;" ]
[ "sys", "analyze", 1, "bigint", "" ]
[ "sys", "analyze", 2, "clob", "" ]
[ "sys", "analyze", 3, "clob", "" ]
@@ -290,13 +320,13 @@ Ready.
[ "sys", "envelope", 1, "geometry", "" ]
[ "sys", "environment", 0, "clob", "-- The environment
table\ncreate function sys.environment()\n\treturns table (\"name\" string,
value string)\n\texternal name sql.sql_environment;" ]
[ "sys", "environment", 1, "clob", "" ]
-[ "sys", "epoch", 0, "timestamp", "-- 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 2008-2015 MonetDB B.V.\n\n--
assume milliseconds when converted to TIMESTAMP\ncreate function \"epoch\"(sec
bigint) returns timestamp\n\texternal name timestamp.\"epoch\";" ]
+[ "sys", "epoch", 0, "timestamp", "-- 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 2008-2015 MonetDB B.V.\n\n--
assume milliseconds when converted to TIMESTAMP\ncreate function
sys.\"epoch\"(sec bigint) returns timestamp\n\texternal name
timestamp.\"epoch\";" ]
[ "sys", "epoch", 1, "bigint", "" ]
-[ "sys", "epoch", 0, "timestamp", "create function
\"epoch\"(sec int) returns timestamp\n\texternal name timestamp.\"epoch\";" ]
+[ "sys", "epoch", 0, "timestamp", "create function
sys.\"epoch\"(sec int) returns timestamp\n\texternal name timestamp.\"epoch\";"
]
[ "sys", "epoch", 1, "int", "" ]
-[ "sys", "epoch", 0, "int", "create function \"epoch\"(ts
timestamp) returns int\n\texternal name timestamp.\"epoch\";" ]
+[ "sys", "epoch", 0, "int", "create function
sys.\"epoch\"(ts timestamp) returns int\n\texternal name timestamp.\"epoch\";" ]
[ "sys", "epoch", 1, "timestamp", "" ]
-[ "sys", "epoch", 0, "int", "create function \"epoch\"(ts
timestamp with time zone) returns int\n\texternal name timestamp.\"epoch\";"
]
+[ "sys", "epoch", 0, "int", "create function
sys.\"epoch\"(ts timestamp with time zone) returns int\n\texternal name
timestamp.\"epoch\";" ]
[ "sys", "epoch", 1, "timestamptz", "" ]
[ "sys", "equals", 0, "boolean", "-- ogc spatial
relation methods\ncreate function equals(a geometry, b geometry) returns
boolean external name geom.\"Equals\";" ]
[ "sys", "equals", 1, "geometry", "" ]
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
@@ -58,7 +58,7 @@ Ready.
% sys.L3, sys.L3, sys.L3, sys.L3, sys.L3 # table_name
% schema, function, argno, argtype, definition # name
% varchar, varchar, int, varchar, varchar # type
-% 4, 35, 2, 15, 1328 # length
+% 6, 35, 2, 15, 1328 # length
[ "bam", "bam_drop_file", 0, "bigint", "create
procedure bam.bam_drop_file(file_id bigint, dbschema smallint)\nexternal name
bam.bam_drop_file;" ]
[ "bam", "bam_drop_file", 1, "smallint", "" ]
[ "bam", "bam_export", 0, "clob", "create procedure
bam.bam_export(output_path string)\nexternal name bam.bam_export;" ]
@@ -132,6 +132,36 @@ 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) external name sql.\"mosaicAnalysis\";"
]
+[ "mosaic", "analysis", 1, "bigint", "" ]
+[ "mosaic", "analysis", 2, "double", "" ]
+[ "mosaic", "analysis", 3, "clob", "" ]
+[ "mosaic", "analysis", 4, "clob", "" ]
+[ "mosaic", "analysis", 5, "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) external name sql.\"mosaicAnalysis\";" ]
+[ "mosaic", "analysis", 1, "bigint", "" ]
+[ "mosaic", "analysis", 2, "double", "" ]
+[ "mosaic", "analysis", 3, "clob", "" ]
+[ "mosaic", "analysis", 4, "clob", "" ]
+[ "mosaic", "analysis", 5, "clob", "" ]
+[ "mosaic", "analysis", 6, "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", "" ]
[ "sys", "Intersect", 0, "boolean", "create function
\"Intersect\"(a geometry, b geometry) returns boolean external name
geom.\"Intersect\";" ]
[ "sys", "Intersect", 1, "geometry", "" ]
[ "sys", "Intersect", 2, "geometry", "" ]
@@ -143,16 +173,16 @@ Ready.
[ "sys", "alpha", 0, "double", "create function
alpha(pdec double, pradius double)\nreturns double external name sql.alpha;" ]
[ "sys", "alpha", 1, "double", "" ]
[ "sys", "alpha", 2, "double", "" ]
-[ "sys", "analyze", 0, "int", "create procedure
analyze(minmax int, \"sample\" bigint)\nexternal name sql.analyze;" ]
+[ "sys", "analyze", 0, "int", "create procedure
sys.analyze(minmax int, \"sample\" bigint)\nexternal name sql.analyze;" ]
[ "sys", "analyze", 1, "bigint", "" ]
-[ "sys", "analyze", 0, "int", "create procedure
analyze(minmax int, \"sample\" bigint, sch string)\nexternal name sql.analyze;"
]
+[ "sys", "analyze", 0, "int", "create procedure
sys.analyze(minmax int, \"sample\" bigint, sch string)\nexternal name
sql.analyze;" ]
[ "sys", "analyze", 1, "bigint", "" ]
[ "sys", "analyze", 2, "clob", "" ]
-[ "sys", "analyze", 0, "int", "create procedure
analyze(minmax int, \"sample\" bigint, sch string, tbl string)\nexternal name
sql.analyze;" ]
+[ "sys", "analyze", 0, "int", "create procedure
sys.analyze(minmax int, \"sample\" bigint, sch string, tbl string)\nexternal
name sql.analyze;" ]
[ "sys", "analyze", 1, "bigint", "" ]
[ "sys", "analyze", 2, "clob", "" ]
[ "sys", "analyze", 3, "clob", "" ]
-[ "sys", "analyze", 0, "int", "create procedure
analyze(minmax int, \"sample\" bigint, sch string, tbl string, col
string)\nexternal name sql.analyze;" ]
+[ "sys", "analyze", 0, "int", "create procedure
sys.analyze(minmax int, \"sample\" bigint, sch string, tbl string, col
string)\nexternal name sql.analyze;" ]
[ "sys", "analyze", 1, "bigint", "" ]
[ "sys", "analyze", 2, "clob", "" ]
[ "sys", "analyze", 3, "clob", "" ]
@@ -296,13 +326,13 @@ Ready.
[ "sys", "envelope", 1, "geometry", "" ]
[ "sys", "environment", 0, "clob", "-- The environment
table\ncreate function sys.environment()\n\treturns table (\"name\" string,
value string)\n\texternal name sql.sql_environment;" ]
[ "sys", "environment", 1, "clob", "" ]
-[ "sys", "epoch", 0, "timestamp", "-- 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 2008-2015 MonetDB B.V.\n\n--
assume milliseconds when converted to TIMESTAMP\ncreate function \"epoch\"(sec
bigint) returns timestamp\n\texternal name timestamp.\"epoch\";" ]
+[ "sys", "epoch", 0, "timestamp", "-- 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 2008-2015 MonetDB B.V.\n\n--
assume milliseconds when converted to TIMESTAMP\ncreate function
sys.\"epoch\"(sec bigint) returns timestamp\n\texternal name
timestamp.\"epoch\";" ]
[ "sys", "epoch", 1, "bigint", "" ]
-[ "sys", "epoch", 0, "timestamp", "create function
\"epoch\"(sec int) returns timestamp\n\texternal name timestamp.\"epoch\";" ]
+[ "sys", "epoch", 0, "timestamp", "create function
sys.\"epoch\"(sec int) returns timestamp\n\texternal name timestamp.\"epoch\";"
]
[ "sys", "epoch", 1, "int", "" ]
-[ "sys", "epoch", 0, "int", "create function \"epoch\"(ts
timestamp) returns int\n\texternal name timestamp.\"epoch\";" ]
+[ "sys", "epoch", 0, "int", "create function
sys.\"epoch\"(ts timestamp) returns int\n\texternal name timestamp.\"epoch\";" ]
[ "sys", "epoch", 1, "timestamp", "" ]
-[ "sys", "epoch", 0, "int", "create function \"epoch\"(ts
timestamp with time zone) returns int\n\texternal name timestamp.\"epoch\";"
]
+[ "sys", "epoch", 0, "int", "create function
sys.\"epoch\"(ts timestamp with time zone) returns int\n\texternal name
timestamp.\"epoch\";" ]
[ "sys", "epoch", 1, "timestamptz", "" ]
[ "sys", "equals", 0, "boolean", "-- ogc spatial
relation methods\ncreate function equals(a geometry, b geometry) returns
boolean external name geom.\"Equals\";" ]
[ "sys", "equals", 1, "geometry", "" ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
