Changeset: c97706ea7907 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c97706ea7907
Modified Files:
clients/Tests/SQL-dump.stable.out.32bit
clients/Tests/SQL-dump.stable.out.64bit.oid32
Branch: default
Log Message:
Merge with Jan2014 branch.
diffs (truncated from 1252 to 300 lines):
diff --git a/clients/Tests/SQL-dump.stable.out.32bit
b/clients/Tests/SQL-dump.stable.out.32bit
--- a/clients/Tests/SQL-dump.stable.out.32bit
+++ b/clients/Tests/SQL-dump.stable.out.32bit
@@ -166,7 +166,6 @@ SYSTEM FUNCTION sys.indexsize
SYSTEM FUNCTION sys.initializedictionary
SYSTEM FUNCTION sys.intersection
SYSTEM FUNCTION sys.isaurl
-SYSTEM FUNCTION sys.isauuid
SYSTEM FUNCTION sys.isempty
SYSTEM FUNCTION sys.issimple
SYSTEM FUNCTION sys.json_filter
@@ -183,7 +182,6 @@ SYSTEM FUNCTION sys.linefromtext
SYSTEM FUNCTION sys.masklen
SYSTEM FUNCTION sys.mbr
SYSTEM FUNCTION sys.mbroverlaps
-SYSTEM FUNCTION sys.md5
SYSTEM FUNCTION sys.median
SYSTEM FUNCTION sys.mlinefromtext
SYSTEM FUNCTION sys.mpointfromtext
@@ -238,7 +236,6 @@ SYSTEM FUNCTION sys.text
SYSTEM FUNCTION sys.times
SYSTEM FUNCTION sys.touches
SYSTEM FUNCTION sys.tracelog
-SYSTEM FUNCTION sys.uuid
SYSTEM FUNCTION sys.vacuum
SYSTEM FUNCTION sys.var
SYSTEM FUNCTION sys.var_pop
@@ -427,6 +424,7 @@ select qd.*, ql."start",ql."stop", ql.ar
from sys.querylog_catalog() qd, sys.querylog_calls() ql
where qd.id = ql.id and qd.owner = user;
create view sys.queue as select * from sys.queue();
+create view sys.sessions as select * from sys.sessions();
create view sys.storage as select * from sys.storage();
create view sys.storagemodel as select * from sys.storagemodel();
SELECT * FROM (SELECT p.*, 0 AS "temporary" FROM "sys"."_tables" AS p UNION
ALL SELECT t.*, 1 AS "temporary" FROM "tmp"."_tables" AS t) AS tables where
tables.type <> 2;
@@ -772,8 +770,6 @@ create procedure initializedictionary ()
create function intersection(a geometry, b geometry) returns geometry external
name geom."Intersection";
create function isaurl(theurl url) returns bool
external name url."isaURL";
-create function sys.isauuid(u uuid)
-returns uuid external name uuid."isaUUID";
create function isempty(g geometry) returns boolean external name
geom."IsEmpty";
create function issimple(g geometry) returns boolean external name
geom."IsSimple";
-- access the top level key by name, return its value
@@ -808,28 +804,6 @@ create function "masklen" (p inet) retur
-- minimum bounding rectangle (mbr)
create function mbr (g geometry) returns mbr external name geom.mbr;
create function mbroverlaps(a mbr, b mbr) returns boolean external name
geom."mbroverlaps";
-
--- The contents of this file are subject to the MonetDB Public License
--- Version 1.1 (the "License"); you may not use this file except in
--- compliance with the License. You may obtain a copy of the License at
--- http://www.monetdb.org/Legal/MonetDBLicense
---
--- Software distributed under the License is distributed on an "AS IS"
--- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
--- License for the specific language governing rights and limitations
--- under the License.
---
--- The Original Code is the MonetDB Database System.
---
--- The Initial Developer of the Original Code is CWI.
--- Copyright August 2008-2013 MonetDB B.V.
--- All Rights Reserved.
-
--- (co) Arjen de Rijke
--- Functions supporting jsonstore
-
-create function sys.md5(v string)
-returns string external name clients.md5sum;
create aggregate median(val tinyint) returns tinyint
external name "aggr"."median";
create aggregate median(val smallint) returns smallint
@@ -988,6 +962,28 @@ create function pointfromtext(wkt string
create function polyfromtext(wkt string, srid smallint) returns polygon
external name geom."PolyFromText";
-- alias
create function polygonfromtext(wkt string, srid smallint) returns polygon
external name geom."PolyFromText";
+create aggregate quantile(val tinyint, q double) returns tinyint
+ external name "aggr"."quantile";
+create aggregate quantile(val smallint, q double) returns smallint
+ external name "aggr"."quantile";
+create aggregate quantile(val integer, q double) returns integer
+ external name "aggr"."quantile";
+create aggregate quantile(val wrd, q double) returns wrd
+ external name "aggr"."quantile";
+create aggregate quantile(val bigint, q double) returns bigint
+ external name "aggr"."quantile";
+create aggregate quantile(val decimal, q double) returns decimal
+ external name "aggr"."quantile";
+create aggregate quantile(val real, q double) returns real
+ external name "aggr"."quantile";
+create aggregate quantile(val double, q double) returns double
+ external name "aggr"."quantile";
+create aggregate quantile(val date, q double) returns date
+ external name "aggr"."quantile";
+create aggregate quantile(val time, q double) returns time
+ external name "aggr"."quantile";
+create aggregate quantile(val timestamp, q double) returns timestamp
+ external name "aggr"."quantile";
-- SQL QUERY CACHE
-- The SQL query cache returns a table with the query plans kept
@@ -1134,8 +1130,13 @@ All Rights Reserved.
-- Reverse a string
create function reverse(src string)
returns string external name udf.reverse;
+create function sys.sessions()
+returns table("user" string, "login" timestamp, "sessiontimeout" bigint,
"lastcommand" timestamp, "querytimeout" bigint, "active" bool)
+external name sql.sessions;
create function "setmasklen" (p inet, mask int) returns inet
external name inet."setmasklen";
+create procedure sys.setsession("timeout" bigint)
+ external name sql.setsession;
-- control the query and session time out
create procedure sys.settimeout("query" bigint)
external name sql.settimeout;
@@ -1166,6 +1167,10 @@ create procedure sys.settimeout("query"
create procedure shrink(sys string, tab string)
external name sql.shrink;
+create procedure sys.shutdown(delay tinyint)
+external name sql.shutdown;
+create procedure sys.shutdown(delay tinyint, force bool)
+external name sql.shutdown;
create function srid(g geometry) returns integer external name geom."SRID";
create aggregate stddev_pop(val tinyint) returns double
external name "aggr"."stdevp";
@@ -1367,9 +1372,6 @@ create function sys.tracelog()
stmt string -- actual statement executed
)
external name sql.dump_trace;
--- generate a new uuid
-create function sys.uuid()
-returns uuid external name uuid."new";
create procedure vacuum(sys string, tab string)
external name sql.vacuum;
CREATE FUNCTION var() RETURNS TABLE( name varchar(1024)) EXTERNAL NAME
sql.sql_variables;
@@ -1799,77 +1801,77 @@ 5693 "progress" "int" 32 0 5697
NULL tru
5694 "status" "clob" 0 0 5697 NULL true 5
NULL
5695 "tag" "oid" 31 0 5697 NULL true 6 NULL
5696 "query" "clob" 0 0 5697 NULL true 7 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 "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
+6248 "schema" "clob" 0 0 6247 NULL true 0
NULL
+6249 "table" "clob" 0 0 6247 NULL true 1 NULL
+6250 "column" "clob" 0 0 6247 NULL true 2
NULL
+6251 "type" "clob" 0 0 6247 NULL true 3 NULL
+6252 "location" "clob" 0 0 6247 NULL true 4
NULL
+6253 "count" "bigint" 64 0 6247 NULL true 5
NULL
+6254 "typewidth" "int" 32 0 6247 NULL true 6
NULL
+6255 "columnsize" "bigint" 64 0 6247 NULL true
7 NULL
+6256 "heapsize" "bigint" 64 0 6247 NULL true
8 NULL
+6257 "indices" "bigint" 64 0 6247 NULL true
9 NULL
+6258 "sorted" "boolean" 1 0 6247 NULL true
10 NULL
+6263 "schema" "clob" 0 0 6274 NULL true 0
NULL
+6264 "table" "clob" 0 0 6274 NULL true 1 NULL
+6265 "column" "clob" 0 0 6274 NULL true 2
NULL
+6266 "type" "clob" 0 0 6274 NULL true 3 NULL
+6267 "location" "clob" 0 0 6274 NULL true 4
NULL
+6268 "count" "bigint" 64 0 6274 NULL true 5
NULL
+6269 "typewidth" "int" 32 0 6274 NULL true 6
NULL
+6270 "columnsize" "bigint" 64 0 6274 NULL true
7 NULL
+6271 "heapsize" "bigint" 64 0 6274 NULL true
8 NULL
+6272 "indices" "bigint" 64 0 6274 NULL true
9 NULL
+6273 "sorted" "boolean" 1 0 6274 NULL true
10 NULL
+6276 "schema" "clob" 0 0 6286 NULL true 0
NULL
+6277 "table" "clob" 0 0 6286 NULL true 1 NULL
+6278 "column" "clob" 0 0 6286 NULL true 2
NULL
+6279 "type" "clob" 0 0 6286 NULL true 3 NULL
+6280 "typewidth" "int" 32 0 6286 NULL true 4
NULL
+6281 "count" "bigint" 64 0 6286 NULL true 5
NULL
+6282 "distinct" "bigint" 64 0 6286 NULL true
6 NULL
+6283 "atomwidth" "int" 32 0 6286 NULL true 7
NULL
+6284 "reference" "boolean" 1 0 6286 NULL true
8 NULL
+6285 "sorted" "boolean" 1 0 6286 NULL true
9 NULL
+6307 "schema" "clob" 0 0 6306 NULL true 0
NULL
+6308 "table" "clob" 0 0 6306 NULL true 1 NULL
+6309 "column" "clob" 0 0 6306 NULL true 2
NULL
+6310 "type" "clob" 0 0 6306 NULL true 3 NULL
+6311 "count" "bigint" 64 0 6306 NULL true 4
NULL
+6312 "columnsize" "bigint" 64 0 6306 NULL true
5 NULL
+6313 "heapsize" "bigint" 64 0 6306 NULL true
6 NULL
+6314 "indices" "bigint" 64 0 6306 NULL true
7 NULL
+6315 "sorted" "boolean" 1 0 6306 NULL true
8 NULL
+6320 "schema" "clob" 0 0 6329 NULL true 0
NULL
+6321 "table" "clob" 0 0 6329 NULL true 1 NULL
+6322 "column" "clob" 0 0 6329 NULL true 2
NULL
+6323 "type" "clob" 0 0 6329 NULL true 3 NULL
+6324 "count" "bigint" 64 0 6329 NULL true 4
NULL
+6325 "columnsize" "bigint" 64 0 6329 NULL true
5 NULL
+6326 "heapsize" "bigint" 64 0 6329 NULL true
6 NULL
+6327 "indices" "bigint" 64 0 6329 NULL true
7 NULL
+6328 "sorted" "boolean" 1 0 6329 NULL true
8 NULL
+6331 "schema" "clob" 0 0 6338 NULL true 0
NULL
+6332 "table" "clob" 0 0 6338 NULL true 1 NULL
+6333 "count" "bigint" 64 0 6338 NULL true 2
NULL
+6334 "columnsize" "bigint" 64 0 6338 NULL true
3 NULL
+6335 "heapsize" "bigint" 64 0 6338 NULL true
4 NULL
+6336 "indices" "bigint" 64 0 6338 NULL true
5 NULL
+6337 "auxillary" "bigint" 53 0 6338 NULL true
6 NULL
+6340 "schema" "clob" 0 0 6353 NULL true 0
NULL
+6341 "table" "clob" 0 0 6353 NULL true 1 NULL
+6342 "column" "clob" 0 0 6353 NULL true 2
NULL
+6343 "type" "clob" 0 0 6353 NULL true 3 NULL
+6344 "width" "int" 32 0 6353 NULL true 4 NULL
+6345 "stamp" "timestamp" 7 0 6353 NULL true 5
NULL
+6346 "sample" "bigint" 64 0 6353 NULL true
6 NULL
+6347 "count" "bigint" 64 0 6353 NULL true 7
NULL
+6348 "unique" "bigint" 64 0 6353 NULL true
8 NULL
+6349 "nils" "bigint" 64 0 6353 NULL true 9
NULL
+6350 "minval" "clob" 0 0 6353 NULL true 10
NULL
+6351 "maxval" "clob" 0 0 6353 NULL true 11
NULL
+6352 "sorted" "boolean" 1 0 6353 NULL true
12 NULL
+6406 "function_id" "int" 32 0 6407 NULL true 0
NULL
COMMIT;
START TRANSACTION;
CREATE TABLE "sys"."_tables" (
@@ -1947,14 +1949,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
-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
+6247 "#storage" 2000 NULL 2 true 0 false
+6274 "storage" 2000 "create view sys.storage as select * from
sys.storage();" 1 true 0 false
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
