Changeset: 6e9b94df9abf for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6e9b94df9abf
Modified Files:
clients/Tests/SQL-dump_gsl.stable.out.oid32
Branch: Jan2014
Log Message:
Approved after changeset fe740d4d9808.
diffs (truncated from 580 to 300 lines):
diff --git a/clients/Tests/SQL-dump_gsl.stable.out.oid32
b/clients/Tests/SQL-dump_gsl.stable.out.oid32
--- a/clients/Tests/SQL-dump_gsl.stable.out.oid32
+++ b/clients/Tests/SQL-dump_gsl.stable.out.oid32
@@ -171,14 +171,6 @@ SYSTEM FUNCTION sys.intersection
SYSTEM FUNCTION sys.isaurl
SYSTEM FUNCTION sys.isempty
SYSTEM FUNCTION sys.issimple
-SYSTEM FUNCTION sys.json_filter
-SYSTEM FUNCTION sys.json_filter_all
-SYSTEM FUNCTION sys.json_isvalid
-SYSTEM FUNCTION sys.json_isvalidarray
-SYSTEM FUNCTION sys.json_isvalidobject
-SYSTEM FUNCTION sys.json_length
-SYSTEM FUNCTION sys.json_path
-SYSTEM FUNCTION sys.json_text
SYSTEM FUNCTION sys.length
SYSTEM FUNCTION sys.like
SYSTEM FUNCTION sys.linefromtext
@@ -779,27 +771,6 @@ create function isaurl(theurl url) retur
external name url."isaURL";
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
-create function sys.json_filter(js json, name string)
-returns json external name json.filter;
-create function sys.json_filter_all(js json, name string)
-returns json external name json.filterall;
--- test string for JSON compliancy
-create function sys.json_isvalid(js string)
-returns bool external name json.isvalid;
-create function sys.json_isvalidarray(js string)
-returns bool external name json.isvalidarray;
-create function sys.json_isvalidobject(js string)
-returns bool external name json.isvalidobject;
--- return the number of primary components
-create function sys.json_length(js json)
-returns integer external name json.length;
--- a simple path extractor
-create function sys.json_path(js json, e string)
-returns json external name json.path;
--- a simple path extractor as plain text
-create function sys.json_text(js json, e string)
-returns string external name json.text;
create function length(g geometry) returns float external name geom."Length";
-- 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
@@ -1851,77 +1822,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
-6253 "schema" "clob" 0 0 6252 NULL true 0
NULL
-6254 "table" "clob" 0 0 6252 NULL true 1 NULL
-6255 "column" "clob" 0 0 6252 NULL true 2
NULL
-6256 "type" "clob" 0 0 6252 NULL true 3 NULL
-6257 "location" "clob" 0 0 6252 NULL true 4
NULL
-6258 "count" "bigint" 64 0 6252 NULL true 5
NULL
-6259 "typewidth" "int" 32 0 6252 NULL true 6
NULL
-6260 "columnsize" "bigint" 64 0 6252 NULL true
7 NULL
-6261 "heapsize" "bigint" 64 0 6252 NULL true
8 NULL
-6262 "indices" "bigint" 64 0 6252 NULL true
9 NULL
-6263 "sorted" "boolean" 1 0 6252 NULL true
10 NULL
-6268 "schema" "clob" 0 0 6279 NULL true 0
NULL
-6269 "table" "clob" 0 0 6279 NULL true 1 NULL
-6270 "column" "clob" 0 0 6279 NULL true 2
NULL
-6271 "type" "clob" 0 0 6279 NULL true 3 NULL
-6272 "location" "clob" 0 0 6279 NULL true 4
NULL
-6273 "count" "bigint" 64 0 6279 NULL true 5
NULL
-6274 "typewidth" "int" 32 0 6279 NULL true 6
NULL
-6275 "columnsize" "bigint" 64 0 6279 NULL true
7 NULL
-6276 "heapsize" "bigint" 64 0 6279 NULL true
8 NULL
-6277 "indices" "bigint" 64 0 6279 NULL true
9 NULL
-6278 "sorted" "boolean" 1 0 6279 NULL true
10 NULL
-6281 "schema" "clob" 0 0 6291 NULL true 0
NULL
-6282 "table" "clob" 0 0 6291 NULL true 1 NULL
-6283 "column" "clob" 0 0 6291 NULL true 2
NULL
-6284 "type" "clob" 0 0 6291 NULL true 3 NULL
-6285 "typewidth" "int" 32 0 6291 NULL true 4
NULL
-6286 "count" "bigint" 64 0 6291 NULL true 5
NULL
-6287 "distinct" "bigint" 64 0 6291 NULL true
6 NULL
-6288 "atomwidth" "int" 32 0 6291 NULL true 7
NULL
-6289 "reference" "boolean" 1 0 6291 NULL true
8 NULL
-6290 "sorted" "boolean" 1 0 6291 NULL true
9 NULL
-6312 "schema" "clob" 0 0 6311 NULL true 0
NULL
-6313 "table" "clob" 0 0 6311 NULL true 1 NULL
-6314 "column" "clob" 0 0 6311 NULL true 2
NULL
-6315 "type" "clob" 0 0 6311 NULL true 3 NULL
-6316 "count" "bigint" 64 0 6311 NULL true 4
NULL
-6317 "columnsize" "bigint" 64 0 6311 NULL true
5 NULL
-6318 "heapsize" "bigint" 64 0 6311 NULL true
6 NULL
-6319 "indices" "bigint" 64 0 6311 NULL true
7 NULL
-6320 "sorted" "boolean" 1 0 6311 NULL true
8 NULL
-6325 "schema" "clob" 0 0 6334 NULL true 0
NULL
-6326 "table" "clob" 0 0 6334 NULL true 1 NULL
-6327 "column" "clob" 0 0 6334 NULL true 2
NULL
-6328 "type" "clob" 0 0 6334 NULL true 3 NULL
-6329 "count" "bigint" 64 0 6334 NULL true 4
NULL
-6330 "columnsize" "bigint" 64 0 6334 NULL true
5 NULL
-6331 "heapsize" "bigint" 64 0 6334 NULL true
6 NULL
-6332 "indices" "bigint" 64 0 6334 NULL true
7 NULL
-6333 "sorted" "boolean" 1 0 6334 NULL true
8 NULL
-6336 "schema" "clob" 0 0 6343 NULL true 0
NULL
-6337 "table" "clob" 0 0 6343 NULL true 1 NULL
-6338 "count" "bigint" 64 0 6343 NULL true 2
NULL
-6339 "columnsize" "bigint" 64 0 6343 NULL true
3 NULL
-6340 "heapsize" "bigint" 64 0 6343 NULL true
4 NULL
-6341 "indices" "bigint" 64 0 6343 NULL true
5 NULL
-6342 "auxillary" "bigint" 53 0 6343 NULL true
6 NULL
-6345 "schema" "clob" 0 0 6358 NULL true 0
NULL
-6346 "table" "clob" 0 0 6358 NULL true 1 NULL
-6347 "column" "clob" 0 0 6358 NULL true 2
NULL
-6348 "type" "clob" 0 0 6358 NULL true 3 NULL
-6349 "width" "int" 32 0 6358 NULL true 4 NULL
-6350 "stamp" "timestamp" 7 0 6358 NULL true 5
NULL
-6351 "sample" "bigint" 64 0 6358 NULL true
6 NULL
-6352 "count" "bigint" 64 0 6358 NULL true 7
NULL
-6353 "unique" "bigint" 64 0 6358 NULL true
8 NULL
-6354 "nils" "bigint" 64 0 6358 NULL true 9
NULL
-6355 "minval" "clob" 0 0 6358 NULL true 10
NULL
-6356 "maxval" "clob" 0 0 6358 NULL true 11
NULL
-6357 "sorted" "boolean" 1 0 6358 NULL true
12 NULL
-6411 "function_id" "int" 32 0 6412 NULL true 0
NULL
+6216 "schema" "clob" 0 0 6215 NULL true 0
NULL
+6217 "table" "clob" 0 0 6215 NULL true 1 NULL
+6218 "column" "clob" 0 0 6215 NULL true 2
NULL
+6219 "type" "clob" 0 0 6215 NULL true 3 NULL
+6220 "location" "clob" 0 0 6215 NULL true 4
NULL
+6221 "count" "bigint" 64 0 6215 NULL true 5
NULL
+6222 "typewidth" "int" 32 0 6215 NULL true 6
NULL
+6223 "columnsize" "bigint" 64 0 6215 NULL true
7 NULL
+6224 "heapsize" "bigint" 64 0 6215 NULL true
8 NULL
+6225 "indices" "bigint" 64 0 6215 NULL true
9 NULL
+6226 "sorted" "boolean" 1 0 6215 NULL true
10 NULL
+6231 "schema" "clob" 0 0 6242 NULL true 0
NULL
+6232 "table" "clob" 0 0 6242 NULL true 1 NULL
+6233 "column" "clob" 0 0 6242 NULL true 2
NULL
+6234 "type" "clob" 0 0 6242 NULL true 3 NULL
+6235 "location" "clob" 0 0 6242 NULL true 4
NULL
+6236 "count" "bigint" 64 0 6242 NULL true 5
NULL
+6237 "typewidth" "int" 32 0 6242 NULL true 6
NULL
+6238 "columnsize" "bigint" 64 0 6242 NULL true
7 NULL
+6239 "heapsize" "bigint" 64 0 6242 NULL true
8 NULL
+6240 "indices" "bigint" 64 0 6242 NULL true
9 NULL
+6241 "sorted" "boolean" 1 0 6242 NULL true
10 NULL
+6244 "schema" "clob" 0 0 6254 NULL true 0
NULL
+6245 "table" "clob" 0 0 6254 NULL true 1 NULL
+6246 "column" "clob" 0 0 6254 NULL true 2
NULL
+6247 "type" "clob" 0 0 6254 NULL true 3 NULL
+6248 "typewidth" "int" 32 0 6254 NULL true 4
NULL
+6249 "count" "bigint" 64 0 6254 NULL true 5
NULL
+6250 "distinct" "bigint" 64 0 6254 NULL true
6 NULL
+6251 "atomwidth" "int" 32 0 6254 NULL true 7
NULL
+6252 "reference" "boolean" 1 0 6254 NULL true
8 NULL
+6253 "sorted" "boolean" 1 0 6254 NULL true
9 NULL
+6275 "schema" "clob" 0 0 6274 NULL true 0
NULL
+6276 "table" "clob" 0 0 6274 NULL true 1 NULL
+6277 "column" "clob" 0 0 6274 NULL true 2
NULL
+6278 "type" "clob" 0 0 6274 NULL true 3 NULL
+6279 "count" "bigint" 64 0 6274 NULL true 4
NULL
+6280 "columnsize" "bigint" 64 0 6274 NULL true
5 NULL
+6281 "heapsize" "bigint" 64 0 6274 NULL true
6 NULL
+6282 "indices" "bigint" 64 0 6274 NULL true
7 NULL
+6283 "sorted" "boolean" 1 0 6274 NULL true
8 NULL
+6288 "schema" "clob" 0 0 6297 NULL true 0
NULL
+6289 "table" "clob" 0 0 6297 NULL true 1 NULL
+6290 "column" "clob" 0 0 6297 NULL true 2
NULL
+6291 "type" "clob" 0 0 6297 NULL true 3 NULL
+6292 "count" "bigint" 64 0 6297 NULL true 4
NULL
+6293 "columnsize" "bigint" 64 0 6297 NULL true
5 NULL
+6294 "heapsize" "bigint" 64 0 6297 NULL true
6 NULL
+6295 "indices" "bigint" 64 0 6297 NULL true
7 NULL
+6296 "sorted" "boolean" 1 0 6297 NULL true
8 NULL
+6299 "schema" "clob" 0 0 6306 NULL true 0
NULL
+6300 "table" "clob" 0 0 6306 NULL true 1 NULL
+6301 "count" "bigint" 64 0 6306 NULL true 2
NULL
+6302 "columnsize" "bigint" 64 0 6306 NULL true
3 NULL
+6303 "heapsize" "bigint" 64 0 6306 NULL true
4 NULL
+6304 "indices" "bigint" 64 0 6306 NULL true
5 NULL
+6305 "auxillary" "bigint" 53 0 6306 NULL true
6 NULL
+6308 "schema" "clob" 0 0 6321 NULL true 0
NULL
+6309 "table" "clob" 0 0 6321 NULL true 1 NULL
+6310 "column" "clob" 0 0 6321 NULL true 2
NULL
+6311 "type" "clob" 0 0 6321 NULL true 3 NULL
+6312 "width" "int" 32 0 6321 NULL true 4 NULL
+6313 "stamp" "timestamp" 7 0 6321 NULL true 5
NULL
+6314 "sample" "bigint" 64 0 6321 NULL true
6 NULL
+6315 "count" "bigint" 64 0 6321 NULL true 7
NULL
+6316 "unique" "bigint" 64 0 6321 NULL true
8 NULL
+6317 "nils" "bigint" 64 0 6321 NULL true 9
NULL
+6318 "minval" "clob" 0 0 6321 NULL true 10
NULL
+6319 "maxval" "clob" 0 0 6321 NULL true 11
NULL
+6320 "sorted" "boolean" 1 0 6321 NULL true
12 NULL
+6374 "function_id" "int" 32 0 6375 NULL true 0
NULL
COMMIT;
START TRANSACTION;
CREATE TABLE "sys"."_tables" (
@@ -1999,14 +1970,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
-6252 "#storage" 2000 NULL 2 true 0 false
-6279 "storage" 2000 "create view sys.storage as select * from
sys.storage();" 1 true 0 false
-6291 "storagemodelinput" 2000 NULL 0 true 0 false
-6311 "#storagemodel" 2000 NULL 2 true 0 false
-6334 "storagemodel" 2000 "create view sys.storagemodel as select * from
sys.storagemodel();" 1 true 0 false
-6343 "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
-6358 "statistics" 2000 NULL 0 true 0 false
-6412 "systemfunctions" 2000 NULL 0 true 0 false
+6215 "#storage" 2000 NULL 2 true 0 false
+6242 "storage" 2000 "create view sys.storage as select * from
sys.storage();" 1 true 0 false
+6254 "storagemodelinput" 2000 NULL 0 true 0 false
+6274 "#storagemodel" 2000 NULL 2 true 0 false
+6297 "storagemodel" 2000 "create view sys.storagemodel as select * from
sys.storagemodel();" 1 true 0 false
+6306 "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
+6321 "statistics" 2000 NULL 0 true 0 false
+6375 "systemfunctions" 2000 NULL 0 true 0 false
COMMIT;
START TRANSACTION;
CREATE TABLE "sys"."args" (
@@ -2018,7 +1989,7 @@ CREATE TABLE "sys"."args" (
"type_scale" INTEGER,
"number" INTEGER
);
-COPY 3421 RECORDS INTO "sys"."args" FROM stdin USING DELIMITERS '\t','\n','"';
+COPY 3401 RECORDS INTO "sys"."args" FROM stdin USING DELIMITERS '\t','\n','"';
2151 28 "result" "oid" 31 0 0
2152 28 "arg_1" "wrd" 64 0 1
2153 29 "result" "oid" 31 0 0
@@ -5377,69 +5348,49 @@ 6204 6201 "b" "geometry" 0 0
2
6207 6206 "result" "geometry" 0 0 0
6208 6206 "a" "geometry" 0 0 1
6209 6206 "b" "geometry" 0 0 2
-6213 6212 "result" "json" 0 0 0
-6214 6212 "js" "json" 0 0 1
-6215 6212 "name" "clob" 0 0 2
-6218 6217 "result" "json" 0 0 0
-6219 6217 "js" "json" 0 0 1
-6220 6217 "name" "clob" 0 0 2
-6223 6222 "result" "json" 0 0 0
-6224 6222 "js" "json" 0 0 1
-6225 6222 "e" "clob" 0 0 2
-6228 6227 "result" "clob" 0 0 0
-6229 6227 "js" "json" 0 0 1
-6230 6227 "e" "clob" 0 0 2
-6233 6232 "result" "boolean" 1 0 0
-6234 6232 "js" "clob" 0 0 1
-6237 6236 "result" "boolean" 1 0 0
-6238 6236 "js" "clob" 0 0 1
-6241 6240 "result" "boolean" 1 0 0
-6242 6240 "js" "clob" 0 0 1
-6245 6244 "result" "int" 32 0 0
-6246 6244 "js" "json" 0 0 1
-6249 6248 "result" "double" 53 0 0
-6250 6248 "chi2" "double" 53 0 1
-6251 6248 "datapoints" "double" 53 0 2
-6266 6265 "result" "table" 6252 0 0
-6296 6295 "result" "bigint" 64 0 0
-6297 6295 "nme" "clob" 0 0 1
-6298 6295 "i" "bigint" 64 0 2
-6299 6295 "d" "bigint" 64 0 3
-6302 6301 "result" "bigint" 64 0 0
-6303 6301 "tpe" "clob" 0 0 1
-6304 6301 "i" "bigint" 64 0 2
-6305 6301 "w" "int" 32 0 3
-6308 6307 "result" "bigint" 64 0 0
-6309 6307 "b" "boolean" 1 0 1
-6310 6307 "i" "bigint" 64 0 2
-6323 6322 "result" "table" 6311 0 0
-6363 6362 "tbl" "clob" 0 0 0
-6366 6365 "sch" "clob" 0 0 0
-6367 6365 "tbl" "clob" 0 0 1
-6370 6369 "sch" "clob" 0 0 0
-6371 6369 "tbl" "clob" 0 0 1
-6372 6369 "col" "clob" 0 0 2
-6375 6374 "sample" "bigint" 64 0 0
-6378 6377 "tbl" "clob" 0 0 0
-6379 6377 "sample" "bigint" 64 0 1
-6382 6381 "sch" "clob" 0 0 0
-6383 6381 "tbl" "clob" 0 0 1
-6384 6381 "sample" "bigint" 64 0 2
-6387 6386 "sch" "clob" 0 0 0
-6388 6386 "tbl" "clob" 0 0 1
-6389 6386 "col" "clob" 0 0 2
-6390 6386 "sample" "bigint" 64 0 3
-6393 6392 "result" "clob" 0 0 0
-6394 6392 "src" "clob" 0 0 1
-6397 6396 "result" "smallint" 16 0 0
-6398 6396 "one" "tinyint" 8 0 1
-6399 6396 "two" "tinyint" 8 0 2
-6402 6401 "result" "int" 32 0 0
-6403 6401 "one" "smallint" 16 0 1
-6404 6401 "two" "smallint" 16 0 2
-6407 6406 "result" "bigint" 64 0 0
-6408 6406 "one" "int" 32 0 1
-6409 6406 "two" "int" 32 0 2
+6212 6211 "result" "double" 53 0 0
+6213 6211 "chi2" "double" 53 0 1
+6214 6211 "datapoints" "double" 53 0 2
+6229 6228 "result" "table" 6215 0 0
+6259 6258 "result" "bigint" 64 0 0
+6260 6258 "nme" "clob" 0 0 1
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
