Changeset: e44f9e649886 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e44f9e649886
Modified Files:
clients/Tests/SQL-dump.stable.out
clients/Tests/SQL-dump.stable.out.int128
clients/Tests/exports.stable.out
monetdb5/modules/mal/Tests/remote12.mal
monetdb5/modules/mal/Tests/remote12.stable.out
monetdb5/modules/mal/bbp.c
monetdb5/modules/mal/bbp.h
monetdb5/modules/mal/bbp.mal
monetdb5/modules/mal/remote.c
sql/backends/monet5/sql_upgrades.c
sql/scripts/25_debug.sql
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
sql/test/leaks/Tests/check0.sql
sql/test/leaks/Tests/check0.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
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: default
Log Message:
More headless
- drop HT from bbp inspection
- prepare upgrade for it
- accept outputs
diffs (truncated from 5672 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
@@ -489,7 +489,7 @@ create function area(g geometry) returns
create function astext(g geometry) returns string external name geom."AsText";
-- The BAT buffer pool overview
create function sys.bbp ()
- returns table (id int, name string, htype string,
+ returns table (id int, name string,
ttype string, count bigint, refcnt int, lrefcnt int,
location string, heat int, dirty string,
status string, kind 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
@@ -485,7 +485,7 @@ create function area(g geometry) returns
create function astext(g geometry) returns string external name geom."AsText";
-- The BAT buffer pool overview
create function sys.bbp ()
- returns table (id int, name string, htype string,
+ returns table (id int, name string,
ttype string, count bigint, refcnt int, lrefcnt int,
location string, heat int, dirty string,
status string, kind string)
@@ -1626,142 +1626,142 @@ 6148 "def" "clob" 0 0 6150 NULL
true 1 N
6149 "status" "clob" 0 0 6150 NULL true 2
NULL
6156 "name" "clob" 0 0 6158 NULL true 0 NULL
6157 "value" "clob" 0 0 6158 NULL true 1 NULL
-6195 "qtag" "bigint" 64 0 6203 NULL true 0
NULL
-6196 "user" "clob" 0 0 6203 NULL true 1 NULL
-6197 "started" "timestamp" 7 0 6203 NULL true
2 NULL
-6198 "estimate" "timestamp" 7 0 6203 NULL true
3 NULL
-6199 "progress" "int" 32 0 6203 NULL true 4
NULL
-6200 "status" "clob" 0 0 6203 NULL true 5
NULL
-6201 "tag" "oid" 63 0 6203 NULL true 6 NULL
-6202 "query" "clob" 0 0 6203 NULL true 7 NULL
-6229 "rowid" "bigint" 64 0 6233 NULL true 0
NULL
-6230 "fldid" "int" 32 0 6233 NULL true 1 NULL
-6231 "message" "clob" 0 0 6233 NULL true 2
NULL
-6232 "input" "clob" 0 0 6233 NULL true 3 NULL
-6888 "keyword" "varchar" 40 0 6891 NULL false
0 NULL
-6893 "table_type_id" "smallint" 16 0 6899 NULL false
0 NULL
-6896 "table_type_name" "varchar" 25 0 6899 NULL
false 1 NULL
-6901 "dependency_type_id" "smallint" 16 0 6907 NULL
false 0 NULL
-6904 "dependency_type_name" "varchar" 15 0 6907 NULL
false 1 NULL
-6922 "file_id" "int" 32 0 6924 NULL true 0
NULL
-6923 "location" "char" 256 0 6924 NULL true 1
NULL
-6926 "dim_id" "int" 32 0 6930 NULL true 0
NULL
-6927 "file_id" "int" 32 0 6930 NULL true 1
NULL
-6928 "name" "varchar" 64 0 6930 NULL true 2
NULL
-6929 "length" "int" 32 0 6930 NULL true 3
NULL
-6932 "var_id" "int" 32 0 6938 NULL true 0
NULL
-6933 "file_id" "int" 32 0 6938 NULL true 1
NULL
-6934 "name" "varchar" 64 0 6938 NULL true 2
NULL
-6935 "vartype" "varchar" 64 0 6938 NULL true
3 NULL
-6936 "ndim" "int" 32 0 6938 NULL true 4 NULL
-6937 "coord_dim_id" "int" 32 0 6938 NULL true 5
NULL
-6940 "var_id" "int" 32 0 6944 NULL true 0
NULL
-6941 "dim_id" "int" 32 0 6944 NULL true 1
NULL
-6942 "file_id" "int" 32 0 6944 NULL true 2
NULL
-6943 "dimpos" "int" 32 0 6944 NULL true 3
NULL
-6946 "obj_name" "varchar" 256 0 6952 NULL true
0 NULL
-6947 "att_name" "varchar" 256 0 6952 NULL true
1 NULL
-6948 "att_type" "varchar" 64 0 6952 NULL true
2 NULL
-6949 "value" "clob" 0 0 6952 NULL true 3 NULL
-6950 "file_id" "int" 32 0 6952 NULL true 4
NULL
-6951 "gr_name" "varchar" 256 0 6952 NULL true
5 NULL
-6977 "schema" "clob" 0 0 6991 NULL true 0
NULL
-6978 "table" "clob" 0 0 6991 NULL true 1 NULL
-6979 "column" "clob" 0 0 6991 NULL true 2
NULL
-6980 "type" "clob" 0 0 6991 NULL true 3 NULL
-6981 "mode" "clob" 0 0 6991 NULL true 4 NULL
-6982 "location" "clob" 0 0 6991 NULL true 5
NULL
-6983 "count" "bigint" 64 0 6991 NULL true 6
NULL
-6984 "typewidth" "int" 32 0 6991 NULL true 7
NULL
-6985 "columnsize" "bigint" 64 0 6991 NULL true
8 NULL
-6986 "heapsize" "bigint" 64 0 6991 NULL true
9 NULL
-6987 "hashes" "bigint" 64 0 6991 NULL true
10 NULL
-6988 "phash" "boolean" 1 0 6991 NULL true 11
NULL
-6989 "imprints" "bigint" 64 0 6991 NULL true
12 NULL
-6990 "sorted" "boolean" 1 0 6991 NULL true
13 NULL
-6993 "schema" "clob" 0 0 7003 NULL true 0
NULL
-6994 "table" "clob" 0 0 7003 NULL true 1 NULL
-6995 "column" "clob" 0 0 7003 NULL true 2
NULL
-6996 "type" "clob" 0 0 7003 NULL true 3 NULL
-6997 "typewidth" "int" 32 0 7003 NULL true 4
NULL
-6998 "count" "bigint" 64 0 7003 NULL true 5
NULL
-6999 "distinct" "bigint" 64 0 7003 NULL true
6 NULL
-7000 "atomwidth" "int" 32 0 7003 NULL true 7
NULL
-7001 "reference" "boolean" 1 0 7003 NULL true
8 NULL
-7002 "sorted" "boolean" 1 0 7003 NULL true
9 NULL
-7041 "schema" "clob" 0 0 7051 NULL true 0
NULL
-7042 "table" "clob" 0 0 7051 NULL true 1 NULL
-7043 "column" "clob" 0 0 7051 NULL true 2
NULL
-7044 "type" "clob" 0 0 7051 NULL true 3 NULL
-7045 "count" "bigint" 64 0 7051 NULL true 4
NULL
-7046 "columnsize" "bigint" 64 0 7051 NULL true
5 NULL
-7047 "heapsize" "bigint" 64 0 7051 NULL true
6 NULL
-7048 "hashes" "bigint" 64 0 7051 NULL true
7 NULL
-7049 "imprints" "bigint" 64 0 7051 NULL true
8 NULL
-7050 "sorted" "boolean" 1 0 7051 NULL true
9 NULL
-7053 "schema" "clob" 0 0 7061 NULL true 0
NULL
-7054 "table" "clob" 0 0 7061 NULL true 1 NULL
-7055 "count" "bigint" 64 0 7061 NULL true 2
NULL
-7056 "columnsize" "hugeint" 128 0 7061 NULL true
3 NULL
-7057 "heapsize" "hugeint" 128 0 7061 NULL true
4 NULL
-7058 "hashes" "hugeint" 128 0 7061 NULL true
5 NULL
-7059 "imprints" "hugeint" 128 0 7061 NULL true
6 NULL
-7060 "auxiliary" "hugeint" 128 0 7061 NULL true
7 NULL
-7063 "column_id" "int" 32 0 7074 NULL true 0
NULL
-7064 "type" "clob" 0 0 7074 NULL true 1 NULL
-7065 "width" "int" 32 0 7074 NULL true 2 NULL
-7066 "stamp" "timestamp" 7 0 7074 NULL true 3
NULL
-7067 "sample" "bigint" 64 0 7074 NULL true
4 NULL
-7068 "count" "bigint" 64 0 7074 NULL true 5
NULL
-7069 "unique" "bigint" 64 0 7074 NULL true
6 NULL
-7070 "nils" "bigint" 64 0 7074 NULL true 7
NULL
-7071 "minval" "clob" 0 0 7074 NULL true 8
NULL
-7072 "maxval" "clob" 0 0 7074 NULL true 9
NULL
-7073 "sorted" "boolean" 1 0 7074 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
+6194 "qtag" "bigint" 64 0 6202 NULL true 0
NULL
+6195 "user" "clob" 0 0 6202 NULL true 1 NULL
+6196 "started" "timestamp" 7 0 6202 NULL true
2 NULL
+6197 "estimate" "timestamp" 7 0 6202 NULL true
3 NULL
+6198 "progress" "int" 32 0 6202 NULL true 4
NULL
+6199 "status" "clob" 0 0 6202 NULL true 5
NULL
+6200 "tag" "oid" 63 0 6202 NULL true 6 NULL
+6201 "query" "clob" 0 0 6202 NULL true 7 NULL
+6228 "rowid" "bigint" 64 0 6232 NULL true 0
NULL
+6229 "fldid" "int" 32 0 6232 NULL true 1 NULL
+6230 "message" "clob" 0 0 6232 NULL true 2
NULL
+6231 "input" "clob" 0 0 6232 NULL true 3 NULL
+6887 "keyword" "varchar" 40 0 6890 NULL false
0 NULL
+6892 "table_type_id" "smallint" 16 0 6898 NULL false
0 NULL
+6895 "table_type_name" "varchar" 25 0 6898 NULL
false 1 NULL
+6900 "dependency_type_id" "smallint" 16 0 6906 NULL
false 0 NULL
+6903 "dependency_type_name" "varchar" 15 0 6906 NULL
false 1 NULL
+6921 "file_id" "int" 32 0 6923 NULL true 0
NULL
+6922 "location" "char" 256 0 6923 NULL true 1
NULL
+6925 "dim_id" "int" 32 0 6929 NULL true 0
NULL
+6926 "file_id" "int" 32 0 6929 NULL true 1
NULL
+6927 "name" "varchar" 64 0 6929 NULL true 2
NULL
+6928 "length" "int" 32 0 6929 NULL true 3
NULL
+6931 "var_id" "int" 32 0 6937 NULL true 0
NULL
+6932 "file_id" "int" 32 0 6937 NULL true 1
NULL
+6933 "name" "varchar" 64 0 6937 NULL true 2
NULL
+6934 "vartype" "varchar" 64 0 6937 NULL true
3 NULL
+6935 "ndim" "int" 32 0 6937 NULL true 4 NULL
+6936 "coord_dim_id" "int" 32 0 6937 NULL true 5
NULL
+6939 "var_id" "int" 32 0 6943 NULL true 0
NULL
+6940 "dim_id" "int" 32 0 6943 NULL true 1
NULL
+6941 "file_id" "int" 32 0 6943 NULL true 2
NULL
+6942 "dimpos" "int" 32 0 6943 NULL true 3
NULL
+6945 "obj_name" "varchar" 256 0 6951 NULL true
0 NULL
+6946 "att_name" "varchar" 256 0 6951 NULL true
1 NULL
+6947 "att_type" "varchar" 64 0 6951 NULL true
2 NULL
+6948 "value" "clob" 0 0 6951 NULL true 3 NULL
+6949 "file_id" "int" 32 0 6951 NULL true 4
NULL
+6950 "gr_name" "varchar" 256 0 6951 NULL true
5 NULL
+6976 "schema" "clob" 0 0 6990 NULL true 0
NULL
+6977 "table" "clob" 0 0 6990 NULL true 1 NULL
+6978 "column" "clob" 0 0 6990 NULL true 2
NULL
+6979 "type" "clob" 0 0 6990 NULL true 3 NULL
+6980 "mode" "clob" 0 0 6990 NULL true 4 NULL
+6981 "location" "clob" 0 0 6990 NULL true 5
NULL
+6982 "count" "bigint" 64 0 6990 NULL true 6
NULL
+6983 "typewidth" "int" 32 0 6990 NULL true 7
NULL
+6984 "columnsize" "bigint" 64 0 6990 NULL true
8 NULL
+6985 "heapsize" "bigint" 64 0 6990 NULL true
9 NULL
+6986 "hashes" "bigint" 64 0 6990 NULL true
10 NULL
+6987 "phash" "boolean" 1 0 6990 NULL true 11
NULL
+6988 "imprints" "bigint" 64 0 6990 NULL true
12 NULL
+6989 "sorted" "boolean" 1 0 6990 NULL true
13 NULL
+6992 "schema" "clob" 0 0 7002 NULL true 0
NULL
+6993 "table" "clob" 0 0 7002 NULL true 1 NULL
+6994 "column" "clob" 0 0 7002 NULL true 2
NULL
+6995 "type" "clob" 0 0 7002 NULL true 3 NULL
+6996 "typewidth" "int" 32 0 7002 NULL true 4
NULL
+6997 "count" "bigint" 64 0 7002 NULL true 5
NULL
+6998 "distinct" "bigint" 64 0 7002 NULL true
6 NULL
+6999 "atomwidth" "int" 32 0 7002 NULL true 7
NULL
+7000 "reference" "boolean" 1 0 7002 NULL true
8 NULL
+7001 "sorted" "boolean" 1 0 7002 NULL true
9 NULL
+7040 "schema" "clob" 0 0 7050 NULL true 0
NULL
+7041 "table" "clob" 0 0 7050 NULL true 1 NULL
+7042 "column" "clob" 0 0 7050 NULL true 2
NULL
+7043 "type" "clob" 0 0 7050 NULL true 3 NULL
+7044 "count" "bigint" 64 0 7050 NULL true 4
NULL
+7045 "columnsize" "bigint" 64 0 7050 NULL true
5 NULL
+7046 "heapsize" "bigint" 64 0 7050 NULL true
6 NULL
+7047 "hashes" "bigint" 64 0 7050 NULL true
7 NULL
+7048 "imprints" "bigint" 64 0 7050 NULL true
8 NULL
+7049 "sorted" "boolean" 1 0 7050 NULL true
9 NULL
+7052 "schema" "clob" 0 0 7060 NULL true 0
NULL
+7053 "table" "clob" 0 0 7060 NULL true 1 NULL
+7054 "count" "bigint" 64 0 7060 NULL true 2
NULL
+7055 "columnsize" "hugeint" 128 0 7060 NULL true
3 NULL
+7056 "heapsize" "hugeint" 128 0 7060 NULL true
4 NULL
+7057 "hashes" "hugeint" 128 0 7060 NULL true
5 NULL
+7058 "imprints" "hugeint" 128 0 7060 NULL true
6 NULL
+7059 "auxiliary" "hugeint" 128 0 7060 NULL true
7 NULL
+7062 "column_id" "int" 32 0 7073 NULL true 0
NULL
+7063 "type" "clob" 0 0 7073 NULL true 1 NULL
+7064 "width" "int" 32 0 7073 NULL true 2 NULL
+7065 "stamp" "timestamp" 7 0 7073 NULL true 3
NULL
+7066 "sample" "bigint" 64 0 7073 NULL true
4 NULL
+7067 "count" "bigint" 64 0 7073 NULL true 5
NULL
+7068 "unique" "bigint" 64 0 7073 NULL true
6 NULL
+7069 "nils" "bigint" 64 0 7073 NULL true 7
NULL
+7070 "minval" "clob" 0 0 7073 NULL true 8
NULL
+7071 "maxval" "clob" 0 0 7073 NULL true 9
NULL
+7072 "sorted" "boolean" 1 0 7073 NULL true
10 NULL
+7163 "file_id" "bigint" 64 0 7171 NULL false
0 NULL
+7164 "file_location" "clob" 0 0 7171 NULL false 1
NULL
+7165 "dbschema" "smallint" 16 0 7171 NULL false
2 NULL
+7166 "format_version" "varchar" 7 0 7171 NULL
true 3 NULL
+7167 "sorting_order" "varchar" 10 0 7171 NULL true
4 NULL
+7168 "comments" "clob" 0 0 7171 NULL true 5
NULL
+7173 "sn" "clob" 0 0 7184 NULL false 0 NULL
+7174 "file_id" "bigint" 64 0 7184 NULL false
1 NULL
+7175 "ln" "int" 32 0 7184 NULL true 2 NULL
+7176 "as" "int" 32 0 7184 NULL true 3 NULL
+7177 "m5" "clob" 0 0 7184 NULL true 4 NULL
+7178 "sp" "clob" 0 0 7184 NULL true 5 NULL
+7179 "ur" "clob" 0 0 7184 NULL true 6 NULL
+7186 "id" "clob" 0 0 7203 NULL false 0 NULL
+7187 "file_id" "bigint" 64 0 7203 NULL false
1 NULL
+7188 "cn" "clob" 0 0 7203 NULL true 2 NULL
+7189 "ds" "clob" 0 0 7203 NULL true 3 NULL
+7190 "dt" "timestamp" 7 0 7203 NULL true 4
NULL
+7191 "fo" "clob" 0 0 7203 NULL true 5 NULL
+7192 "ks" "clob" 0 0 7203 NULL true 6 NULL
+7193 "lb" "clob" 0 0 7203 NULL true 7 NULL
+7194 "pg" "clob" 0 0 7203 NULL true 8 NULL
+7195 "pi" "int" 32 0 7203 NULL true 9 NULL
+7196 "pl" "clob" 0 0 7203 NULL true 10 NULL
+7197 "pu" "clob" 0 0 7203 NULL true 11 NULL
+7198 "sm" "clob" 0 0 7203 NULL true 12 NULL
+7205 "id" "clob" 0 0 7215 NULL false 0 NULL
+7206 "file_id" "bigint" 64 0 7215 NULL false
1 NULL
+7207 "pn" "clob" 0 0 7215 NULL true 2 NULL
+7208 "cl" "clob" 0 0 7215 NULL true 3 NULL
+7209 "pp" "clob" 0 0 7215 NULL true 4 NULL
+7210 "vn" "clob" 0 0 7215 NULL true 5 NULL
+7217 "qname" "clob" 0 0 7228 NULL false 0 NULL
+7218 "flag" "smallint" 16 0 7228 NULL false 1
NULL
+7219 "rname" "clob" 0 0 7228 NULL false 2 NULL
+7220 "pos" "int" 32 0 7228 NULL false 3 NULL
+7221 "mapq" "smallint" 16 0 7228 NULL false 4
NULL
+7222 "cigar" "clob" 0 0 7228 NULL false 5 NULL
+7223 "rnext" "clob" 0 0 7228 NULL false 6 NULL
+7224 "pnext" "int" 32 0 7228 NULL false 7 NULL
+7225 "tlen" "int" 32 0 7228 NULL false 8 NULL
+7226 "seq" "clob" 0 0 7228 NULL false 9 NULL
+7227 "qual" "clob" 0 0 7228 NULL false 10 NULL
+7309 "function_id" "int" 32 0 7310 NULL true 0
NULL
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
