Changeset: 0d96216a9bd3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0d96216a9bd3
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/SQL-dump.stable.out
clients/Tests/exports.stable.out
Branch: default
Log Message:
Approved new test output brought on by changing GDK/MAL/SQL interface for
quantiles
diffs (truncated from 2881 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
@@ -769,6 +769,23 @@ pattern aggr.prod(b:bat[:oid,:bte]):bte
address CMDBATprod;
comment Calculate aggregate product of B.
+function aggr.quantile(b:bat[:oid,:any_1],q:bat[:oid,:dbl]):any_1;
+command
aggr.quantile(b:bat[:oid,:any_1],g:bat[:oid,:oid],e:bat[:oid,:any_2],q:bat[:oid,:dbl]):bat[:oid,:any_1]
+address AGGRquantile3;
+comment Grouped quantile aggregate
+
+command
aggr.subquantile(b:bat[:oid,:any_1],q:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2],s:bat[:oid,:oid],skip_nils:bit):bat[:oid,:any_1]
+address AGGRsubquantilecand;
+comment Grouped median quantile with candidate list
+
+command
aggr.subquantile(b:bat[:oid,:any_1],q:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2],skip_nils:bit):bat[:oid,:any_1]
+address AGGRsubquantile;
+comment Grouped quantile aggregate
+
+command
aggr.subquantile(b:bat[:oid,:any_1],q:bat[:oid,:dbl],skip_nils:bit):bat[:oid,:any_1]
+address AGGRquantile;
+comment Quantile aggregate
+
command
aggr.submedian(b:bat[:oid,:any_1],g:bat[:oid,:oid],e:bat[:oid,:any_2],s:bat[:oid,:oid],skip_nils:bit):bat[:oid,:any_1]
address AGGRsubmediancand;
comment Grouped median aggregate with candidate list
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
@@ -201,6 +201,7 @@ SYSTEM FUNCTION sys.point
SYSTEM FUNCTION sys.pointfromtext
SYSTEM FUNCTION sys.polyfromtext
SYSTEM FUNCTION sys.polygonfromtext
+SYSTEM FUNCTION sys.quantile
SYSTEM FUNCTION sys.querycache
SYSTEM FUNCTION sys.querylog
SYSTEM FUNCTION sys.querylog_calls
@@ -835,6 +836,8 @@ create aggregate median(val wrd) returns
external name "aggr"."median";
create aggregate median(val bigint) returns bigint
external name "aggr"."median";
+create aggregate median(val decimal) returns decimal
+ external name "aggr"."median";
create aggregate median(val real) returns real
external name "aggr"."median";
create aggregate median(val double) returns double
@@ -1792,77 +1795,77 @@ 5693 "progress" "int" 32 0 5697
NULL tru
5694 "status" "clob" 0 0 5697 NULL true 5
NULL
5695 "tag" "oid" 63 0 5697 NULL true 6 NULL
5696 "query" "clob" 0 0 5697 NULL true 7 NULL
-6201 "schema" "clob" 0 0 6200 NULL true 0
NULL
-6202 "table" "clob" 0 0 6200 NULL true 1 NULL
-6203 "column" "clob" 0 0 6200 NULL true 2
NULL
-6204 "type" "clob" 0 0 6200 NULL true 3 NULL
-6205 "location" "clob" 0 0 6200 NULL true 4
NULL
-6206 "count" "bigint" 64 0 6200 NULL true 5
NULL
-6207 "typewidth" "int" 32 0 6200 NULL true 6
NULL
-6208 "columnsize" "bigint" 64 0 6200 NULL true
7 NULL
-6209 "heapsize" "bigint" 64 0 6200 NULL true
8 NULL
-6210 "indices" "bigint" 64 0 6200 NULL true
9 NULL
-6211 "sorted" "boolean" 1 0 6200 NULL true
10 NULL
-6216 "schema" "clob" 0 0 6227 NULL true 0
NULL
-6217 "table" "clob" 0 0 6227 NULL true 1 NULL
-6218 "column" "clob" 0 0 6227 NULL true 2
NULL
-6219 "type" "clob" 0 0 6227 NULL true 3 NULL
-6220 "location" "clob" 0 0 6227 NULL true 4
NULL
-6221 "count" "bigint" 64 0 6227 NULL true 5
NULL
-6222 "typewidth" "int" 32 0 6227 NULL true 6
NULL
-6223 "columnsize" "bigint" 64 0 6227 NULL true
7 NULL
-6224 "heapsize" "bigint" 64 0 6227 NULL true
8 NULL
-6225 "indices" "bigint" 64 0 6227 NULL true
9 NULL
-6226 "sorted" "boolean" 1 0 6227 NULL true
10 NULL
-6229 "schema" "clob" 0 0 6239 NULL true 0
NULL
-6230 "table" "clob" 0 0 6239 NULL true 1 NULL
-6231 "column" "clob" 0 0 6239 NULL true 2
NULL
-6232 "type" "clob" 0 0 6239 NULL true 3 NULL
-6233 "typewidth" "int" 32 0 6239 NULL true 4
NULL
-6234 "count" "bigint" 64 0 6239 NULL true 5
NULL
-6235 "distinct" "bigint" 64 0 6239 NULL true
6 NULL
-6236 "atomwidth" "int" 32 0 6239 NULL true 7
NULL
-6237 "reference" "boolean" 1 0 6239 NULL true
8 NULL
-6238 "sorted" "boolean" 1 0 6239 NULL true
9 NULL
6260 "schema" "clob" 0 0 6259 NULL true 0
NULL
6261 "table" "clob" 0 0 6259 NULL true 1 NULL
6262 "column" "clob" 0 0 6259 NULL true 2
NULL
6263 "type" "clob" 0 0 6259 NULL true 3 NULL
-6264 "count" "bigint" 64 0 6259 NULL true 4
NULL
-6265 "columnsize" "bigint" 64 0 6259 NULL true
5 NULL
-6266 "heapsize" "bigint" 64 0 6259 NULL true
6 NULL
-6267 "indices" "bigint" 64 0 6259 NULL true
7 NULL
-6268 "sorted" "boolean" 1 0 6259 NULL true
8 NULL
-6273 "schema" "clob" 0 0 6282 NULL true 0
NULL
-6274 "table" "clob" 0 0 6282 NULL true 1 NULL
-6275 "column" "clob" 0 0 6282 NULL true 2
NULL
-6276 "type" "clob" 0 0 6282 NULL true 3 NULL
-6277 "count" "bigint" 64 0 6282 NULL true 4
NULL
-6278 "columnsize" "bigint" 64 0 6282 NULL true
5 NULL
-6279 "heapsize" "bigint" 64 0 6282 NULL true
6 NULL
-6280 "indices" "bigint" 64 0 6282 NULL true
7 NULL
-6281 "sorted" "boolean" 1 0 6282 NULL true
8 NULL
-6284 "schema" "clob" 0 0 6291 NULL true 0
NULL
-6285 "table" "clob" 0 0 6291 NULL true 1 NULL
-6286 "count" "bigint" 64 0 6291 NULL true 2
NULL
-6287 "columnsize" "bigint" 64 0 6291 NULL true
3 NULL
-6288 "heapsize" "bigint" 64 0 6291 NULL true
4 NULL
-6289 "indices" "bigint" 64 0 6291 NULL true
5 NULL
-6290 "auxillary" "bigint" 53 0 6291 NULL true
6 NULL
-6293 "schema" "clob" 0 0 6306 NULL true 0
NULL
-6294 "table" "clob" 0 0 6306 NULL true 1 NULL
-6295 "column" "clob" 0 0 6306 NULL true 2
NULL
-6296 "type" "clob" 0 0 6306 NULL true 3 NULL
-6297 "width" "int" 32 0 6306 NULL true 4 NULL
-6298 "stamp" "timestamp" 7 0 6306 NULL true 5
NULL
-6299 "sample" "bigint" 64 0 6306 NULL true
6 NULL
-6300 "count" "bigint" 64 0 6306 NULL true 7
NULL
-6301 "unique" "bigint" 64 0 6306 NULL true
8 NULL
-6302 "nils" "bigint" 64 0 6306 NULL true 9
NULL
-6303 "minval" "clob" 0 0 6306 NULL true 10
NULL
-6304 "maxval" "clob" 0 0 6306 NULL true 11
NULL
-6305 "sorted" "boolean" 1 0 6306 NULL true
12 NULL
-6359 "function_id" "int" 32 0 6360 NULL true 0
NULL
+6264 "location" "clob" 0 0 6259 NULL true 4
NULL
+6265 "count" "bigint" 64 0 6259 NULL true 5
NULL
+6266 "typewidth" "int" 32 0 6259 NULL true 6
NULL
+6267 "columnsize" "bigint" 64 0 6259 NULL true
7 NULL
+6268 "heapsize" "bigint" 64 0 6259 NULL true
8 NULL
+6269 "indices" "bigint" 64 0 6259 NULL true
9 NULL
+6270 "sorted" "boolean" 1 0 6259 NULL true
10 NULL
+6275 "schema" "clob" 0 0 6286 NULL true 0
NULL
+6276 "table" "clob" 0 0 6286 NULL true 1 NULL
+6277 "column" "clob" 0 0 6286 NULL true 2
NULL
+6278 "type" "clob" 0 0 6286 NULL true 3 NULL
+6279 "location" "clob" 0 0 6286 NULL true 4
NULL
+6280 "count" "bigint" 64 0 6286 NULL true 5
NULL
+6281 "typewidth" "int" 32 0 6286 NULL true 6
NULL
+6282 "columnsize" "bigint" 64 0 6286 NULL true
7 NULL
+6283 "heapsize" "bigint" 64 0 6286 NULL true
8 NULL
+6284 "indices" "bigint" 64 0 6286 NULL true
9 NULL
+6285 "sorted" "boolean" 1 0 6286 NULL true
10 NULL
+6288 "schema" "clob" 0 0 6298 NULL true 0
NULL
+6289 "table" "clob" 0 0 6298 NULL true 1 NULL
+6290 "column" "clob" 0 0 6298 NULL true 2
NULL
+6291 "type" "clob" 0 0 6298 NULL true 3 NULL
+6292 "typewidth" "int" 32 0 6298 NULL true 4
NULL
+6293 "count" "bigint" 64 0 6298 NULL true 5
NULL
+6294 "distinct" "bigint" 64 0 6298 NULL true
6 NULL
+6295 "atomwidth" "int" 32 0 6298 NULL true 7
NULL
+6296 "reference" "boolean" 1 0 6298 NULL true
8 NULL
+6297 "sorted" "boolean" 1 0 6298 NULL true
9 NULL
+6319 "schema" "clob" 0 0 6318 NULL true 0
NULL
+6320 "table" "clob" 0 0 6318 NULL true 1 NULL
+6321 "column" "clob" 0 0 6318 NULL true 2
NULL
+6322 "type" "clob" 0 0 6318 NULL true 3 NULL
+6323 "count" "bigint" 64 0 6318 NULL true 4
NULL
+6324 "columnsize" "bigint" 64 0 6318 NULL true
5 NULL
+6325 "heapsize" "bigint" 64 0 6318 NULL true
6 NULL
+6326 "indices" "bigint" 64 0 6318 NULL true
7 NULL
+6327 "sorted" "boolean" 1 0 6318 NULL true
8 NULL
+6332 "schema" "clob" 0 0 6341 NULL true 0
NULL
+6333 "table" "clob" 0 0 6341 NULL true 1 NULL
+6334 "column" "clob" 0 0 6341 NULL true 2
NULL
+6335 "type" "clob" 0 0 6341 NULL true 3 NULL
+6336 "count" "bigint" 64 0 6341 NULL true 4
NULL
+6337 "columnsize" "bigint" 64 0 6341 NULL true
5 NULL
+6338 "heapsize" "bigint" 64 0 6341 NULL true
6 NULL
+6339 "indices" "bigint" 64 0 6341 NULL true
7 NULL
+6340 "sorted" "boolean" 1 0 6341 NULL true
8 NULL
+6343 "schema" "clob" 0 0 6350 NULL true 0
NULL
+6344 "table" "clob" 0 0 6350 NULL true 1 NULL
+6345 "count" "bigint" 64 0 6350 NULL true 2
NULL
+6346 "columnsize" "bigint" 64 0 6350 NULL true
3 NULL
+6347 "heapsize" "bigint" 64 0 6350 NULL true
4 NULL
+6348 "indices" "bigint" 64 0 6350 NULL true
5 NULL
+6349 "auxillary" "bigint" 53 0 6350 NULL true
6 NULL
+6352 "schema" "clob" 0 0 6365 NULL true 0
NULL
+6353 "table" "clob" 0 0 6365 NULL true 1 NULL
+6354 "column" "clob" 0 0 6365 NULL true 2
NULL
+6355 "type" "clob" 0 0 6365 NULL true 3 NULL
+6356 "width" "int" 32 0 6365 NULL true 4 NULL
+6357 "stamp" "timestamp" 7 0 6365 NULL true 5
NULL
+6358 "sample" "bigint" 64 0 6365 NULL true
6 NULL
+6359 "count" "bigint" 64 0 6365 NULL true 7
NULL
+6360 "unique" "bigint" 64 0 6365 NULL true
8 NULL
+6361 "nils" "bigint" 64 0 6365 NULL true 9
NULL
+6362 "minval" "clob" 0 0 6365 NULL true 10
NULL
+6363 "maxval" "clob" 0 0 6365 NULL true 11
NULL
+6364 "sorted" "boolean" 1 0 6365 NULL true
12 NULL
+6418 "function_id" "int" 32 0 6419 NULL true 0
NULL
COMMIT;
START TRANSACTION;
CREATE TABLE "sys"."_tables" (
@@ -1940,14 +1943,14 @@ 5655 "environment" 2000 "create view sys
5656 "#bbp" 2000 NULL 2 true 0 false
5676 "#queue" 2000 NULL 2 true 0 false
5697 "queue" 2000 "create view sys.queue as select * from sys.queue();"
1 true 0 false
-6200 "#storage" 2000 NULL 2 true 0 false
-6227 "storage" 2000 "create view sys.storage as select * from
sys.storage();" 1 true 0 false
-6239 "storagemodelinput" 2000 NULL 0 true 0 false
-6259 "#storagemodel" 2000 NULL 2 true 0 false
-6282 "storagemodel" 2000 "create view sys.storagemodel as select * from
sys.storagemodel();" 1 true 0 false
-6291 "tablestoragemodel" 2000 "-- A summary of the table storage
requirement is is available as a table view.\n-- The auxillary 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(indices) as
indices,\n\tsum(case when sorted = false then 8 * count else 0 end) as
auxillary\nfrom sys.storagemodel() group by \"schema\",\"table\";" 1
true 0 false
-6306 "statistics" 2000 NULL 0 true 0 false
-6360 "systemfunctions" 2000 NULL 0 true 0 false
+6259 "#storage" 2000 NULL 2 true 0 false
+6286 "storage" 2000 "create view sys.storage as select * from
sys.storage();" 1 true 0 false
+6298 "storagemodelinput" 2000 NULL 0 true 0 false
+6318 "#storagemodel" 2000 NULL 2 true 0 false
+6341 "storagemodel" 2000 "create view sys.storagemodel as select * from
sys.storagemodel();" 1 true 0 false
+6350 "tablestoragemodel" 2000 "-- A summary of the table storage
requirement is is available as a table view.\n-- The auxillary 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(indices) as
indices,\n\tsum(case when sorted = false then 8 * count else 0 end) as
auxillary\nfrom sys.storagemodel() group by \"schema\",\"table\";" 1
true 0 false
+6365 "statistics" 2000 NULL 0 true 0 false
+6419 "systemfunctions" 2000 NULL 0 true 0 false
COMMIT;
START TRANSACTION;
CREATE TABLE "sys"."args" (
@@ -1959,7 +1962,7 @@ CREATE TABLE "sys"."args" (
"type_scale" INTEGER,
"number" INTEGER
);
-COPY 3388 RECORDS INTO "sys"."args" FROM stdin USING DELIMITERS '\t','\n','"';
+COPY 3423 RECORDS INTO "sys"."args" FROM stdin USING DELIMITERS '\t','\n','"';
2151 28 "result" "oid" 63 0 0
2152 28 "arg_1" "wrd" 64 0 1
2153 29 "result" "oid" 63 0 0
@@ -5145,209 +5148,244 @@ 5890 5889 "result" "wrd" 64 0 0
5891 5889 "val" "wrd" 64 0 1
5894 5893 "result" "bigint" 64 0 0
5895 5893 "val" "bigint" 64 0 1
-5898 5897 "result" "real" 24 0 0
-5899 5897 "val" "real" 24 0 1
-5902 5901 "result" "double" 53 0 0
-5903 5901 "val" "double" 53 0 1
-5906 5905 "result" "date" 0 0 0
-5907 5905 "val" "date" 0 0 1
-5910 5909 "result" "time" 1 0 0
-5911 5909 "val" "time" 1 0 1
-5914 5913 "result" "timestamp" 7 0 0
-5915 5913 "val" "timestamp" 7 0 1
-5918 5917 "result" "tinyint" 8 0 0
-5919 5917 "e1" "tinyint" 8 0 1
-5920 5917 "e2" "tinyint" 8 0 2
-5923 5922 "result" "smallint" 16 0 0
-5924 5922 "e1" "smallint" 16 0 1
-5925 5922 "e2" "smallint" 16 0 2
-5928 5927 "result" "int" 32 0 0
-5929 5927 "e1" "int" 32 0 1
-5930 5927 "e2" "int" 32 0 2
-5933 5932 "result" "wrd" 64 0 0
-5934 5932 "e1" "wrd" 64 0 1
-5935 5932 "e2" "wrd" 64 0 2
-5938 5937 "result" "bigint" 64 0 0
-5939 5937 "e1" "bigint" 64 0 1
-5940 5937 "e2" "bigint" 64 0 2
-5943 5942 "result" "real" 24 0 0
-5944 5942 "e1" "real" 24 0 1
-5945 5942 "e2" "real" 24 0 2
-5948 5947 "result" "double" 53 0 0
-5949 5947 "e1" "double" 53 0 1
-5950 5947 "e2" "double" 53 0 2
-5966 5965 "result" "mbr" 0 0 0
-5967 5965 "g" "geometry" 0 0 1
-5970 5969 "result" "boolean" 1 0 0
-5971 5969 "a" "mbr" 0 0 1
-5972 5969 "b" "mbr" 0 0 2
-5975 5974 "result" "geometry" 0 0 0
-5976 5974 "wkt" "clob" 0 0 1
-5977 5974 "srid" "smallint" 16 0 2
-5980 5979 "result" "point" 0 0 0
-5981 5979 "wkt" "clob" 0 0 1
-5982 5979 "srid" "smallint" 16 0 2
-5985 5984 "result" "linestring" 0 0 0
-5986 5984 "wkt" "clob" 0 0 1
-5987 5984 "srid" "smallint" 16 0 2
-5990 5989 "result" "polygon" 0 0 0
-5991 5989 "wkt" "clob" 0 0 1
-5992 5989 "srid" "smallint" 16 0 2
-5995 5994 "result" "multipoint" 0 0 0
-5996 5994 "wkt" "clob" 0 0 1
-5997 5994 "srid" "smallint" 16 0 2
-6000 5999 "result" "multilinestring" 0 0 0
-6001 5999 "wkt" "clob" 0 0 1
-6002 5999 "srid" "smallint" 16 0 2
-6005 6004 "result" "multipolygon" 0 0 0
-6006 6004 "wkt" "clob" 0 0 1
-6007 6004 "srid" "smallint" 16 0 2
-6010 6009 "result" "multipolygon" 0 0 0
-6011 6009 "wkt" "clob" 0 0 1
-6012 6009 "srid" "smallint" 16 0 2
-6015 6014 "result" "polygon" 0 0 0
-6016 6014 "wkt" "clob" 0 0 1
-6017 6014 "srid" "smallint" 16 0 2
-6020 6019 "result" "clob" 0 0 0
-6021 6019 "g" "geometry" 0 0 1
-6024 6023 "result" "double" 53 0 0
-6025 6023 "g" "geometry" 0 0 1
-6028 6027 "result" "double" 53 0 0
-6029 6027 "g" "geometry" 0 0 1
-6032 6031 "result" "point" 0 0 0
-6033 6031 "x" "double" 53 0 1
-6034 6031 "y" "double" 53 0 2
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
