Changeset: 6bdc322393fe for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6bdc322393fe
Modified Files:
clients/Tests/SQL-dump.stable.out
clients/Tests/SQL-dump.stable.out.int128
monetdb5/modules/mal/Makefile.ag
monetdb5/modules/mal/mosaic_frame.c
sql/backends/monet5/sql.mal
sql/test/Tests/setoptimizer.stable.err
sql/test/Tests/setoptimizer.stable.out
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
sql/test/leaks/Tests/drop3.stable.out.int128
sql/test/leaks/Tests/select1.stable.out
sql/test/leaks/Tests/select1.stable.out.int128
sql/test/leaks/Tests/select2.stable.out
sql/test/leaks/Tests/select2.stable.out.int128
sql/test/leaks/Tests/temp1.stable.out
sql/test/leaks/Tests/temp1.stable.out.int128
sql/test/leaks/Tests/temp2.stable.out
sql/test/leaks/Tests/temp2.stable.out.int128
sql/test/leaks/Tests/temp3.stable.out
sql/test/leaks/Tests/temp3.stable.out.int128
Branch: mosaic
Log Message:
Approve output
diffs (truncated from 15132 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
@@ -60,6 +60,7 @@ Ready.
SYSTEM SCHEMA bam
SYSTEM SCHEMA json
+SYSTEM SCHEMA mosaic
SYSTEM SCHEMA sys
SYSTEM SCHEMA tmp
SYSTEM TABLE sys._columns
@@ -155,6 +156,7 @@ SYSTEM FUNCTION sys.equals
SYSTEM FUNCTION sys.evalalgebra
SYSTEM FUNCTION sys.fitsattach
SYSTEM FUNCTION sys.fitsload
+SYSTEM FUNCTION sys.flush_log
SYSTEM FUNCTION sys.fuse
SYSTEM FUNCTION sys.generate_series
SYSTEM FUNCTION sys.geomcollectionfromtext
@@ -474,13 +476,13 @@ create function "abbrev" (p inet) return
external name inet."abbrev";
create function alpha(pdec double, pradius double)
returns double external name sql.alpha;
-create procedure analyze(minmax int, "sample" bigint)
+create procedure sys.analyze(minmax int, "sample" bigint)
external name sql.analyze;
-create procedure analyze(minmax int, "sample" bigint, sch string)
+create procedure sys.analyze(minmax int, "sample" bigint, sch string)
external name sql.analyze;
-create procedure analyze(minmax int, "sample" bigint, sch string, tbl string)
+create procedure sys.analyze(minmax int, "sample" bigint, sch string, tbl
string)
external name sql.analyze;
-create procedure analyze(minmax int, "sample" bigint, sch string, tbl string,
col string)
+create procedure sys.analyze(minmax int, "sample" bigint, sch string, tbl
string, col string)
external name sql.analyze;
-- ogc Spatial Analysis methods
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
@@ -52,6 +52,7 @@ Ready.
SYSTEM SCHEMA bam
SYSTEM SCHEMA json
+SYSTEM SCHEMA mosaic
SYSTEM SCHEMA sys
SYSTEM SCHEMA tmp
SYSTEM TABLE sys._columns
@@ -147,6 +148,7 @@ SYSTEM FUNCTION sys.equals
SYSTEM FUNCTION sys.evalalgebra
SYSTEM FUNCTION sys.fitsattach
SYSTEM FUNCTION sys.fitsload
+SYSTEM FUNCTION sys.flush_log
SYSTEM FUNCTION sys.fuse
SYSTEM FUNCTION sys.generate_series
SYSTEM FUNCTION sys.geomcollectionfromtext
@@ -183,6 +185,7 @@ SYSTEM FUNCTION sys.like
SYSTEM FUNCTION sys.linefromtext
SYSTEM FUNCTION sys.listdir
SYSTEM FUNCTION sys.listdirpat
+SYSTEM FUNCTION sys.malfunctions
SYSTEM FUNCTION sys.masklen
SYSTEM FUNCTION sys.mbr
SYSTEM FUNCTION sys.mbroverlaps
@@ -465,13 +468,13 @@ create function "abbrev" (p inet) return
external name inet."abbrev";
create function alpha(pdec double, pradius double)
returns double external name sql.alpha;
-create procedure analyze(minmax int, "sample" bigint)
+create procedure sys.analyze(minmax int, "sample" bigint)
external name sql.analyze;
-create procedure analyze(minmax int, "sample" bigint, sch string)
+create procedure sys.analyze(minmax int, "sample" bigint, sch string)
external name sql.analyze;
-create procedure analyze(minmax int, "sample" bigint, sch string, tbl string)
+create procedure sys.analyze(minmax int, "sample" bigint, sch string, tbl
string)
external name sql.analyze;
-create procedure analyze(minmax int, "sample" bigint, sch string, tbl string,
col string)
+create procedure sys.analyze(minmax int, "sample" bigint, sch string, tbl
string, col string)
external name sql.analyze;
-- ogc Spatial Analysis methods
@@ -479,7 +482,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)
@@ -1513,235 +1516,235 @@ 2149 "statement" "varchar" 2048 0
2139 N
2151 "id" "int" 32 0 2150 NULL true 0 NULL
2152 "name" "varchar" 1024 0 2150 NULL true 1
NULL
2153 "nr" "int" 32 0 2150 NULL true 2 NULL
-5660 "id" "int" 32 0 5659 NULL true 0 NULL
-5661 "name" "varchar" 1024 0 5659 NULL true 1
NULL
-5662 "schema_id" "int" 32 0 5659 NULL true 2
NULL
-5663 "query" "varchar" 2048 0 5659 NULL true 3
NULL
-5664 "type" "smallint" 16 0 5659 NULL true 4
NULL
-5665 "system" "boolean" 1 0 5659 NULL true
5 NULL
-5666 "commit_action" "smallint" 16 0 5659 NULL true
6 NULL
-5667 "access" "smallint" 16 0 5659 NULL true
7 NULL
-5668 "temporary" "smallint" 16 0 5659 NULL true
8 NULL
-5670 "id" "int" 32 0 5669 NULL true 0 NULL
-5671 "name" "varchar" 1024 0 5669 NULL true 1
NULL
-5672 "type" "varchar" 1024 0 5669 NULL true 2
NULL
-5673 "type_digits" "int" 32 0 5669 NULL true 3
NULL
-5674 "type_scale" "int" 32 0 5669 NULL true 4
NULL
-5675 "table_id" "int" 32 0 5669 NULL true 5
NULL
-5676 "default" "varchar" 2048 0 5669 NULL true
6 NULL
-5677 "null" "boolean" 1 0 5669 NULL true 7
NULL
-5678 "number" "int" 32 0 5669 NULL true 8
NULL
-5679 "storage" "varchar" 2048 0 5669 NULL true
9 NULL
-5686 "name" "varchar" 1024 0 5685 NULL true 0
NULL
-5687 "fullname" "varchar" 2048 0 5685 NULL true
1 NULL
-5688 "default_schema" "int" 9 0 5685 NULL true
2 NULL
-5692 "name" "varchar" 1024 0 5691 NULL true 0
NULL
-5693 "fullname" "varchar" 2024 0 5691 NULL true
1 NULL
-5694 "default_schema" "int" 9 0 5691 NULL true
2 NULL
-5696 "login_id" "int" 32 0 5695 NULL true 0
NULL
-5697 "role_id" "int" 32 0 5695 NULL true 1
NULL
-5699 "id" "int" 32 0 5698 NULL true 0 NULL
-5700 "name" "varchar" 1024 0 5698 NULL true 1
NULL
-5701 "grantor" "int" 32 0 5698 NULL true 2
NULL
-5703 "obj_id" "int" 32 0 5702 NULL true 0
NULL
-5704 "auth_id" "int" 32 0 5702 NULL true 1
NULL
-5705 "privileges" "int" 32 0 5702 NULL true 2
NULL
-5706 "grantor" "int" 32 0 5702 NULL true 3
NULL
-5707 "grantable" "int" 32 0 5702 NULL true 4
NULL
-5916 "id" "oid" 63 0 5924 NULL true 0 NULL
-5917 "owner" "clob" 0 0 5924 NULL true 1 NULL
-5918 "defined" "timestamp" 7 0 5924 NULL true
2 NULL
-5919 "query" "clob" 0 0 5924 NULL true 3 NULL
-5920 "pipe" "clob" 0 0 5924 NULL true 4 NULL
-5921 "plan" "clob" 0 0 5924 NULL true 5 NULL
-5922 "mal" "int" 32 0 5924 NULL true 6 NULL
-5923 "optimize" "bigint" 64 0 5924 NULL true
7 NULL
-5926 "id" "oid" 63 0 5935 NULL true 0 NULL
-5927 "start" "timestamp" 7 0 5935 NULL true 1
NULL
-5928 "stop" "timestamp" 7 0 5935 NULL true 2
NULL
-5929 "arguments" "clob" 0 0 5935 NULL true 3
NULL
-5930 "tuples" "wrd" 64 0 5935 NULL true 4
NULL
-5931 "run" "bigint" 64 0 5935 NULL true 5
NULL
-5932 "ship" "bigint" 64 0 5935 NULL true 6
NULL
-5933 "cpu" "int" 32 0 5935 NULL true 7 NULL
-5934 "io" "int" 32 0 5935 NULL true 8 NULL
-5937 "id" "oid" 63 0 5953 NULL true 0 NULL
-5938 "owner" "clob" 0 0 5953 NULL true 1 NULL
-5939 "defined" "timestamp" 7 0 5953 NULL true
2 NULL
-5940 "query" "clob" 0 0 5953 NULL true 3 NULL
-5941 "pipe" "clob" 0 0 5953 NULL true 4 NULL
-5942 "plan" "clob" 0 0 5953 NULL true 5 NULL
-5943 "mal" "int" 32 0 5953 NULL true 6 NULL
-5944 "optimize" "bigint" 64 0 5953 NULL true
7 NULL
-5945 "start" "timestamp" 7 0 5953 NULL true 8
NULL
-5946 "stop" "timestamp" 7 0 5953 NULL true 9
NULL
-5947 "arguments" "clob" 0 0 5953 NULL true 10
NULL
-5948 "tuples" "wrd" 64 0 5953 NULL true 11
NULL
-5949 "run" "bigint" 64 0 5953 NULL true 12
NULL
-5950 "ship" "bigint" 64 0 5953 NULL true 13
NULL
-5951 "cpu" "int" 32 0 5953 NULL true 14 NULL
-5952 "io" "int" 32 0 5953 NULL true 15 NULL
-5979 "event" "int" 32 0 5992 NULL true 0 NULL
-5980 "clk" "varchar" 20 0 5992 NULL true 1
NULL
-5981 "pc" "varchar" 50 0 5992 NULL true 2
NULL
-5982 "thread" "int" 32 0 5992 NULL true 3
NULL
-5983 "ticks" "bigint" 64 0 5992 NULL true 4
NULL
-5984 "rrsmb" "bigint" 64 0 5992 NULL true 5
NULL
-5985 "vmmb" "bigint" 64 0 5992 NULL true 6
NULL
-5986 "reads" "bigint" 64 0 5992 NULL true 7
NULL
-5987 "writes" "bigint" 64 0 5992 NULL true
8 NULL
-5988 "minflt" "bigint" 64 0 5992 NULL true
9 NULL
-5989 "majflt" "bigint" 64 0 5992 NULL true
10 NULL
-5990 "nvcsw" "bigint" 64 0 5992 NULL true 11
NULL
-5991 "stmt" "clob" 0 0 5992 NULL true 12 NULL
-6126 "user" "clob" 0 0 6132 NULL true 0 NULL
-6127 "login" "timestamp" 7 0 6132 NULL true 1
NULL
-6128 "sessiontimeout" "bigint" 64 0 6132 NULL
true 2 NULL
-6129 "lastcommand" "timestamp" 7 0 6132 NULL true
3 NULL
-6130 "querytimeout" "bigint" 64 0 6132 NULL true
4 NULL
-6131 "active" "boolean" 1 0 6132 NULL true
5 NULL
-6209 "name" "clob" 0 0 6212 NULL true 0 NULL
-6210 "def" "clob" 0 0 6212 NULL true 1 NULL
-6211 "status" "clob" 0 0 6212 NULL true 2
NULL
-6218 "name" "clob" 0 0 6220 NULL true 0 NULL
-6219 "value" "clob" 0 0 6220 NULL true 1 NULL
-6250 "qtag" "bigint" 64 0 6258 NULL true 0
NULL
-6251 "user" "clob" 0 0 6258 NULL true 1 NULL
-6252 "started" "timestamp" 7 0 6258 NULL true
2 NULL
-6253 "estimate" "timestamp" 7 0 6258 NULL true
3 NULL
-6254 "progress" "int" 32 0 6258 NULL true 4
NULL
-6255 "status" "clob" 0 0 6258 NULL true 5
NULL
-6256 "tag" "oid" 63 0 6258 NULL true 6 NULL
-6257 "query" "clob" 0 0 6258 NULL true 7 NULL
-6284 "rowid" "bigint" 64 0 6288 NULL true 0
NULL
-6285 "fldid" "int" 32 0 6288 NULL true 1 NULL
-6286 "message" "clob" 0 0 6288 NULL true 2
NULL
-6287 "input" "clob" 0 0 6288 NULL true 3 NULL
-6943 "keyword" "varchar" 40 0 6946 NULL false
0 NULL
-6948 "table_type_id" "smallint" 16 0 6954 NULL false
0 NULL
-6951 "table_type_name" "varchar" 25 0 6954 NULL
false 1 NULL
-6956 "dependency_type_id" "smallint" 16 0 6962 NULL
false 0 NULL
-6959 "dependency_type_name" "varchar" 15 0 6962 NULL
false 1 NULL
-6977 "file_id" "int" 32 0 6979 NULL true 0
NULL
-6978 "location" "char" 256 0 6979 NULL true 1
NULL
-6981 "dim_id" "int" 32 0 6985 NULL true 0
NULL
-6982 "file_id" "int" 32 0 6985 NULL true 1
NULL
-6983 "name" "varchar" 64 0 6985 NULL true 2
NULL
-6984 "length" "int" 32 0 6985 NULL true 3
NULL
-6987 "var_id" "int" 32 0 6993 NULL true 0
NULL
-6988 "file_id" "int" 32 0 6993 NULL true 1
NULL
-6989 "name" "varchar" 64 0 6993 NULL true 2
NULL
-6990 "vartype" "varchar" 64 0 6993 NULL true
3 NULL
-6991 "ndim" "int" 32 0 6993 NULL true 4 NULL
-6992 "coord_dim_id" "int" 32 0 6993 NULL true 5
NULL
-6995 "var_id" "int" 32 0 6999 NULL true 0
NULL
-6996 "dim_id" "int" 32 0 6999 NULL true 1
NULL
-6997 "file_id" "int" 32 0 6999 NULL true 2
NULL
-6998 "dimpos" "int" 32 0 6999 NULL true 3
NULL
-7001 "obj_name" "varchar" 256 0 7007 NULL true
0 NULL
-7002 "att_name" "varchar" 256 0 7007 NULL true
1 NULL
-7003 "att_type" "varchar" 64 0 7007 NULL true
2 NULL
-7004 "value" "clob" 0 0 7007 NULL true 3 NULL
-7005 "file_id" "int" 32 0 7007 NULL true 4
NULL
-7006 "gr_name" "varchar" 256 0 7007 NULL true
5 NULL
-7033 "schema" "clob" 0 0 7048 NULL true 0
NULL
-7034 "table" "clob" 0 0 7048 NULL true 1 NULL
-7035 "column" "clob" 0 0 7048 NULL true 2
NULL
-7036 "type" "clob" 0 0 7048 NULL true 3 NULL
-7037 "mode" "clob" 0 0 7048 NULL true 4 NULL
-7038 "location" "clob" 0 0 7048 NULL true 5
NULL
-7039 "count" "bigint" 64 0 7048 NULL true 6
NULL
-7040 "typewidth" "int" 32 0 7048 NULL true 7
NULL
-7041 "columnsize" "bigint" 64 0 7048 NULL true
8 NULL
-7042 "heapsize" "bigint" 64 0 7048 NULL true
9 NULL
-7043 "hashes" "bigint" 64 0 7048 NULL true
10 NULL
-7044 "phash" "boolean" 1 0 7048 NULL true 11
NULL
-7045 "imprints" "bigint" 64 0 7048 NULL true
12 NULL
-7046 "sorted" "boolean" 1 0 7048 NULL true
13 NULL
-7047 "compress" "boolean" 1 0 7048 NULL true
14 NULL
-7050 "schema" "clob" 0 0 7060 NULL true 0
NULL
-7051 "table" "clob" 0 0 7060 NULL true 1 NULL
-7052 "column" "clob" 0 0 7060 NULL true 2
NULL
-7053 "type" "clob" 0 0 7060 NULL true 3 NULL
-7054 "typewidth" "int" 32 0 7060 NULL true 4
NULL
-7055 "count" "bigint" 64 0 7060 NULL true 5
NULL
-7056 "distinct" "bigint" 64 0 7060 NULL true
6 NULL
-7057 "atomwidth" "int" 32 0 7060 NULL true 7
NULL
-7058 "reference" "boolean" 1 0 7060 NULL true
8 NULL
-7059 "sorted" "boolean" 1 0 7060 NULL true
9 NULL
-7098 "schema" "clob" 0 0 7108 NULL true 0
NULL
-7099 "table" "clob" 0 0 7108 NULL true 1 NULL
-7100 "column" "clob" 0 0 7108 NULL true 2
NULL
-7101 "type" "clob" 0 0 7108 NULL true 3 NULL
-7102 "count" "bigint" 64 0 7108 NULL true 4
NULL
-7103 "columnsize" "bigint" 64 0 7108 NULL true
5 NULL
-7104 "heapsize" "bigint" 64 0 7108 NULL true
6 NULL
-7105 "hashes" "bigint" 64 0 7108 NULL true
7 NULL
-7106 "imprints" "bigint" 64 0 7108 NULL true
8 NULL
-7107 "sorted" "boolean" 1 0 7108 NULL true
9 NULL
-7110 "schema" "clob" 0 0 7118 NULL true 0
NULL
-7111 "table" "clob" 0 0 7118 NULL true 1 NULL
-7112 "count" "bigint" 64 0 7118 NULL true 2
NULL
-7113 "columnsize" "hugeint" 128 0 7118 NULL true
3 NULL
-7114 "heapsize" "hugeint" 128 0 7118 NULL true
4 NULL
-7115 "hashes" "hugeint" 128 0 7118 NULL true
5 NULL
-7116 "imprints" "hugeint" 128 0 7118 NULL true
6 NULL
-7117 "auxiliary" "hugeint" 128 0 7118 NULL true
7 NULL
-7120 "column_id" "int" 32 0 7131 NULL true 0
NULL
-7121 "type" "clob" 0 0 7131 NULL true 1 NULL
-7122 "width" "int" 32 0 7131 NULL true 2 NULL
-7123 "stamp" "timestamp" 7 0 7131 NULL true 3
NULL
-7124 "sample" "bigint" 64 0 7131 NULL true
4 NULL
-7125 "count" "bigint" 64 0 7131 NULL true 5
NULL
-7126 "unique" "bigint" 64 0 7131 NULL true
6 NULL
-7127 "nils" "bigint" 64 0 7131 NULL true 7
NULL
-7128 "minval" "clob" 0 0 7131 NULL true 8
NULL
-7129 "maxval" "clob" 0 0 7131 NULL true 9
NULL
-7130 "sorted" "boolean" 1 0 7131 NULL true
10 NULL
-7221 "file_id" "bigint" 64 0 7229 NULL false
0 NULL
-7222 "file_location" "clob" 0 0 7229 NULL false 1
NULL
-7223 "dbschema" "smallint" 16 0 7229 NULL false
2 NULL
-7224 "format_version" "varchar" 7 0 7229 NULL
true 3 NULL
-7225 "sorting_order" "varchar" 10 0 7229 NULL true
4 NULL
-7226 "comments" "clob" 0 0 7229 NULL true 5
NULL
-7231 "sn" "clob" 0 0 7242 NULL false 0 NULL
-7232 "file_id" "bigint" 64 0 7242 NULL false
1 NULL
-7233 "ln" "int" 32 0 7242 NULL true 2 NULL
-7234 "as" "int" 32 0 7242 NULL true 3 NULL
-7235 "m5" "clob" 0 0 7242 NULL true 4 NULL
-7236 "sp" "clob" 0 0 7242 NULL true 5 NULL
-7237 "ur" "clob" 0 0 7242 NULL true 6 NULL
-7244 "id" "clob" 0 0 7261 NULL false 0 NULL
-7245 "file_id" "bigint" 64 0 7261 NULL false
1 NULL
-7246 "cn" "clob" 0 0 7261 NULL true 2 NULL
-7247 "ds" "clob" 0 0 7261 NULL true 3 NULL
-7248 "dt" "timestamp" 7 0 7261 NULL true 4
NULL
-7249 "fo" "clob" 0 0 7261 NULL true 5 NULL
-7250 "ks" "clob" 0 0 7261 NULL true 6 NULL
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list