Changeset: 98aa7ac3a43e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=98aa7ac3a43e
Added Files:
monetdb5/modules/mal/Tests/imprints.mal
monetdb5/modules/mal/Tests/imprints.stable.err
monetdb5/modules/mal/Tests/imprints.stable.out
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/SQL-dump.stable.out
clients/Tests/exports.stable.out
gdk/gdk.h
gdk/gdk_imprints.c
monetdb5/modules/mal/Tests/All
monetdb5/modules/mal/batExtensions.c
monetdb5/modules/mal/batExtensions.h
monetdb5/modules/mal/batExtensions.mal
sql/backends/monet5/sql.c
Branch: default
Log Message:
Open up the imprints functionality
Allow explicit creation of the imprint at the MAL level
and return the imprint storate overhead as part of the
indices in SQL storage model.
diffs (truncated from 11735 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
@@ -31844,6 +31844,20 @@ command bat.hasAppendMode(b:bat[:any_1,:
address BKChasAppendMode;
comment return true if to this BAT is append only.
+command bat.imprints(b:bat[:oid,:dbl]):void
+address CMDBATimprints;
+comment Check/create an imprint index on the BAT
+
+command bat.imprints(b:bat[:oid,:flt]):void
+address CMDBATimprints;
+command bat.imprints(b:bat[:oid,:lng]):void
+address CMDBATimprints;
+command bat.imprints(b:bat[:oid,:int]):void
+address CMDBATimprints;
+command bat.imprints(b:bat[:oid,:sht]):void
+address CMDBATimprints;
+command bat.imprints(b:bat[:oid,:bte]):void
+address CMDBATimprints;
command bat.intersectcand(a:bat[:oid,:oid],b:bat[:oid,:oid]):bat[:oid,:oid]
address BKCintersectcand;
comment Intersect two candidate lists into one
@@ -31953,11 +31967,11 @@ address BKCorder;
comment Sorts the BAT itself on the head, in place.
pattern bat.partition(b:bat[:oid,:any_1],pieces:int,n:int):bat[:oid,:any_1]
-address CMDbatpartition2;
+address CMDBATpartition2;
comment Create the n-th slice over the BAT broken into severral pieces.
pattern bat.partition(b:bat[:oid,:any_1]):bat[:oid,:any_1]...
-address CMDbatpartition;
+address CMDBATpartition;
comment Create a serie of slices over the BAT argument. The BUNs are
distributed evenly.
command bat.reuseMap(b:bat[:oid,:any_1],del:bat[:oid,:oid]):bat[:oid,:oid]
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
@@ -270,6 +270,7 @@ CREATE TABLE "sys"."args" (
"type" VARCHAR(1024),
"type_digits" INTEGER,
"type_scale" INTEGER,
+ "inout" TINYINT,
"number" INTEGER
);
CREATE TABLE "sys"."auths" (
@@ -305,6 +306,8 @@ CREATE TABLE "sys"."functions" (
"sql" BOOLEAN,
"type" INTEGER,
"side_effect" BOOLEAN,
+ "varres" BOOLEAN,
+ "vararg" BOOLEAN,
"schema_id" INTEGER
);
CREATE TABLE "sys"."idxs" (
@@ -465,7 +468,7 @@ create function sys.bbp ()
ttype string, count bigint, refcnt int, lrefcnt int,
location string, heat int, dirty string,
status string, kind string)
- external name sql.bbp;
+ external name bbp.get;
create function boundary(g geometry) returns geometry external name
geom."Boundary";
create function "broadcast" (p inet) returns inet
external name inet."broadcast";
@@ -1500,7 +1503,7 @@ CREATE TABLE "sys"."_columns" (
"number" INTEGER,
"storage" VARCHAR(2048)
);
-COPY 419 RECORDS INTO "sys"."_columns" FROM stdin USING DELIMITERS
'\t','\n','"';
+COPY 283 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
@@ -1521,405 +1524,269 @@ 2020 "mod" "varchar" 8196 0 2016
NULL tr
2021 "sql" "boolean" 1 0 2016 NULL true 4
NULL
2022 "type" "int" 32 0 2016 NULL true 5 NULL
2023 "side_effect" "boolean" 1 0 2016 NULL true
6 NULL
-2024 "schema_id" "int" 32 0 2016 NULL true 7
NULL
-2026 "id" "int" 32 0 2025 NULL true 0 NULL
-2027 "func_id" "int" 32 0 2025 NULL true 1
NULL
-2028 "name" "varchar" 256 0 2025 NULL true 2
NULL
-2029 "type" "varchar" 1024 0 2025 NULL true 3
NULL
-2030 "type_digits" "int" 32 0 2025 NULL true 4
NULL
-2031 "type_scale" "int" 32 0 2025 NULL true 5
NULL
-2032 "number" "int" 32 0 2025 NULL true 6
NULL
-2034 "id" "int" 32 0 2033 NULL true 0 NULL
-2035 "schema_id" "int" 32 0 2033 NULL true 1
NULL
-2036 "name" "varchar" 256 0 2033 NULL true 2
NULL
-2037 "start" "bigint" 64 0 2033 NULL true 3
NULL
-2038 "minvalue" "bigint" 64 0 2033 NULL true
4 NULL
-2039 "maxvalue" "bigint" 64 0 2033 NULL true
5 NULL
-2040 "increment" "bigint" 64 0 2033 NULL true
6 NULL
-2041 "cacheinc" "bigint" 64 0 2033 NULL true
7 NULL
-2042 "cycle" "boolean" 1 0 2033 NULL true 8
NULL
-2044 "id" "int" 32 0 2043 NULL true 0 NULL
-2045 "depend_id" "int" 32 0 2043 NULL true 1
NULL
-2046 "depend_type" "smallint" 16 0 2043 NULL true
2 NULL
-2048 "id" "int" 32 0 2047 NULL true 0 NULL
-2049 "server" "char" 1024 0 2047 NULL true 1
NULL
-2050 "port" "int" 32 0 2047 NULL true 2 NULL
-2051 "db" "char" 64 0 2047 NULL true 3 NULL
-2052 "db_alias" "char" 1024 0 2047 NULL true 4
NULL
-2053 "user" "char" 1024 0 2047 NULL true 5 NULL
-2054 "password" "char" 1024 0 2047 NULL true 6
NULL
-2055 "language" "char" 1024 0 2047 NULL true 7
NULL
-2057 "id" "int" 32 0 2056 NULL true 0 NULL
-2058 "name" "varchar" 1024 0 2056 NULL true 1
NULL
-2059 "schema_id" "int" 32 0 2056 NULL true 2
NULL
-2060 "query" "varchar" 2048 0 2056 NULL true 3
NULL
-2061 "type" "smallint" 16 0 2056 NULL true 4
NULL
-2062 "system" "boolean" 1 0 2056 NULL true
5 NULL
-2063 "commit_action" "smallint" 16 0 2056 NULL true
6 NULL
-2064 "readonly" "boolean" 1 0 2056 NULL true
7 NULL
-2066 "id" "int" 32 0 2065 NULL true 0 NULL
-2067 "name" "varchar" 1024 0 2065 NULL true 1
NULL
-2068 "type" "varchar" 1024 0 2065 NULL true 2
NULL
-2069 "type_digits" "int" 32 0 2065 NULL true 3
NULL
-2070 "type_scale" "int" 32 0 2065 NULL true 4
NULL
-2071 "table_id" "int" 32 0 2065 NULL true 5
NULL
-2072 "default" "varchar" 2048 0 2065 NULL true
6 NULL
-2073 "null" "boolean" 1 0 2065 NULL true 7
NULL
-2074 "number" "int" 32 0 2065 NULL true 8
NULL
-2075 "storage" "varchar" 2048 0 2065 NULL true
9 NULL
-2077 "id" "int" 32 0 2076 NULL true 0 NULL
-2078 "table_id" "int" 32 0 2076 NULL true 1
NULL
-2079 "type" "int" 32 0 2076 NULL true 2 NULL
-2080 "name" "varchar" 1024 0 2076 NULL true 3
NULL
-2081 "rkey" "int" 32 0 2076 NULL true 4 NULL
-2082 "action" "int" 32 0 2076 NULL true 5
NULL
-2084 "id" "int" 32 0 2083 NULL true 0 NULL
-2085 "table_id" "int" 32 0 2083 NULL true 1
NULL
-2086 "type" "int" 32 0 2083 NULL true 2 NULL
-2087 "name" "varchar" 1024 0 2083 NULL true 3
NULL
-2089 "id" "int" 32 0 2088 NULL true 0 NULL
-2090 "name" "varchar" 1024 0 2088 NULL true 1
NULL
-2091 "table_id" "int" 32 0 2088 NULL true 2
NULL
-2092 "time" "smallint" 16 0 2088 NULL true 3
NULL
-2093 "orientation" "smallint" 16 0 2088 NULL true
4 NULL
-2094 "event" "smallint" 16 0 2088 NULL true 5
NULL
-2095 "old_name" "varchar" 1024 0 2088 NULL true
6 NULL
-2096 "new_name" "varchar" 1024 0 2088 NULL true
7 NULL
-2097 "condition" "varchar" 2048 0 2088 NULL true
8 NULL
-2098 "statement" "varchar" 2048 0 2088 NULL true
9 NULL
-2100 "id" "int" 32 0 2099 NULL true 0 NULL
-2101 "name" "varchar" 1024 0 2099 NULL true 1
NULL
-2102 "nr" "int" 32 0 2099 NULL true 2 NULL
-2105 "id" "int" 32 0 2104 NULL true 0 NULL
-2106 "name" "varchar" 1024 0 2104 NULL true 1
NULL
-2107 "schema_id" "int" 32 0 2104 NULL true 2
NULL
-2108 "query" "varchar" 2048 0 2104 NULL true 3
NULL
-2109 "type" "smallint" 16 0 2104 NULL true 4
NULL
-2110 "system" "boolean" 1 0 2104 NULL true
5 NULL
-2111 "commit_action" "smallint" 16 0 2104 NULL true
6 NULL
-2112 "readonly" "boolean" 1 0 2104 NULL true
7 NULL
-2114 "id" "int" 32 0 2113 NULL true 0 NULL
-2115 "name" "varchar" 1024 0 2113 NULL true 1
NULL
-2116 "type" "varchar" 1024 0 2113 NULL true 2
NULL
-2117 "type_digits" "int" 32 0 2113 NULL true 3
NULL
-2118 "type_scale" "int" 32 0 2113 NULL true 4
NULL
-2119 "table_id" "int" 32 0 2113 NULL true 5
NULL
-2120 "default" "varchar" 2048 0 2113 NULL true
6 NULL
-2121 "null" "boolean" 1 0 2113 NULL true 7
NULL
-2122 "number" "int" 32 0 2113 NULL true 8
NULL
-2123 "storage" "varchar" 2048 0 2113 NULL true
9 NULL
-2125 "id" "int" 32 0 2124 NULL true 0 NULL
-2126 "table_id" "int" 32 0 2124 NULL true 1
NULL
-2127 "type" "int" 32 0 2124 NULL true 2 NULL
-2128 "name" "varchar" 1024 0 2124 NULL true 3
NULL
-2129 "rkey" "int" 32 0 2124 NULL true 4 NULL
-2130 "action" "int" 32 0 2124 NULL true 5
NULL
-2132 "id" "int" 32 0 2131 NULL true 0 NULL
-2133 "table_id" "int" 32 0 2131 NULL true 1
NULL
-2134 "type" "int" 32 0 2131 NULL true 2 NULL
-2135 "name" "varchar" 1024 0 2131 NULL true 3
NULL
-2137 "id" "int" 32 0 2136 NULL true 0 NULL
-2138 "name" "varchar" 1024 0 2136 NULL true 1
NULL
-2139 "table_id" "int" 32 0 2136 NULL true 2
NULL
-2140 "time" "smallint" 16 0 2136 NULL true 3
NULL
-2141 "orientation" "smallint" 16 0 2136 NULL true
4 NULL
-2142 "event" "smallint" 16 0 2136 NULL true 5
NULL
-2143 "old_name" "varchar" 1024 0 2136 NULL true
6 NULL
-2144 "new_name" "varchar" 1024 0 2136 NULL true
7 NULL
-2145 "condition" "varchar" 2048 0 2136 NULL true
8 NULL
-2146 "statement" "varchar" 2048 0 2136 NULL true
9 NULL
-2148 "id" "int" 32 0 2147 NULL true 0 NULL
-2149 "name" "varchar" 1024 0 2147 NULL true 1
NULL
-2150 "nr" "int" 32 0 2147 NULL true 2 NULL
-5079 "id" "int" 32 0 5078 NULL true 0 NULL
-5080 "name" "varchar" 1024 0 5078 NULL true 1
NULL
-5081 "schema_id" "int" 32 0 5078 NULL true 2
NULL
-5082 "query" "varchar" 2048 0 5078 NULL true 3
NULL
-5083 "type" "smallint" 16 0 5078 NULL true 4
NULL
-5084 "system" "boolean" 1 0 5078 NULL true
5 NULL
-5085 "commit_action" "smallint" 16 0 5078 NULL true
6 NULL
-5086 "readonly" "boolean" 1 0 5078 NULL true
7 NULL
-5087 "temporary" "smallint" 16 0 5078 NULL true
8 NULL
-5089 "id" "int" 32 0 5088 NULL true 0 NULL
-5090 "name" "varchar" 1024 0 5088 NULL true 1
NULL
-5091 "type" "varchar" 1024 0 5088 NULL true 2
NULL
-5092 "type_digits" "int" 32 0 5088 NULL true 3
NULL
-5093 "type_scale" "int" 32 0 5088 NULL true 4
NULL
-5094 "table_id" "int" 32 0 5088 NULL true 5
NULL
-5095 "default" "varchar" 2048 0 5088 NULL true
6 NULL
-5096 "null" "boolean" 1 0 5088 NULL true 7
NULL
-5097 "number" "int" 32 0 5088 NULL true 8
NULL
-5098 "storage_type" "int" 32 0 5088 NULL true 9
NULL
-5100 "name" "varchar" 1024 0 5099 NULL true 0
NULL
-5101 "value" "varchar" 2048 0 5099 NULL true 1
NULL
-5105 "name" "varchar" 1024 0 5104 NULL true 0
NULL
-5109 "name" "varchar" 1024 0 5108 NULL true 0
NULL
-5110 "fullname" "varchar" 2048 0 5108 NULL true
1 NULL
-5111 "default_schema" "int" 9 0 5108 NULL true
2 NULL
-5113 "name" "varchar" 2048 0 5112 NULL true 0
NULL
-5117 "name" "varchar" 1024 0 5116 NULL true 0
NULL
-5118 "fullname" "varchar" 2024 0 5116 NULL true
1 NULL
-5119 "default_schema" "int" 9 0 5116 NULL true
2 NULL
-5121 "login_id" "int" 32 0 5120 NULL true 0
NULL
-5122 "role_id" "int" 32 0 5120 NULL true 1
NULL
-5124 "id" "int" 32 0 5123 NULL true 0 NULL
-5125 "name" "varchar" 1024 0 5123 NULL true 1
NULL
-5126 "grantor" "int" 32 0 5123 NULL true 2
NULL
-5128 "obj_id" "int" 32 0 5127 NULL true 0
NULL
-5129 "auth_id" "int" 32 0 5127 NULL true 1
NULL
-5130 "privileges" "int" 32 0 5127 NULL true 2
NULL
-5131 "grantor" "int" 32 0 5127 NULL true 3
NULL
-5132 "grantable" "int" 32 0 5127 NULL true 4
NULL
-5272 "id" "oid" 63 0 5271 NULL true 0 NULL
-5273 "owner" "clob" 0 0 5271 NULL true 1 NULL
-5274 "defined" "timestamp" 7 0 5271 NULL true
2 NULL
-5275 "query" "clob" 0 0 5271 NULL true 3 NULL
-5276 "pipe" "clob" 0 0 5271 NULL true 4 NULL
-5277 "mal" "int" 32 0 5271 NULL true 5 NULL
-5278 "optimize" "bigint" 64 0 5271 NULL true
6 NULL
-5283 "id" "oid" 63 0 5282 NULL true 0 NULL
-5284 "start" "timestamp" 7 0 5282 NULL true 1
NULL
-5285 "stop" "timestamp" 7 0 5282 NULL true 2
NULL
-5286 "arguments" "clob" 0 0 5282 NULL true 3
NULL
-5287 "tuples" "wrd" 64 0 5282 NULL true 4
NULL
-5288 "run" "bigint" 64 0 5282 NULL true 5
NULL
-5289 "ship" "bigint" 64 0 5282 NULL true 6
NULL
-5290 "cpu" "int" 32 0 5282 NULL true 7 NULL
-5291 "io" "int" 32 0 5282 NULL true 8 NULL
-5292 "space" "bigint" 64 0 5282 NULL true 9
NULL
-5297 "id" "oid" 63 0 5304 NULL true 0 NULL
-5298 "owner" "clob" 0 0 5304 NULL true 1 NULL
-5299 "defined" "timestamp" 7 0 5304 NULL true
2 NULL
-5300 "query" "clob" 0 0 5304 NULL true 3 NULL
-5301 "pipe" "clob" 0 0 5304 NULL true 4 NULL
-5302 "mal" "int" 32 0 5304 NULL true 5 NULL
-5303 "optimize" "bigint" 64 0 5304 NULL true
6 NULL
-5306 "id" "oid" 63 0 5316 NULL true 0 NULL
-5307 "start" "timestamp" 7 0 5316 NULL true 1
NULL
-5308 "stop" "timestamp" 7 0 5316 NULL true 2
NULL
-5309 "arguments" "clob" 0 0 5316 NULL true 3
NULL
-5310 "tuples" "wrd" 64 0 5316 NULL true 4
NULL
-5311 "run" "bigint" 64 0 5316 NULL true 5
NULL
-5312 "ship" "bigint" 64 0 5316 NULL true 6
NULL
-5313 "cpu" "int" 32 0 5316 NULL true 7 NULL
-5314 "io" "int" 32 0 5316 NULL true 8 NULL
-5315 "space" "bigint" 64 0 5316 NULL true 9
NULL
-5318 "id" "oid" 63 0 5334 NULL true 0 NULL
-5319 "owner" "clob" 0 0 5334 NULL true 1 NULL
-5320 "defined" "timestamp" 7 0 5334 NULL true
2 NULL
-5321 "query" "clob" 0 0 5334 NULL true 3 NULL
-5322 "pipe" "clob" 0 0 5334 NULL true 4 NULL
-5323 "mal" "int" 32 0 5334 NULL true 5 NULL
-5324 "optimize" "bigint" 64 0 5334 NULL true
6 NULL
-5325 "start" "timestamp" 7 0 5334 NULL true 7
NULL
-5326 "stop" "timestamp" 7 0 5334 NULL true 8
NULL
-5327 "arguments" "clob" 0 0 5334 NULL true 9
NULL
-5328 "tuples" "wrd" 64 0 5334 NULL true 10
NULL
-5329 "run" "bigint" 64 0 5334 NULL true 11
NULL
-5330 "ship" "bigint" 64 0 5334 NULL true 12
NULL
-5331 "cpu" "int" 32 0 5334 NULL true 13 NULL
-5332 "space" "bigint" 64 0 5334 NULL true 14
NULL
-5333 "io" "int" 32 0 5334 NULL true 15 NULL
-5345 "event" "int" 32 0 5344 NULL true 0 NULL
-5346 "clk" "varchar" 20 0 5344 NULL true 1
NULL
-5347 "pc" "varchar" 50 0 5344 NULL true 2
NULL
-5348 "thread" "int" 32 0 5344 NULL true 3
NULL
-5349 "user" "int" 32 0 5344 NULL true 4 NULL
-5350 "ticks" "bigint" 64 0 5344 NULL true 5
NULL
-5351 "reads" "bigint" 64 0 5344 NULL true 6
NULL
-5352 "writes" "bigint" 64 0 5344 NULL true
7 NULL
-5353 "rbytes" "bigint" 64 0 5344 NULL true
8 NULL
-5354 "wbytes" "bigint" 64 0 5344 NULL true
9 NULL
-5355 "type" "clob" 0 0 5344 NULL true 10 NULL
-5356 "stmt" "clob" 0 0 5344 NULL true 11 NULL
-5361 "event" "int" 32 0 5373 NULL true 0 NULL
-5362 "clk" "varchar" 20 0 5373 NULL true 1
NULL
-5363 "pc" "varchar" 50 0 5373 NULL true 2
NULL
-5364 "thread" "int" 32 0 5373 NULL true 3
NULL
-5365 "user" "int" 32 0 5373 NULL true 4 NULL
-5366 "ticks" "bigint" 64 0 5373 NULL true 5
NULL
-5367 "reads" "bigint" 64 0 5373 NULL true 6
NULL
-5368 "writes" "bigint" 64 0 5373 NULL true
7 NULL
-5369 "rbytes" "bigint" 64 0 5373 NULL true
8 NULL
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
