Changeset: 9aa0f8fd0959 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9aa0f8fd0959
Added Files:
monetdb5/optimizer/Tests/inline12.malC
monetdb5/optimizer/Tests/inline12.stable.err
monetdb5/optimizer/Tests/inline12.stable.out
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/SQL-dump.stable.out
clients/Tests/SQL-dump.stable.out.int128
gdk/gdk_logger.c
java/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
monetdb5/ChangeLog
monetdb5/mal/mal_function.c
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_instruction.h
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_namespace.c
monetdb5/mal/mal_resource.c
monetdb5/mal/mal_resource.h
monetdb5/modules/mal/querylog.c
monetdb5/optimizer/Tests/All
monetdb5/optimizer/Tests/JPexample.stable.out
monetdb5/optimizer/Tests/inline02.stable.out
monetdb5/optimizer/Tests/inline03.stable.out
monetdb5/optimizer/Tests/inline04.stable.out
monetdb5/optimizer/Tests/inline05.stable.out
monetdb5/optimizer/Tests/inline06.stable.out
monetdb5/optimizer/Tests/inline07.stable.out
monetdb5/optimizer/Tests/inline08.stable.out
monetdb5/optimizer/Tests/inline09.stable.out
monetdb5/optimizer/Tests/inline10.stable.out
monetdb5/optimizer/Tests/inlineCst.stable.out
monetdb5/optimizer/Tests/inlineIfthen.stable.out
monetdb5/optimizer/Tests/projectionchain.stable.out
monetdb5/optimizer/opt_inline.c
monetdb5/optimizer/opt_projectionpath.c
monetdb5/optimizer/opt_remap.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql.mal
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_upgrades.c
sql/benchmarks/ssbm/Tests/04-explain.stable.out
sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/05-explain.stable.out
sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/06-explain.stable.out
sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/07-explain.stable.out
sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/08-explain.stable.out
sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/09-explain.stable.out
sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/10-explain.stable.out
sql/benchmarks/ssbm/Tests/10-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/11-explain.stable.out
sql/benchmarks/ssbm/Tests/11-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/12-explain.stable.out
sql/benchmarks/ssbm/Tests/12-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/13-explain.stable.out
sql/benchmarks/ssbm/Tests/13-explain.stable.out.int128
sql/benchmarks/tpch/Tests/02-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out.int128
sql/benchmarks/tpch/Tests/05-explain.stable.out
sql/benchmarks/tpch/Tests/05-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/05-explain.stable.out.int128
sql/benchmarks/tpch/Tests/07-explain.stable.out
sql/benchmarks/tpch/Tests/07-explain.stable.out.int128
sql/benchmarks/tpch/Tests/08-explain.stable.out
sql/benchmarks/tpch/Tests/08-explain.stable.out.int128
sql/benchmarks/tpch/Tests/09-explain.stable.out
sql/benchmarks/tpch/Tests/09-explain.stable.out.int128
sql/benchmarks/tpch/Tests/10-explain.stable.out
sql/benchmarks/tpch/Tests/10-explain.stable.out.int128
sql/benchmarks/tpch/Tests/15-explain.stable.out
sql/benchmarks/tpch/Tests/15-explain.stable.out.int128
sql/benchmarks/tpch/Tests/16-explain.stable.out
sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/17-explain.stable.out
sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
sql/benchmarks/tpch/Tests/18-explain.stable.out.int128
sql/benchmarks/tpch/Tests/19-explain.stable.out.int128
sql/benchmarks/tpch/Tests/20-explain.stable.out.int128
sql/benchmarks/tpch/Tests/21-explain.stable.out
sql/benchmarks/tpch/Tests/22-explain.stable.out.int128
sql/jdbc/tests/Tests/Test_Dobjects.stable.out
sql/scripts/75_storagemodel.sql
sql/storage/store.c
sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
sql/test/BugTracker-2014/Tests/querylog.Bug-3607.sql
sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out
sql/test/BugTracker-2016/Tests/DISTINCT_with_correlated_scalar_subquery_crashes_mserver.Bug-3920.sql
sql/test/BugTracker-2016/Tests/DISTINCT_with_correlated_scalar_subquery_crashes_mserver.Bug-3920.stable.out
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
sql/test/leaks/Tests/check1.stable.out.int128
sql/test/leaks/Tests/check2.stable.out.int128
sql/test/leaks/Tests/check3.stable.out.int128
sql/test/leaks/Tests/check4.stable.out.int128
sql/test/leaks/Tests/check5.stable.out.int128
Branch: embedded
Log Message:
merge with default
diffs (truncated from 5547 to 300 lines):
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -40470,6 +40470,18 @@ pattern sql.sysmon_pause(tag:sht):void
address SYSMONpause;
pattern sql.sysmon_queue()
(qtag:bat[:lng],user:bat[:str],started:bat[:timestamp],estimate:bat[:timestamp],progress:bat[:int],status:bat[:str],tag:bat[:oid],query:bat[:str])
address SYSMONqueue;
+pattern sql.storage(sname:str,tname:str,cname:str)
(schema:bat[:str],table:bat[:str],column:bat[:str],type:bat[:str],mode:bat[:str],location:bat[:str],count:bat[:lng],atomwidth:bat[:int],columnsize:bat[:lng],heap:bat[:lng],hashes:bat[:lng],phash:bat[:bit],imprints:bat[:lng],sorted:bat[:bit])
+address sql_storage;
+comment return a table with storage information for a particular column
+
+pattern sql.storage(sname:str,tname:str)
(schema:bat[:str],table:bat[:str],column:bat[:str],type:bat[:str],mode:bat[:str],location:bat[:str],count:bat[:lng],atomwidth:bat[:int],columnsize:bat[:lng],heap:bat[:lng],hashes:bat[:lng],phash:bat[:bit],imprints:bat[:lng],sorted:bat[:bit])
+address sql_storage;
+comment return a table with storage information for a particular table
+
+pattern sql.storage(sname:str)
(schema:bat[:str],table:bat[:str],column:bat[:str],type:bat[:str],mode:bat[:str],location:bat[:str],count:bat[:lng],atomwidth:bat[:int],columnsize:bat[:lng],heap:bat[:lng],hashes:bat[:lng],phash:bat[:bit],imprints:bat[:lng],sorted:bat[:bit])
+address sql_storage;
+comment return a table with storage information for a particular schema
+
pattern sql.storage()
(schema:bat[:str],table:bat[:str],column:bat[:str],type:bat[:str],mode:bat[:str],location:bat[:str],count:bat[:lng],atomwidth:bat[:int],columnsize:bat[:lng],heap:bat[:lng],hashes:bat[:lng],phash:bat[:bit],imprints:bat[:lng],sorted:bat[:bit])
address sql_storage;
comment return a table with storage information
diff --git a/clients/Tests/MAL-signatures.stable.out.int128
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -51337,6 +51337,18 @@ pattern sql.sysmon_pause(tag:sht):void
address SYSMONpause;
pattern sql.sysmon_queue()
(qtag:bat[:lng],user:bat[:str],started:bat[:timestamp],estimate:bat[:timestamp],progress:bat[:int],status:bat[:str],tag:bat[:oid],query:bat[:str])
address SYSMONqueue;
+pattern sql.storage(sname:str,tname:str,cname:str)
(schema:bat[:str],table:bat[:str],column:bat[:str],type:bat[:str],mode:bat[:str],location:bat[:str],count:bat[:lng],atomwidth:bat[:int],columnsize:bat[:lng],heap:bat[:lng],hashes:bat[:lng],phash:bat[:bit],imprints:bat[:lng],sorted:bat[:bit])
+address sql_storage;
+comment return a table with storage information for a particular column
+
+pattern sql.storage(sname:str,tname:str)
(schema:bat[:str],table:bat[:str],column:bat[:str],type:bat[:str],mode:bat[:str],location:bat[:str],count:bat[:lng],atomwidth:bat[:int],columnsize:bat[:lng],heap:bat[:lng],hashes:bat[:lng],phash:bat[:bit],imprints:bat[:lng],sorted:bat[:bit])
+address sql_storage;
+comment return a table with storage information for a particular table
+
+pattern sql.storage(sname:str)
(schema:bat[:str],table:bat[:str],column:bat[:str],type:bat[:str],mode:bat[:str],location:bat[:str],count:bat[:lng],atomwidth:bat[:int],columnsize:bat[:lng],heap:bat[:lng],hashes:bat[:lng],phash:bat[:bit],imprints:bat[:lng],sorted:bat[:bit])
+address sql_storage;
+comment return a table with storage information for a particular schema
+
pattern sql.storage()
(schema:bat[:str],table:bat[:str],column:bat[:str],type:bat[:str],mode:bat[:str],location:bat[:str],count:bat[:lng],atomwidth:bat[:int],columnsize:bat[:lng],heap:bat[:lng],hashes:bat[:lng],phash:bat[:bit],imprints:bat[:lng],sorted:bat[:bit])
address sql_storage;
comment return a table with storage information
diff --git a/clients/Tests/SQL-dump.stable.out
b/clients/Tests/SQL-dump.stable.out
--- a/clients/Tests/SQL-dump.stable.out
+++ b/clients/Tests/SQL-dump.stable.out
@@ -1022,6 +1022,60 @@ returns table (
sorted boolean
)
external name sql."storage";
+create function sys."storage"( sname string)
+returns 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
+)
+external name sql."storage";
+create function sys."storage"( sname string, tname string)
+returns 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
+)
+external name sql."storage";
+create function sys."storage"( sname string, tname string, cname string)
+returns 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
+)
+external name sql."storage";
create function sys.storagemodel()
returns table (
"schema" string,
diff --git a/clients/Tests/SQL-dump.stable.out.int128
b/clients/Tests/SQL-dump.stable.out.int128
--- a/clients/Tests/SQL-dump.stable.out.int128
+++ b/clients/Tests/SQL-dump.stable.out.int128
@@ -1036,6 +1036,60 @@ returns table (
sorted boolean
)
external name sql."storage";
+create function sys."storage"( sname string)
+returns 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
+)
+external name sql."storage";
+create function sys."storage"( sname string, tname string)
+returns 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
+)
+external name sql."storage";
+create function sys."storage"( sname string, tname string, cname string)
+returns 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
+)
+external name sql."storage";
create function sys.storagemodel()
returns table (
"schema" string,
@@ -1464,89 +1518,89 @@ 7088 "hashes" "bigint" 64 0
7092 NULL tr
7089 "phash" "boolean" 1 0 7092 NULL true 11
NULL
7090 "imprints" "bigint" 64 0 7092 NULL true
12 NULL
7091 "sorted" "boolean" 1 0 7092 NULL true
13 NULL
-7094 "schema" "clob" 0 0 7104 NULL true 0
NULL
-7095 "table" "clob" 0 0 7104 NULL true 1 NULL
-7096 "column" "clob" 0 0 7104 NULL true 2
NULL
-7097 "type" "clob" 0 0 7104 NULL true 3 NULL
-7098 "typewidth" "int" 32 0 7104 NULL true 4
NULL
-7099 "count" "bigint" 64 0 7104 NULL true 5
NULL
-7100 "distinct" "bigint" 64 0 7104 NULL true
6 NULL
-7101 "atomwidth" "int" 32 0 7104 NULL true 7
NULL
-7102 "reference" "boolean" 1 0 7104 NULL true
8 NULL
-7103 "sorted" "boolean" 1 0 7104 NULL true
9 NULL
-7142 "schema" "clob" 0 0 7152 NULL true 0
NULL
-7143 "table" "clob" 0 0 7152 NULL true 1 NULL
-7144 "column" "clob" 0 0 7152 NULL true 2
NULL
-7145 "type" "clob" 0 0 7152 NULL true 3 NULL
-7146 "count" "bigint" 64 0 7152 NULL true 4
NULL
-7147 "columnsize" "bigint" 64 0 7152 NULL true
5 NULL
-7148 "heapsize" "bigint" 64 0 7152 NULL true
6 NULL
-7149 "hashes" "bigint" 64 0 7152 NULL true
7 NULL
-7150 "imprints" "bigint" 64 0 7152 NULL true
8 NULL
-7151 "sorted" "boolean" 1 0 7152 NULL true
9 NULL
-7154 "schema" "clob" 0 0 7162 NULL true 0
NULL
-7155 "table" "clob" 0 0 7162 NULL true 1 NULL
-7156 "count" "bigint" 64 0 7162 NULL true 2
NULL
-7157 "columnsize" "hugeint" 128 0 7162 NULL true
3 NULL
-7158 "heapsize" "hugeint" 128 0 7162 NULL true
4 NULL
-7159 "hashes" "hugeint" 128 0 7162 NULL true
5 NULL
-7160 "imprints" "hugeint" 128 0 7162 NULL true
6 NULL
-7161 "auxiliary" "hugeint" 128 0 7162 NULL true
7 NULL
-7164 "column_id" "int" 32 0 7175 NULL true 0
NULL
-7165 "type" "clob" 0 0 7175 NULL true 1 NULL
-7166 "width" "int" 32 0 7175 NULL true 2 NULL
-7167 "stamp" "timestamp" 7 0 7175 NULL true 3
NULL
-7168 "sample" "bigint" 64 0 7175 NULL true
4 NULL
-7169 "count" "bigint" 64 0 7175 NULL true 5
NULL
-7170 "unique" "bigint" 64 0 7175 NULL true
6 NULL
-7171 "nils" "bigint" 64 0 7175 NULL true 7
NULL
-7172 "minval" "clob" 0 0 7175 NULL true 8
NULL
-7173 "maxval" "clob" 0 0 7175 NULL true 9
NULL
-7174 "sorted" "boolean" 1 0 7175 NULL true
10 NULL
-7270 "file_id" "bigint" 64 0 7278 NULL false
0 NULL
-7271 "file_location" "clob" 0 0 7278 NULL false 1
NULL
-7272 "dbschema" "smallint" 16 0 7278 NULL false
2 NULL
-7273 "format_version" "varchar" 7 0 7278 NULL
true 3 NULL
-7274 "sorting_order" "varchar" 10 0 7278 NULL true
4 NULL
-7275 "comments" "clob" 0 0 7278 NULL true 5
NULL
-7280 "sn" "clob" 0 0 7291 NULL false 0 NULL
-7281 "file_id" "bigint" 64 0 7291 NULL false
1 NULL
-7282 "ln" "int" 32 0 7291 NULL true 2 NULL
-7283 "as" "int" 32 0 7291 NULL true 3 NULL
-7284 "m5" "clob" 0 0 7291 NULL true 4 NULL
-7285 "sp" "clob" 0 0 7291 NULL true 5 NULL
-7286 "ur" "clob" 0 0 7291 NULL true 6 NULL
-7293 "id" "clob" 0 0 7310 NULL false 0 NULL
-7294 "file_id" "bigint" 64 0 7310 NULL false
1 NULL
-7295 "cn" "clob" 0 0 7310 NULL true 2 NULL
-7296 "ds" "clob" 0 0 7310 NULL true 3 NULL
-7297 "dt" "timestamp" 7 0 7310 NULL true 4
NULL
-7298 "fo" "clob" 0 0 7310 NULL true 5 NULL
-7299 "ks" "clob" 0 0 7310 NULL true 6 NULL
-7300 "lb" "clob" 0 0 7310 NULL true 7 NULL
-7301 "pg" "clob" 0 0 7310 NULL true 8 NULL
-7302 "pi" "int" 32 0 7310 NULL true 9 NULL
-7303 "pl" "clob" 0 0 7310 NULL true 10 NULL
-7304 "pu" "clob" 0 0 7310 NULL true 11 NULL
-7305 "sm" "clob" 0 0 7310 NULL true 12 NULL
-7312 "id" "clob" 0 0 7322 NULL false 0 NULL
-7313 "file_id" "bigint" 64 0 7322 NULL false
1 NULL
-7314 "pn" "clob" 0 0 7322 NULL true 2 NULL
-7315 "cl" "clob" 0 0 7322 NULL true 3 NULL
-7316 "pp" "clob" 0 0 7322 NULL true 4 NULL
-7317 "vn" "clob" 0 0 7322 NULL true 5 NULL
-7324 "qname" "clob" 0 0 7335 NULL false 0 NULL
-7325 "flag" "smallint" 16 0 7335 NULL false 1
NULL
-7326 "rname" "clob" 0 0 7335 NULL false 2 NULL
-7327 "pos" "int" 32 0 7335 NULL false 3 NULL
-7328 "mapq" "smallint" 16 0 7335 NULL false 4
NULL
-7329 "cigar" "clob" 0 0 7335 NULL false 5 NULL
-7330 "rnext" "clob" 0 0 7335 NULL false 6 NULL
-7331 "pnext" "int" 32 0 7335 NULL false 7 NULL
-7332 "tlen" "int" 32 0 7335 NULL false 8 NULL
-7333 "seq" "clob" 0 0 7335 NULL false 9 NULL
-7334 "qual" "clob" 0 0 7335 NULL false 10 NULL
-7416 "function_id" "int" 32 0 7417 NULL true 0
NULL
+7148 "schema" "clob" 0 0 7158 NULL true 0
NULL
+7149 "table" "clob" 0 0 7158 NULL true 1 NULL
+7150 "column" "clob" 0 0 7158 NULL true 2
NULL
+7151 "type" "clob" 0 0 7158 NULL true 3 NULL
+7152 "typewidth" "int" 32 0 7158 NULL true 4
NULL
+7153 "count" "bigint" 64 0 7158 NULL true 5
NULL
+7154 "distinct" "bigint" 64 0 7158 NULL true
6 NULL
+7155 "atomwidth" "int" 32 0 7158 NULL true 7
NULL
+7156 "reference" "boolean" 1 0 7158 NULL true
8 NULL
+7157 "sorted" "boolean" 1 0 7158 NULL true
9 NULL
+7196 "schema" "clob" 0 0 7206 NULL true 0
NULL
+7197 "table" "clob" 0 0 7206 NULL true 1 NULL
+7198 "column" "clob" 0 0 7206 NULL true 2
NULL
+7199 "type" "clob" 0 0 7206 NULL true 3 NULL
+7200 "count" "bigint" 64 0 7206 NULL true 4
NULL
+7201 "columnsize" "bigint" 64 0 7206 NULL true
5 NULL
+7202 "heapsize" "bigint" 64 0 7206 NULL true
6 NULL
+7203 "hashes" "bigint" 64 0 7206 NULL true
7 NULL
+7204 "imprints" "bigint" 64 0 7206 NULL true
8 NULL
+7205 "sorted" "boolean" 1 0 7206 NULL true
9 NULL
+7208 "schema" "clob" 0 0 7216 NULL true 0
NULL
+7209 "table" "clob" 0 0 7216 NULL true 1 NULL
+7210 "count" "bigint" 64 0 7216 NULL true 2
NULL
+7211 "columnsize" "hugeint" 128 0 7216 NULL true
3 NULL
+7212 "heapsize" "hugeint" 128 0 7216 NULL true
4 NULL
+7213 "hashes" "hugeint" 128 0 7216 NULL true
5 NULL
+7214 "imprints" "hugeint" 128 0 7216 NULL true
6 NULL
+7215 "auxiliary" "hugeint" 128 0 7216 NULL true
7 NULL
+7218 "column_id" "int" 32 0 7229 NULL true 0
NULL
+7219 "type" "clob" 0 0 7229 NULL true 1 NULL
+7220 "width" "int" 32 0 7229 NULL true 2 NULL
+7221 "stamp" "timestamp" 7 0 7229 NULL true 3
NULL
+7222 "sample" "bigint" 64 0 7229 NULL true
4 NULL
+7223 "count" "bigint" 64 0 7229 NULL true 5
NULL
+7224 "unique" "bigint" 64 0 7229 NULL true
6 NULL
+7225 "nils" "bigint" 64 0 7229 NULL true 7
NULL
+7226 "minval" "clob" 0 0 7229 NULL true 8
NULL
+7227 "maxval" "clob" 0 0 7229 NULL true 9
NULL
+7228 "sorted" "boolean" 1 0 7229 NULL true
10 NULL
+7324 "file_id" "bigint" 64 0 7332 NULL false
0 NULL
+7325 "file_location" "clob" 0 0 7332 NULL false 1
NULL
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
