Changeset: a20cc0b7d0bf for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a20cc0b7d0bf
Modified Files:
clients/Tests/SQL-dump.stable.out
clients/Tests/SQL-dump.stable.out.int128
clients/Tests/SQL-dump.stable.out.oid32
clients/Tests/SQL-dump.stable.out.oid32.int128
Branch: default
Log Message:
Approve output
diffs (truncated from 1959 to 300 lines):
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
@@ -1166,7 +1166,7 @@ external name sql.sysmon_stop;
-- For strings we take a sample to determine their average length.
create function sys."storage"()
-returns table ("schema" string, "table" string, "column" string, "type"
string, "mode" string, location string, "count" bigint, typewidth int,
columnsize bigint, heapsize bigint, hashes bigint, imprints bigint, sorted
boolean)
+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 (
@@ -1337,7 +1337,7 @@ CREATE TABLE "sys"."_columns" (
"number" INTEGER,
"storage" VARCHAR(2048)
);
-COPY 351 RECORDS INTO "sys"."_columns" FROM stdin USING DELIMITERS
'\t','\n','"';
+COPY 352 RECORDS INTO "sys"."_columns" FROM stdin USING DELIMITERS
'\t','\n','"';
2002 "id" "int" 32 0 2001 NULL true 0 NULL
2003 "name" "varchar" 1024 0 2001 NULL true 1
NULL
2004 "authorization" "int" 32 0 2001 NULL true 2
NULL
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
@@ -1203,7 +1203,7 @@ external name sql.sysmon_stop;
-- For strings we take a sample to determine their average length.
create function sys."storage"()
-returns table ("schema" string, "table" string, "column" string, "type"
string, "mode" string, location string, "count" bigint, typewidth int,
columnsize bigint, heapsize bigint, hashes bigint, imprints bigint, sorted
boolean)
+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 (
@@ -1378,7 +1378,7 @@ CREATE TABLE "sys"."_columns" (
"number" INTEGER,
"storage" VARCHAR(2048)
);
-COPY 351 RECORDS INTO "sys"."_columns" FROM stdin USING DELIMITERS
'\t','\n','"';
+COPY 352 RECORDS INTO "sys"."_columns" FROM stdin USING DELIMITERS
'\t','\n','"';
2002 "id" "int" 32 0 2001 NULL true 0 NULL
2003 "name" "varchar" 1024 0 2001 NULL true 1
NULL
2004 "authorization" "int" 32 0 2001 NULL true 2
NULL
@@ -1634,102 +1634,103 @@ 6938 "att_type" "varchar" 64 0
6942 NULL
6939 "value" "clob" 0 0 6942 NULL true 3 NULL
6940 "file_id" "int" 32 0 6942 NULL true 4
NULL
6941 "gr_name" "varchar" 256 0 6942 NULL true
5 NULL
-6966 "schema" "clob" 0 0 6979 NULL true 0
NULL
-6967 "table" "clob" 0 0 6979 NULL true 1 NULL
-6968 "column" "clob" 0 0 6979 NULL true 2
NULL
-6969 "type" "clob" 0 0 6979 NULL true 3 NULL
-6970 "mode" "clob" 0 0 6979 NULL true 4 NULL
-6971 "location" "clob" 0 0 6979 NULL true 5
NULL
-6972 "count" "bigint" 64 0 6979 NULL true 6
NULL
-6973 "typewidth" "int" 32 0 6979 NULL true 7
NULL
-6974 "columnsize" "bigint" 64 0 6979 NULL true
8 NULL
-6975 "heapsize" "bigint" 64 0 6979 NULL true
9 NULL
-6976 "hashes" "bigint" 64 0 6979 NULL true
10 NULL
-6977 "imprints" "bigint" 64 0 6979 NULL true
11 NULL
-6978 "sorted" "boolean" 1 0 6979 NULL true
12 NULL
-6981 "schema" "clob" 0 0 6991 NULL true 0
NULL
-6982 "table" "clob" 0 0 6991 NULL true 1 NULL
-6983 "column" "clob" 0 0 6991 NULL true 2
NULL
-6984 "type" "clob" 0 0 6991 NULL true 3 NULL
-6985 "typewidth" "int" 32 0 6991 NULL true 4
NULL
-6986 "count" "bigint" 64 0 6991 NULL true 5
NULL
-6987 "distinct" "bigint" 64 0 6991 NULL true
6 NULL
-6988 "atomwidth" "int" 32 0 6991 NULL true 7
NULL
-6989 "reference" "boolean" 1 0 6991 NULL true
8 NULL
-6990 "sorted" "boolean" 1 0 6991 NULL true
9 NULL
-7029 "schema" "clob" 0 0 7039 NULL true 0
NULL
-7030 "table" "clob" 0 0 7039 NULL true 1 NULL
-7031 "column" "clob" 0 0 7039 NULL true 2
NULL
-7032 "type" "clob" 0 0 7039 NULL true 3 NULL
-7033 "count" "bigint" 64 0 7039 NULL true 4
NULL
-7034 "columnsize" "bigint" 64 0 7039 NULL true
5 NULL
-7035 "heapsize" "bigint" 64 0 7039 NULL true
6 NULL
-7036 "hashes" "bigint" 64 0 7039 NULL true
7 NULL
-7037 "imprints" "bigint" 64 0 7039 NULL true
8 NULL
-7038 "sorted" "boolean" 1 0 7039 NULL true
9 NULL
-7041 "schema" "clob" 0 0 7049 NULL true 0
NULL
-7042 "table" "clob" 0 0 7049 NULL true 1 NULL
-7043 "count" "bigint" 64 0 7049 NULL true 2
NULL
-7044 "columnsize" "hugeint" 128 0 7049 NULL true
3 NULL
-7045 "heapsize" "hugeint" 128 0 7049 NULL true
4 NULL
-7046 "hashes" "hugeint" 128 0 7049 NULL true
5 NULL
-7047 "imprints" "hugeint" 128 0 7049 NULL true
6 NULL
-7048 "auxiliary" "hugeint" 128 0 7049 NULL true
7 NULL
-7051 "column_id" "int" 32 0 7062 NULL true 0
NULL
-7052 "type" "clob" 0 0 7062 NULL true 1 NULL
-7053 "width" "int" 32 0 7062 NULL true 2 NULL
-7054 "stamp" "timestamp" 7 0 7062 NULL true 3
NULL
-7055 "sample" "bigint" 64 0 7062 NULL true
4 NULL
-7056 "count" "bigint" 64 0 7062 NULL true 5
NULL
-7057 "unique" "bigint" 64 0 7062 NULL true
6 NULL
-7058 "nils" "bigint" 64 0 7062 NULL true 7
NULL
-7059 "minval" "clob" 0 0 7062 NULL true 8
NULL
-7060 "maxval" "clob" 0 0 7062 NULL true 9
NULL
-7061 "sorted" "boolean" 1 0 7062 NULL true
10 NULL
-7162 "file_id" "bigint" 64 0 7170 NULL false
0 NULL
-7163 "file_location" "clob" 0 0 7170 NULL false 1
NULL
-7164 "dbschema" "smallint" 16 0 7170 NULL false
2 NULL
-7165 "format_version" "varchar" 7 0 7170 NULL
true 3 NULL
-7166 "sorting_order" "varchar" 10 0 7170 NULL true
4 NULL
-7167 "comments" "clob" 0 0 7170 NULL true 5
NULL
-7172 "sn" "clob" 0 0 7183 NULL false 0 NULL
-7173 "file_id" "bigint" 64 0 7183 NULL false
1 NULL
-7174 "ln" "int" 32 0 7183 NULL true 2 NULL
-7175 "as" "int" 32 0 7183 NULL true 3 NULL
-7176 "m5" "clob" 0 0 7183 NULL true 4 NULL
-7177 "sp" "clob" 0 0 7183 NULL true 5 NULL
-7178 "ur" "clob" 0 0 7183 NULL true 6 NULL
-7185 "id" "clob" 0 0 7202 NULL false 0 NULL
-7186 "file_id" "bigint" 64 0 7202 NULL false
1 NULL
-7187 "cn" "clob" 0 0 7202 NULL true 2 NULL
-7188 "ds" "clob" 0 0 7202 NULL true 3 NULL
-7189 "dt" "timestamp" 7 0 7202 NULL true 4
NULL
-7190 "fo" "clob" 0 0 7202 NULL true 5 NULL
-7191 "ks" "clob" 0 0 7202 NULL true 6 NULL
-7192 "lb" "clob" 0 0 7202 NULL true 7 NULL
-7193 "pg" "clob" 0 0 7202 NULL true 8 NULL
-7194 "pi" "int" 32 0 7202 NULL true 9 NULL
-7195 "pl" "clob" 0 0 7202 NULL true 10 NULL
-7196 "pu" "clob" 0 0 7202 NULL true 11 NULL
-7197 "sm" "clob" 0 0 7202 NULL true 12 NULL
-7204 "id" "clob" 0 0 7214 NULL false 0 NULL
-7205 "file_id" "bigint" 64 0 7214 NULL false
1 NULL
-7206 "pn" "clob" 0 0 7214 NULL true 2 NULL
-7207 "cl" "clob" 0 0 7214 NULL true 3 NULL
-7208 "pp" "clob" 0 0 7214 NULL true 4 NULL
-7209 "vn" "clob" 0 0 7214 NULL true 5 NULL
-7216 "qname" "clob" 0 0 7227 NULL false 0 NULL
-7217 "flag" "smallint" 16 0 7227 NULL false 1
NULL
-7218 "rname" "clob" 0 0 7227 NULL false 2 NULL
-7219 "pos" "int" 32 0 7227 NULL false 3 NULL
-7220 "mapq" "smallint" 16 0 7227 NULL false 4
NULL
-7221 "cigar" "clob" 0 0 7227 NULL false 5 NULL
-7222 "rnext" "clob" 0 0 7227 NULL false 6 NULL
-7223 "pnext" "int" 32 0 7227 NULL false 7 NULL
-7224 "tlen" "int" 32 0 7227 NULL false 8 NULL
-7225 "seq" "clob" 0 0 7227 NULL false 9 NULL
-7226 "qual" "clob" 0 0 7227 NULL false 10 NULL
-7308 "function_id" "int" 32 0 7309 NULL true 0
NULL
+6967 "schema" "clob" 0 0 6981 NULL true 0
NULL
+6968 "table" "clob" 0 0 6981 NULL true 1 NULL
+6969 "column" "clob" 0 0 6981 NULL true 2
NULL
+6970 "type" "clob" 0 0 6981 NULL true 3 NULL
+6971 "mode" "clob" 0 0 6981 NULL true 4 NULL
+6972 "location" "clob" 0 0 6981 NULL true 5
NULL
+6973 "count" "bigint" 64 0 6981 NULL true 6
NULL
+6974 "typewidth" "int" 32 0 6981 NULL true 7
NULL
+6975 "columnsize" "bigint" 64 0 6981 NULL true
8 NULL
+6976 "heapsize" "bigint" 64 0 6981 NULL true
9 NULL
+6977 "hashes" "bigint" 64 0 6981 NULL true
10 NULL
+6978 "phash" "boolean" 1 0 6981 NULL true 11
NULL
+6979 "imprints" "bigint" 64 0 6981 NULL true
12 NULL
+6980 "sorted" "boolean" 1 0 6981 NULL true
13 NULL
+6983 "schema" "clob" 0 0 6993 NULL true 0
NULL
+6984 "table" "clob" 0 0 6993 NULL true 1 NULL
+6985 "column" "clob" 0 0 6993 NULL true 2
NULL
+6986 "type" "clob" 0 0 6993 NULL true 3 NULL
+6987 "typewidth" "int" 32 0 6993 NULL true 4
NULL
+6988 "count" "bigint" 64 0 6993 NULL true 5
NULL
+6989 "distinct" "bigint" 64 0 6993 NULL true
6 NULL
+6990 "atomwidth" "int" 32 0 6993 NULL true 7
NULL
+6991 "reference" "boolean" 1 0 6993 NULL true
8 NULL
+6992 "sorted" "boolean" 1 0 6993 NULL true
9 NULL
+7031 "schema" "clob" 0 0 7041 NULL true 0
NULL
+7032 "table" "clob" 0 0 7041 NULL true 1 NULL
+7033 "column" "clob" 0 0 7041 NULL true 2
NULL
+7034 "type" "clob" 0 0 7041 NULL true 3 NULL
+7035 "count" "bigint" 64 0 7041 NULL true 4
NULL
+7036 "columnsize" "bigint" 64 0 7041 NULL true
5 NULL
+7037 "heapsize" "bigint" 64 0 7041 NULL true
6 NULL
+7038 "hashes" "bigint" 64 0 7041 NULL true
7 NULL
+7039 "imprints" "bigint" 64 0 7041 NULL true
8 NULL
+7040 "sorted" "boolean" 1 0 7041 NULL true
9 NULL
+7043 "schema" "clob" 0 0 7051 NULL true 0
NULL
+7044 "table" "clob" 0 0 7051 NULL true 1 NULL
+7045 "count" "bigint" 64 0 7051 NULL true 2
NULL
+7046 "columnsize" "hugeint" 128 0 7051 NULL true
3 NULL
+7047 "heapsize" "hugeint" 128 0 7051 NULL true
4 NULL
+7048 "hashes" "hugeint" 128 0 7051 NULL true
5 NULL
+7049 "imprints" "hugeint" 128 0 7051 NULL true
6 NULL
+7050 "auxiliary" "hugeint" 128 0 7051 NULL true
7 NULL
+7053 "column_id" "int" 32 0 7064 NULL true 0
NULL
+7054 "type" "clob" 0 0 7064 NULL true 1 NULL
+7055 "width" "int" 32 0 7064 NULL true 2 NULL
+7056 "stamp" "timestamp" 7 0 7064 NULL true 3
NULL
+7057 "sample" "bigint" 64 0 7064 NULL true
4 NULL
+7058 "count" "bigint" 64 0 7064 NULL true 5
NULL
+7059 "unique" "bigint" 64 0 7064 NULL true
6 NULL
+7060 "nils" "bigint" 64 0 7064 NULL true 7
NULL
+7061 "minval" "clob" 0 0 7064 NULL true 8
NULL
+7062 "maxval" "clob" 0 0 7064 NULL true 9
NULL
+7063 "sorted" "boolean" 1 0 7064 NULL true
10 NULL
+7164 "file_id" "bigint" 64 0 7172 NULL false
0 NULL
+7165 "file_location" "clob" 0 0 7172 NULL false 1
NULL
+7166 "dbschema" "smallint" 16 0 7172 NULL false
2 NULL
+7167 "format_version" "varchar" 7 0 7172 NULL
true 3 NULL
+7168 "sorting_order" "varchar" 10 0 7172 NULL true
4 NULL
+7169 "comments" "clob" 0 0 7172 NULL true 5
NULL
+7174 "sn" "clob" 0 0 7185 NULL false 0 NULL
+7175 "file_id" "bigint" 64 0 7185 NULL false
1 NULL
+7176 "ln" "int" 32 0 7185 NULL true 2 NULL
+7177 "as" "int" 32 0 7185 NULL true 3 NULL
+7178 "m5" "clob" 0 0 7185 NULL true 4 NULL
+7179 "sp" "clob" 0 0 7185 NULL true 5 NULL
+7180 "ur" "clob" 0 0 7185 NULL true 6 NULL
+7187 "id" "clob" 0 0 7204 NULL false 0 NULL
+7188 "file_id" "bigint" 64 0 7204 NULL false
1 NULL
+7189 "cn" "clob" 0 0 7204 NULL true 2 NULL
+7190 "ds" "clob" 0 0 7204 NULL true 3 NULL
+7191 "dt" "timestamp" 7 0 7204 NULL true 4
NULL
+7192 "fo" "clob" 0 0 7204 NULL true 5 NULL
+7193 "ks" "clob" 0 0 7204 NULL true 6 NULL
+7194 "lb" "clob" 0 0 7204 NULL true 7 NULL
+7195 "pg" "clob" 0 0 7204 NULL true 8 NULL
+7196 "pi" "int" 32 0 7204 NULL true 9 NULL
+7197 "pl" "clob" 0 0 7204 NULL true 10 NULL
+7198 "pu" "clob" 0 0 7204 NULL true 11 NULL
+7199 "sm" "clob" 0 0 7204 NULL true 12 NULL
+7206 "id" "clob" 0 0 7216 NULL false 0 NULL
+7207 "file_id" "bigint" 64 0 7216 NULL false
1 NULL
+7208 "pn" "clob" 0 0 7216 NULL true 2 NULL
+7209 "cl" "clob" 0 0 7216 NULL true 3 NULL
+7210 "pp" "clob" 0 0 7216 NULL true 4 NULL
+7211 "vn" "clob" 0 0 7216 NULL true 5 NULL
+7218 "qname" "clob" 0 0 7229 NULL false 0 NULL
+7219 "flag" "smallint" 16 0 7229 NULL false 1
NULL
+7220 "rname" "clob" 0 0 7229 NULL false 2 NULL
+7221 "pos" "int" 32 0 7229 NULL false 3 NULL
+7222 "mapq" "smallint" 16 0 7229 NULL false 4
NULL
+7223 "cigar" "clob" 0 0 7229 NULL false 5 NULL
+7224 "rnext" "clob" 0 0 7229 NULL false 6 NULL
+7225 "pnext" "int" 32 0 7229 NULL false 7 NULL
+7226 "tlen" "int" 32 0 7229 NULL false 8 NULL
+7227 "seq" "clob" 0 0 7229 NULL false 9 NULL
+7228 "qual" "clob" 0 0 7229 NULL false 10 NULL
+7310 "function_id" "int" 32 0 7311 NULL true 0
NULL
COMMIT;
START TRANSACTION;
CREATE TABLE "sys"."_tables" (
@@ -1782,17 +1783,17 @@ 6920 "netcdf_dims" 2000 NULL 0 true
0 0
6928 "netcdf_vars" 2000 NULL 0 true 0 0
6934 "netcdf_vardim" 2000 NULL 0 true 0 0
6942 "netcdf_attrs" 2000 NULL 0 true 0 0
-6979 "storage" 2000 "create view sys.""storage"" as select * from
sys.""storage""();" 1 true 0 0
-6991 "storagemodelinput" 2000 NULL 0 true 0 0
-7039 "storagemodel" 2000 "create view sys.storagemodel as select * from
sys.storagemodel();" 1 true 0 0
-7049 "tablestoragemodel" 2000 "-- A summary of the table storage
requirement is is available as a table view.\n-- The auxiliary column denotes
the maximum space if all non-sorted columns\n-- would be augmented with a hash
(rare situation)\ncreate view sys.tablestoragemodel\nas select
""schema"",""table"",max(count) as ""count"",\n\tsum(columnsize) as
columnsize,\n\tsum(heapsize) as heapsize,\n\tsum(hashes) as
hashes,\n\tsum(imprints) as imprints,\n\tsum(case when sorted = false then 8 *
count else 0 end) as auxiliary\nfrom sys.storagemodel() group by
""schema"",""table"";" 1 true 0 0
-7062 "statistics" 2000 NULL 0 true 0 0
-7170 "files" 7119 NULL 0 true 0 0
-7183 "sq" 7119 NULL 0 true 0 0
-7202 "rg" 7119 NULL 0 true 0 0
-7214 "pg" 7119 NULL 0 true 0 0
-7227 "export" 7119 NULL 0 true 0 0
-7309 "systemfunctions" 2000 NULL 0 true 0 0
+6981 "storage" 2000 "create view sys.""storage"" as select * from
sys.""storage""();" 1 true 0 0
+6993 "storagemodelinput" 2000 NULL 0 true 0 0
+7041 "storagemodel" 2000 "create view sys.storagemodel as select * from
sys.storagemodel();" 1 true 0 0
+7051 "tablestoragemodel" 2000 "-- A summary of the table storage
requirement is is available as a table view.\n-- The auxiliary column denotes
the maximum space if all non-sorted columns\n-- would be augmented with a hash
(rare situation)\ncreate view sys.tablestoragemodel\nas select
""schema"",""table"",max(count) as ""count"",\n\tsum(columnsize) as
columnsize,\n\tsum(heapsize) as heapsize,\n\tsum(hashes) as
hashes,\n\tsum(imprints) as imprints,\n\tsum(case when sorted = false then 8 *
count else 0 end) as auxiliary\nfrom sys.storagemodel() group by
""schema"",""table"";" 1 true 0 0
+7064 "statistics" 2000 NULL 0 true 0 0
+7172 "files" 7121 NULL 0 true 0 0
+7185 "sq" 7121 NULL 0 true 0 0
+7204 "rg" 7121 NULL 0 true 0 0
+7216 "pg" 7121 NULL 0 true 0 0
+7229 "export" 7121 NULL 0 true 0 0
+7311 "systemfunctions" 2000 NULL 0 true 0 0
COMMIT;
START TRANSACTION;
CREATE TABLE "sys"."args" (
@@ -1805,7 +1806,7 @@ CREATE TABLE "sys"."args" (
"inout" TINYINT,
"number" INTEGER
);
-COPY 4258 RECORDS INTO "sys"."args" FROM stdin USING DELIMITERS '\t','\n','"';
+COPY 4259 RECORDS INTO "sys"."args" FROM stdin USING DELIMITERS '\t','\n','"';
2155 30 "res_0" "oid" 63 0 0 0
2156 30 "arg_1" "wrd" 64 0 1 1
2157 31 "res_0" "oid" 63 0 0 0
@@ -5936,134 +5937,135 @@ 6959 6951 "typewidth" "int" 32 0
0 7
6960 6951 "columnsize" "bigint" 64 0 0 8
6961 6951 "heapsize" "bigint" 64 0 0 9
6962 6951 "hashes" "bigint" 64 0 0 10
-6963 6951 "imprints" "bigint" 64 0 0 11
-6964 6951 "sorted" "boolean" 1 0 0 12
-6996 6995 "result" "bigint" 64 0 0 0
-6997 6995 "nme" "clob" 0 0 1 1
-6998 6995 "i" "bigint" 64 0 1 2
-6999 6995 "d" "bigint" 64 0 1 3
-7002 7001 "result" "bigint" 64 0 0 0
-7003 7001 "tpe" "clob" 0 0 1 1
-7004 7001 "i" "bigint" 64 0 1 2
-7005 7001 "w" "int" 32 0 1 3
-7008 7007 "result" "bigint" 64 0 0 0
-7009 7007 "b" "boolean" 1 0 1 1
-7010 7007 "i" "bigint" 64 0 1 2
-7013 7012 "result" "bigint" 64 0 0 0
-7014 7012 "i" "bigint" 64 0 1 1
-7015 7012 "nme" "clob" 0 0 1 2
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
