Changeset: d05657de1b57 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d05657de1b57
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
sql/backends/monet5/sql.mal
sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out
sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out.Windows
sql/test/BugTracker-2015/Tests/alter-table.Bug-3828-part1.sql
sql/test/BugTracker-2016/Tests/storagemodel.stable.out
sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Darwin
sql/test/BugTracker-2016/Tests/storagemodel.stable.out.FreeBSD
sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Windows
sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_in_select.Bug-6254.stable.out
sql/test/BugTracker-2017/Tests/spurious_error.Bug-6344.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out.int128
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/pg_regress/Tests/float8.stable.err.int128
sql/test/pg_regress/Tests/timetz.stable.err
sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out
Branch: mosaic
Log Message:
Fix MAL signature for storage()
diffs (truncated from 925 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
@@ -60,7 +60,7 @@ Ready.
% .L1, .L1, .L1, .L1, .L1 # table_name
% module, function, signature, address, comment # name
% clob, clob, clob, clob, clob # type
-% 11, 28, 364, 44, 874 # length
+% 11, 28, 386, 44, 874 # length
[ "aggr", "avg", "command aggr.avg(b:bat[:bte], g:bat[:oid],
e:bat[:any_1]):bat[:dbl] ", "AGGRavg13_dbl;", "Grouped tail average on
bte" ]
[ "aggr", "avg", "command aggr.avg(b:bat[:dbl], g:bat[:oid],
e:bat[:any_1]):bat[:dbl] ", "AGGRavg13_dbl;", "Grouped tail average on
dbl" ]
[ "aggr", "avg", "command aggr.avg(b:bat[:flt], g:bat[:oid],
e:bat[:any_1]):bat[:dbl] ", "AGGRavg13_dbl;", "Grouped tail average on
flt" ]
@@ -8498,10 +8498,10 @@ Ready.
[ "sql", "sql_variables", "pattern sql.sql_variables():bat[:str]
", "sql_variables;", "return the table with session variables"
]
[ "sql", "start", "pattern sql.start():void ", "SQLsession;",
"Switch to processing SQL statements" ]
[ "sql", "start2", "pattern sql.start2():void ", "SQLsession2;",
"Switch to processing precompiled sql statements" ]
-[ "sql", "storage", "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], revsorted:bat[:bit], key:bat[:bit], orderidx:bat[:lng]) ",
"sql_storage;", "return a table with storage information " ]
-[ "sql", "storage", "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], revsorted:bat[:bit], key:bat[:bit],
orderidx:bat[:lng]) ", "sql_storage;", "return a table with storage
information for a particular schema " ]
-[ "sql", "storage", "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], revsorted:bat[:bit], key:bat[:bit],
orderidx:bat[:lng]) ", "sql_storage;", "return a table with storage
information for a particular table" ]
-[ "sql", "storage", "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], revsorted:bat[:bit],
key:bat[:bit], orderidx:bat[:lng]) ", "sql_storage;", "return a table with
storage information for a particular column" ]
+[ "sql", "storage", "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], revsorted:bat[:bit], key:bat[:bit], orderidx:bat[:lng],
compressed:bat[:bit]) ", "sql_storage;", "return a table with storage
information " ]
+[ "sql", "storage", "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], revsorted:bat[:bit], key:bat[:bit],
orderidx:bat[:lng], compressed:bat[:bit]) ", "sql_storage;", "return a table
with storage information for a particular schema " ]
+[ "sql", "storage", "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], revsorted:bat[:bit], key:bat[:bit],
orderidx:bat[:lng], compressed:bat[:bit]) ", "sql_storage;", "return a
table with storage information for a particular table" ]
+[ "sql", "storage", "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], revsorted:bat[:bit],
key:bat[:bit], orderidx:bat[:lng], compressed:bat[:bit]) ", "sql_storage;",
"return a table with storage information for a particular column" ]
[ "sql", "subdelta", "command sql.subdelta(col:bat[:oid],
cand:bat[:oid], uid:bat[:oid], uval:bat[:oid]):bat[:oid] ",
"DELTAsub2;", "Return a single bat of selected delta." ]
[ "sql", "subdelta", "command sql.subdelta(col:bat[:oid],
cand:bat[:oid], uid:bat[:oid], uval:bat[:oid], ins:bat[:oid]):bat[:oid] ",
"DELTAsub;", "Return a single bat of selected delta." ]
[ "sql", "subzero_or_one", "inline function
sql.subzero_or_one(b:bat[:any_1], gp:bat[:oid], gpe:bat[:oid],
no_nil:bit):bat[:any_1];", "", "" ]
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
@@ -64,7 +64,7 @@ Ready.
% .L1, .L1, .L1, .L1, .L1 # table_name
% module, function, signature, address, comment # name
% clob, clob, clob, clob, clob # type
-% 11, 28, 364, 44, 874 # length
+% 11, 28, 386, 44, 874 # length
[ "aggr", "avg", "command aggr.avg(b:bat[:bte], g:bat[:oid],
e:bat[:any_1]):bat[:dbl] ", "AGGRavg13_dbl;", "Grouped tail average on
bte" ]
[ "aggr", "avg", "command aggr.avg(b:bat[:dbl], g:bat[:oid],
e:bat[:any_1]):bat[:dbl] ", "AGGRavg13_dbl;", "Grouped tail average on
dbl" ]
[ "aggr", "avg", "command aggr.avg(b:bat[:flt], g:bat[:oid],
e:bat[:any_1]):bat[:dbl] ", "AGGRavg13_dbl;", "Grouped tail average on
flt" ]
@@ -10862,10 +10862,10 @@ Ready.
[ "sql", "sql_variables", "pattern sql.sql_variables():bat[:str]
", "sql_variables;", "return the table with session variables"
]
[ "sql", "start", "pattern sql.start():void ", "SQLsession;",
"Switch to processing SQL statements" ]
[ "sql", "start2", "pattern sql.start2():void ", "SQLsession2;",
"Switch to processing precompiled sql statements" ]
-[ "sql", "storage", "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], revsorted:bat[:bit], key:bat[:bit], orderidx:bat[:lng]) ",
"sql_storage;", "return a table with storage information " ]
-[ "sql", "storage", "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], revsorted:bat[:bit], key:bat[:bit],
orderidx:bat[:lng]) ", "sql_storage;", "return a table with storage
information for a particular schema " ]
-[ "sql", "storage", "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], revsorted:bat[:bit], key:bat[:bit],
orderidx:bat[:lng]) ", "sql_storage;", "return a table with storage
information for a particular table" ]
-[ "sql", "storage", "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], revsorted:bat[:bit],
key:bat[:bit], orderidx:bat[:lng]) ", "sql_storage;", "return a table with
storage information for a particular column" ]
+[ "sql", "storage", "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], revsorted:bat[:bit], key:bat[:bit], orderidx:bat[:lng],
compressed:bat[:bit]) ", "sql_storage;", "return a table with storage
information " ]
+[ "sql", "storage", "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], revsorted:bat[:bit], key:bat[:bit],
orderidx:bat[:lng], compressed:bat[:bit]) ", "sql_storage;", "return a table
with storage information for a particular schema " ]
+[ "sql", "storage", "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], revsorted:bat[:bit], key:bat[:bit],
orderidx:bat[:lng], compressed:bat[:bit]) ", "sql_storage;", "return a
table with storage information for a particular table" ]
+[ "sql", "storage", "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], revsorted:bat[:bit],
key:bat[:bit], orderidx:bat[:lng], compressed:bat[:bit]) ", "sql_storage;",
"return a table with storage information for a particular column" ]
[ "sql", "subdelta", "command sql.subdelta(col:bat[:oid],
cand:bat[:oid], uid:bat[:oid], uval:bat[:oid]):bat[:oid] ",
"DELTAsub2;", "Return a single bat of selected delta." ]
[ "sql", "subdelta", "command sql.subdelta(col:bat[:oid],
cand:bat[:oid], uid:bat[:oid], uval:bat[:oid], ins:bat[:oid]):bat[:oid] ",
"DELTAsub;", "Return a single bat of selected delta." ]
[ "sql", "subzero_or_one", "inline function
sql.subzero_or_one(b:bat[:any_1], gp:bat[:oid], gpe:bat[:oid],
no_nil:bit):bat[:any_1];", "", "" ]
diff --git a/sql/backends/monet5/sql.mal b/sql/backends/monet5/sql.mal
--- a/sql/backends/monet5/sql.mal
+++ b/sql/backends/monet5/sql.mal
@@ -433,7 +433,8 @@ pattern storage()(
sorted:bat[:bit],
revsorted:bat[:bit],
key:bat[:bit],
- orderidx:bat[:lng])
+ orderidx:bat[:lng],
+ compressed:bat[:bit])
address sql_storage
comment "return a table with storage information ";
@@ -454,7 +455,8 @@ pattern storage(sname:str)(
sorted:bat[:bit],
revsorted:bat[:bit],
key:bat[:bit],
- orderidx:bat[:lng])
+ orderidx:bat[:lng],
+ compressed:bat[:bit])
address sql_storage
comment "return a table with storage information for a particular schema ";
@@ -475,7 +477,8 @@ pattern storage(sname:str, tname:str)(
sorted:bat[:bit],
revsorted:bat[:bit],
key:bat[:bit],
- orderidx:bat[:lng])
+ orderidx:bat[:lng],
+ compressed:bat[:bit])
address sql_storage
comment "return a table with storage information for a particular table";
@@ -496,7 +499,8 @@ pattern storage(sname:str, tname:str, cn
sorted:bat[:bit],
revsorted:bat[:bit],
key:bat[:bit],
- orderidx:bat[:lng])
+ orderidx:bat[:lng],
+ compressed:bat[:bit])
address sql_storage
comment "return a table with storage information for a particular column";
diff --git a/sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out
b/sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out
--- a/sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out
+++ b/sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out
@@ -25,22 +25,22 @@ Ready.
# 16:01:26 > "/usr/bin/python2" "leaks.SQL.py" "leaks"
# 16:01:26 >
-(u'l_comment', 65536, 0)
-(u'l_commitdate', 65536, 0)
-(u'l_discount', 65536, 0)
-(u'l_extendedprice', 65536, 0)
-(u'l_linenumber', 65536, 0)
+(u'l_comment', 262144, 0)
+(u'l_commitdate', 262144, 0)
+(u'l_discount', 524288, 0)
+(u'l_extendedprice', 524288, 0)
+(u'l_linenumber', 262144, 0)
(u'l_linestatus', 0, 0)
-(u'l_orderkey', 65536, 0)
-(u'l_partkey', 65536, 0)
-(u'l_quantity', 65536, 0)
-(u'l_receiptdate', 65536, 0)
+(u'l_orderkey', 262144, 0)
+(u'l_partkey', 262144, 0)
+(u'l_quantity', 524288, 0)
+(u'l_receiptdate', 262144, 0)
(u'l_returnflag', 0, 0)
-(u'l_shipdate', 65536, 0)
+(u'l_shipdate', 262144, 0)
(u'l_shipinstruct', 0, 0)
(u'l_shipmode', 0, 0)
-(u'l_suppkey', 65536, 0)
-(u'l_tax', 65536, 0)
+(u'l_suppkey', 262144, 0)
+(u'l_tax', 524288, 0)
# 16:01:26 >
# 16:01:26 > "Done."
diff --git a/sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out.Windows
b/sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out.Windows
--- a/sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out.Windows
+++ b/sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out.Windows
@@ -25,22 +25,22 @@ Ready.
# 16:01:26 > "/usr/bin/python2" "leaks.SQL.py" "leaks"
# 16:01:26 >
-(u'l_comment', 65536, 0)
-(u'l_commitdate', 65536, 0)
-(u'l_discount', 65536, 0)
-(u'l_extendedprice', 65536, 0)
-(u'l_linenumber', 65536, 0)
+(u'l_comment', 262144, 0)
+(u'l_commitdate', 262144, 0)
+(u'l_discount', 524288, 0)
+(u'l_extendedprice', 524288, 0)
+(u'l_linenumber', 262144, 0)
(u'l_linestatus', 0, 0)
-(u'l_orderkey', 65536, 0)
-(u'l_partkey', 65536, 0)
-(u'l_quantity', 65536, 0)
-(u'l_receiptdate', 65536, 0)
+(u'l_orderkey', 262144, 0)
+(u'l_partkey', 262144, 0)
+(u'l_quantity', 524288, 0)
+(u'l_receiptdate', 262144, 0)
(u'l_returnflag', 0, 0)
-(u'l_shipdate', 65536, 0)
+(u'l_shipdate', 262144, 0)
(u'l_shipinstruct', 0, 0)
(u'l_shipmode', 0, 0)
-(u'l_suppkey', 65536, 0)
-(u'l_tax', 65536, 0)
+(u'l_suppkey', 262144, 0)
+(u'l_tax', 524288, 0)
# 16:01:26 >
# 16:01:26 > "Done."
diff --git a/sql/test/BugTracker-2015/Tests/alter-table.Bug-3828-part1.sql
b/sql/test/BugTracker-2015/Tests/alter-table.Bug-3828-part1.sql
--- a/sql/test/BugTracker-2015/Tests/alter-table.Bug-3828-part1.sql
+++ b/sql/test/BugTracker-2015/Tests/alter-table.Bug-3828-part1.sql
@@ -42,5 +42,5 @@ CREATE TABLE hmda_14 AS SELECT a.* , b.a
select actiontype, propertytype, loanpurpose, count(*) as num_records from
hmda_14 group by actiontype, propertytype, loanpurpose;
-select tables.name, columns.name, location from tables inner join columns on
tables.id=columns.table_id left join storage on tables.name=storage.table and
columns.name=storage.column where location is null and tables.name like 'hmda%';
+select tables.name, columns.name, location from tables inner join columns on
tables.id=columns.table_id left join storage on tables.name=storage."table" and
columns.name=storage."column" where location is null and tables.name like
'hmda%';
diff --git a/sql/test/BugTracker-2016/Tests/storagemodel.stable.out
b/sql/test/BugTracker-2016/Tests/storagemodel.stable.out
--- a/sql/test/BugTracker-2016/Tests/storagemodel.stable.out
+++ b/sql/test/BugTracker-2016/Tests/storagemodel.stable.out
@@ -84,11 +84,11 @@ Ready.
#update storagemodelinput set "distinct" =10 where "table" ='bug3923' and
"column" ='i';
[ 1 ]
#select * from storagemodel() where "table" = 'bug3923';
-% .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1,
.L1, .L1, .L1 # table_name
-% schema, table, column, type, count, columnsize, heapsize,
hashes, imprints, sorted, revsorted, unique, orderidx # name
-% clob, clob, clob, clob, bigint, bigint, bigint, bigint, bigint,
boolean, boolean, boolean, bigint # type
-% 3, 7, 1, 3, 5, 5, 1, 1, 4, 5,
5, 5, 1 # length
-[ "sys", "bug3923", "i", "int", 10000, 40000, 0, 0,
1200, true, true, NULL, 0 ]
+% .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1,
.L1, .L1, .L1, .L1 # table_name
+% schema, table, column, type, count, columnsize, heapsize,
hashes, imprints, sorted, revsorted, unique, orderidx,
compressed # name
+% clob, clob, clob, clob, bigint, bigint, bigint, bigint, bigint,
boolean, boolean, boolean, bigint, boolean # type
+% 3, 7, 1, 3, 5, 5, 1, 1, 4, 5,
5, 5, 1, 5 # length
+[ "sys", "bug3923", "i", "int", 10000, 40000, 0, 0,
1200, true, true, NULL, 0, false ]
#drop table bug3923;
#create table bug3923(i integer);
#select "schema", "table", "column", "type", "mode", typewidth, hashes, phash,
imprints from storage('sys','_tables');
@@ -108,12 +108,12 @@ Ready.
[ 1 ]
#update storagemodelinput set "distinct" =10 where "table" ='bug3923' and
"column" ='i';
[ 1 ]
-#select * from storagemodel() where "table" = 'bug3923';
-% .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1,
.L1, .L1, .L1 # table_name
-% schema, table, column, type, count, columnsize, heapsize,
hashes, imprints, sorted, revsorted, unique, orderidx # name
-% clob, clob, clob, clob, bigint, bigint, bigint, bigint, bigint,
boolean, boolean, boolean, bigint # type
-% 13, 7, 1, 3, 5, 5, 1, 1, 4, 5,
5, 5, 1 # length
-[ "bug3923schema", "bug3923", "i", "int", 10000, 40000, 0,
0, 1200, true, true, NULL, 0 ]
+#select * from sys.storagemodel() where "table" = 'bug3923';
+% .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1,
.L1, .L1, .L1, .L1 # table_name
+% schema, table, column, type, count, columnsize, heapsize,
hashes, imprints, sorted, revsorted, unique, orderidx,
compressed # name
+% clob, clob, clob, clob, bigint, bigint, bigint, bigint, bigint,
boolean, boolean, boolean, bigint, boolean # type
+% 13, 7, 1, 3, 5, 5, 1, 1, 4, 5,
5, 5, 1, 5 # length
+[ "bug3923schema", "bug3923", "i", "int", 10000, 40000, 0,
0, 1200, true, true, NULL, 0, false ]
#drop table bug3923;
# 23:38:44 >
diff --git a/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Darwin
b/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Darwin
--- a/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Darwin
+++ b/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Darwin
@@ -84,11 +84,11 @@ Ready.
#update storagemodelinput set "distinct" =10 where "table" ='bug3923' and
"column" ='i';
[ 1 ]
#select * from storagemodel() where "table" = 'bug3923';
-% .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1,
.L1, .L1, .L1 # table_name
-% schema, table, column, type, count, columnsize, heapsize,
hashes, imprints, sorted, revsorted, unique, orderidx # name
-% clob, clob, clob, clob, bigint, bigint, bigint, bigint, bigint,
boolean, boolean, boolean, bigint # type
-% 3, 7, 1, 3, 5, 5, 1, 1, 4, 5,
5, 5, 1 # length
-[ "sys", "bug3923", "i", "int", 10000, 40000, 0, 0,
1200, true, true, NULL, 0 ]
+% .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1,
.L1, .L1, .L1, .L1 # table_name
+% schema, table, column, type, count, columnsize, heapsize,
hashes, imprints, sorted, revsorted, unique, orderidx,
compressed # name
+% clob, clob, clob, clob, bigint, bigint, bigint, bigint, bigint,
boolean, boolean, boolean, bigint, boolean # type
+% 3, 7, 1, 3, 5, 5, 1, 1, 4, 5,
5, 5, 1, 5 # length
+[ "sys", "bug3923", "i", "int", 10000, 40000, 0, 0,
1200, true, true, NULL, 0, false ]
#drop table bug3923;
#create table bug3923(i integer);
#select "schema", "table", "column", "type", "mode", typewidth, hashes, phash,
imprints from storage('sys','_tables');
@@ -108,12 +108,12 @@ Ready.
[ 1 ]
#update storagemodelinput set "distinct" =10 where "table" ='bug3923' and
"column" ='i';
[ 1 ]
-#select * from storagemodel() where "table" = 'bug3923';
-% .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1,
.L1, .L1, .L1 # table_name
-% schema, table, column, type, count, columnsize, heapsize,
hashes, imprints, sorted, revsorted, unique, orderidx # name
-% clob, clob, clob, clob, bigint, bigint, bigint, bigint, bigint,
boolean, boolean, boolean, bigint # type
-% 13, 7, 1, 3, 5, 5, 1, 1, 4, 5,
5, 5, 1 # length
-[ "bug3923schema", "bug3923", "i", "int", 10000, 40000, 0,
0, 1200, true, true, NULL, 0 ]
+#select * from sys.storagemodel() where "table" = 'bug3923';
+% .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1,
.L1, .L1, .L1, .L1 # table_name
+% schema, table, column, type, count, columnsize, heapsize,
hashes, imprints, sorted, revsorted, unique, orderidx,
compressed # name
+% clob, clob, clob, clob, bigint, bigint, bigint, bigint, bigint,
boolean, boolean, boolean, bigint, boolean # type
+% 13, 7, 1, 3, 5, 5, 1, 1, 4, 5,
5, 5, 1, 5 # length
+[ "bug3923schema", "bug3923", "i", "int", 10000, 40000, 0,
0, 1200, true, true, NULL, 0, false ]
#drop table bug3923;
# 23:38:44 >
diff --git a/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.FreeBSD
b/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.FreeBSD
--- a/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.FreeBSD
+++ b/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.FreeBSD
@@ -84,11 +84,11 @@ Ready.
#update storagemodelinput set "distinct" =10 where "table" ='bug3923' and
"column" ='i';
[ 1 ]
#select * from storagemodel() where "table" = 'bug3923';
-% .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1,
.L1, .L1, .L1 # table_name
-% schema, table, column, type, count, columnsize, heapsize,
hashes, imprints, sorted, revsorted, unique, orderidx # name
-% clob, clob, clob, clob, bigint, bigint, bigint, bigint, bigint,
boolean, boolean, boolean, bigint # type
-% 3, 7, 1, 3, 5, 5, 1, 1, 4, 5,
5, 5, 1 # length
-[ "sys", "bug3923", "i", "int", 10000, 40000, 0, 0,
1200, true, true, NULL, 0 ]
+% .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1,
.L1, .L1, .L1, .L1 # table_name
+% schema, table, column, type, count, columnsize, heapsize,
hashes, imprints, sorted, revsorted, unique, orderidx,
compressed # name
+% clob, clob, clob, clob, bigint, bigint, bigint, bigint, bigint,
boolean, boolean, boolean, bigint, boolean # type
+% 3, 7, 1, 3, 5, 5, 1, 1, 4, 5,
5, 5, 1, 5 # length
+[ "sys", "bug3923", "i", "int", 10000, 40000, 0, 0,
1200, true, true, NULL, 0, false ]
#drop table bug3923;
#create table bug3923(i integer);
#select "schema", "table", "column", "type", "mode", typewidth, hashes, phash,
imprints from storage('sys','_tables');
@@ -108,12 +108,12 @@ Ready.
[ 1 ]
#update storagemodelinput set "distinct" =10 where "table" ='bug3923' and
"column" ='i';
[ 1 ]
-#select * from storagemodel() where "table" = 'bug3923';
-% .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1,
.L1, .L1, .L1 # table_name
-% schema, table, column, type, count, columnsize, heapsize,
hashes, imprints, sorted, revsorted, unique, orderidx # name
-% clob, clob, clob, clob, bigint, bigint, bigint, bigint, bigint,
boolean, boolean, boolean, bigint # type
-% 13, 7, 1, 3, 5, 5, 1, 1, 4, 5,
5, 5, 1 # length
-[ "bug3923schema", "bug3923", "i", "int", 10000, 40000, 0,
0, 1200, true, true, NULL, 0 ]
+#select * from sys.storagemodel() where "table" = 'bug3923';
+% .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1,
.L1, .L1, .L1, .L1 # table_name
+% schema, table, column, type, count, columnsize, heapsize,
hashes, imprints, sorted, revsorted, unique, orderidx,
compressed # name
+% clob, clob, clob, clob, bigint, bigint, bigint, bigint, bigint,
boolean, boolean, boolean, bigint, boolean # type
+% 13, 7, 1, 3, 5, 5, 1, 1, 4, 5,
5, 5, 1, 5 # length
+[ "bug3923schema", "bug3923", "i", "int", 10000, 40000, 0,
0, 1200, true, true, NULL, 0, false ]
#drop table bug3923;
# 23:38:44 >
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
