Changeset: ad7bf1cb0eb0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ad7bf1cb0eb0
Modified Files:
clients/Tests/SQL-dump.stable.out.32bit
Branch: Jan2014
Log Message:
Approved after changeset fe740d4d9808.
diffs (truncated from 570 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
@@ -168,14 +168,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
@@ -776,27 +768,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
@@ -1848,77 +1819,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
-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
+6211 "schema" "clob" 0 0 6210 NULL true 0
NULL
+6212 "table" "clob" 0 0 6210 NULL true 1 NULL
+6213 "column" "clob" 0 0 6210 NULL true 2
NULL
+6214 "type" "clob" 0 0 6210 NULL true 3 NULL
+6215 "location" "clob" 0 0 6210 NULL true 4
NULL
+6216 "count" "bigint" 64 0 6210 NULL true 5
NULL
+6217 "typewidth" "int" 32 0 6210 NULL true 6
NULL
+6218 "columnsize" "bigint" 64 0 6210 NULL true
7 NULL
+6219 "heapsize" "bigint" 64 0 6210 NULL true
8 NULL
+6220 "indices" "bigint" 64 0 6210 NULL true
9 NULL
+6221 "sorted" "boolean" 1 0 6210 NULL true
10 NULL
+6226 "schema" "clob" 0 0 6237 NULL true 0
NULL
+6227 "table" "clob" 0 0 6237 NULL true 1 NULL
+6228 "column" "clob" 0 0 6237 NULL true 2
NULL
+6229 "type" "clob" 0 0 6237 NULL true 3 NULL
+6230 "location" "clob" 0 0 6237 NULL true 4
NULL
+6231 "count" "bigint" 64 0 6237 NULL true 5
NULL
+6232 "typewidth" "int" 32 0 6237 NULL true 6
NULL
+6233 "columnsize" "bigint" 64 0 6237 NULL true
7 NULL
+6234 "heapsize" "bigint" 64 0 6237 NULL true
8 NULL
+6235 "indices" "bigint" 64 0 6237 NULL true
9 NULL
+6236 "sorted" "boolean" 1 0 6237 NULL true
10 NULL
+6239 "schema" "clob" 0 0 6249 NULL true 0
NULL
+6240 "table" "clob" 0 0 6249 NULL true 1 NULL
+6241 "column" "clob" 0 0 6249 NULL true 2
NULL
+6242 "type" "clob" 0 0 6249 NULL true 3 NULL
+6243 "typewidth" "int" 32 0 6249 NULL true 4
NULL
+6244 "count" "bigint" 64 0 6249 NULL true 5
NULL
+6245 "distinct" "bigint" 64 0 6249 NULL true
6 NULL
+6246 "atomwidth" "int" 32 0 6249 NULL true 7
NULL
+6247 "reference" "boolean" 1 0 6249 NULL true
8 NULL
+6248 "sorted" "boolean" 1 0 6249 NULL true
9 NULL
+6270 "schema" "clob" 0 0 6269 NULL true 0
NULL
+6271 "table" "clob" 0 0 6269 NULL true 1 NULL
+6272 "column" "clob" 0 0 6269 NULL true 2
NULL
+6273 "type" "clob" 0 0 6269 NULL true 3 NULL
+6274 "count" "bigint" 64 0 6269 NULL true 4
NULL
+6275 "columnsize" "bigint" 64 0 6269 NULL true
5 NULL
+6276 "heapsize" "bigint" 64 0 6269 NULL true
6 NULL
+6277 "indices" "bigint" 64 0 6269 NULL true
7 NULL
+6278 "sorted" "boolean" 1 0 6269 NULL true
8 NULL
+6283 "schema" "clob" 0 0 6292 NULL true 0
NULL
+6284 "table" "clob" 0 0 6292 NULL true 1 NULL
+6285 "column" "clob" 0 0 6292 NULL true 2
NULL
+6286 "type" "clob" 0 0 6292 NULL true 3 NULL
+6287 "count" "bigint" 64 0 6292 NULL true 4
NULL
+6288 "columnsize" "bigint" 64 0 6292 NULL true
5 NULL
+6289 "heapsize" "bigint" 64 0 6292 NULL true
6 NULL
+6290 "indices" "bigint" 64 0 6292 NULL true
7 NULL
+6291 "sorted" "boolean" 1 0 6292 NULL true
8 NULL
+6294 "schema" "clob" 0 0 6301 NULL true 0
NULL
+6295 "table" "clob" 0 0 6301 NULL true 1 NULL
+6296 "count" "bigint" 64 0 6301 NULL true 2
NULL
+6297 "columnsize" "bigint" 64 0 6301 NULL true
3 NULL
+6298 "heapsize" "bigint" 64 0 6301 NULL true
4 NULL
+6299 "indices" "bigint" 64 0 6301 NULL true
5 NULL
+6300 "auxillary" "bigint" 53 0 6301 NULL true
6 NULL
+6303 "schema" "clob" 0 0 6316 NULL true 0
NULL
+6304 "table" "clob" 0 0 6316 NULL true 1 NULL
+6305 "column" "clob" 0 0 6316 NULL true 2
NULL
+6306 "type" "clob" 0 0 6316 NULL true 3 NULL
+6307 "width" "int" 32 0 6316 NULL true 4 NULL
+6308 "stamp" "timestamp" 7 0 6316 NULL true 5
NULL
+6309 "sample" "bigint" 64 0 6316 NULL true
6 NULL
+6310 "count" "bigint" 64 0 6316 NULL true 7
NULL
+6311 "unique" "bigint" 64 0 6316 NULL true
8 NULL
+6312 "nils" "bigint" 64 0 6316 NULL true 9
NULL
+6313 "minval" "clob" 0 0 6316 NULL true 10
NULL
+6314 "maxval" "clob" 0 0 6316 NULL true 11
NULL
+6315 "sorted" "boolean" 1 0 6316 NULL true
12 NULL
+6369 "function_id" "int" 32 0 6370 NULL true 0
NULL
COMMIT;
START TRANSACTION;
CREATE TABLE "sys"."_tables" (
@@ -1996,14 +1967,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
-6247 "#storage" 2000 NULL 2 true 0 false
-6274 "storage" 2000 "create view sys.storage as select * from
sys.storage();" 1 true 0 false
-6286 "storagemodelinput" 2000 NULL 0 true 0 false
-6306 "#storagemodel" 2000 NULL 2 true 0 false
-6329 "storagemodel" 2000 "create view sys.storagemodel as select * from
sys.storagemodel();" 1 true 0 false
-6338 "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
-6353 "statistics" 2000 NULL 0 true 0 false
-6407 "systemfunctions" 2000 NULL 0 true 0 false
+6210 "#storage" 2000 NULL 2 true 0 false
+6237 "storage" 2000 "create view sys.storage as select * from
sys.storage();" 1 true 0 false
+6249 "storagemodelinput" 2000 NULL 0 true 0 false
+6269 "#storagemodel" 2000 NULL 2 true 0 false
+6292 "storagemodel" 2000 "create view sys.storagemodel as select * from
sys.storagemodel();" 1 true 0 false
+6301 "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
+6316 "statistics" 2000 NULL 0 true 0 false
+6370 "systemfunctions" 2000 NULL 0 true 0 false
COMMIT;
START TRANSACTION;
CREATE TABLE "sys"."args" (
@@ -2015,7 +1986,7 @@ CREATE TABLE "sys"."args" (
"type_scale" INTEGER,
"number" INTEGER
);
-COPY 3418 RECORDS INTO "sys"."args" FROM stdin USING DELIMITERS '\t','\n','"';
+COPY 3398 RECORDS INTO "sys"."args" FROM stdin USING DELIMITERS '\t','\n','"';
2151 28 "result" "oid" 31 0 0
2152 28 "arg_1" "wrd" 32 0 1
2153 29 "result" "oid" 31 0 0
@@ -5374,66 +5345,46 @@ 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
-6261 6260 "result" "table" 6247 0 0
-6291 6290 "result" "bigint" 64 0 0
-6292 6290 "nme" "clob" 0 0 1
-6293 6290 "i" "bigint" 64 0 2
-6294 6290 "d" "bigint" 64 0 3
-6297 6296 "result" "bigint" 64 0 0
-6298 6296 "tpe" "clob" 0 0 1
-6299 6296 "i" "bigint" 64 0 2
-6300 6296 "w" "int" 32 0 3
-6303 6302 "result" "bigint" 64 0 0
-6304 6302 "b" "boolean" 1 0 1
-6305 6302 "i" "bigint" 64 0 2
-6318 6317 "result" "table" 6306 0 0
-6358 6357 "tbl" "clob" 0 0 0
-6361 6360 "sch" "clob" 0 0 0
-6362 6360 "tbl" "clob" 0 0 1
-6365 6364 "sch" "clob" 0 0 0
-6366 6364 "tbl" "clob" 0 0 1
-6367 6364 "col" "clob" 0 0 2
-6370 6369 "sample" "bigint" 64 0 0
-6373 6372 "tbl" "clob" 0 0 0
-6374 6372 "sample" "bigint" 64 0 1
-6377 6376 "sch" "clob" 0 0 0
-6378 6376 "tbl" "clob" 0 0 1
-6379 6376 "sample" "bigint" 64 0 2
-6382 6381 "sch" "clob" 0 0 0
-6383 6381 "tbl" "clob" 0 0 1
-6384 6381 "col" "clob" 0 0 2
-6385 6381 "sample" "bigint" 64 0 3
-6388 6387 "result" "clob" 0 0 0
-6389 6387 "src" "clob" 0 0 1
-6392 6391 "result" "smallint" 16 0 0
-6393 6391 "one" "tinyint" 8 0 1
-6394 6391 "two" "tinyint" 8 0 2
-6397 6396 "result" "int" 32 0 0
-6398 6396 "one" "smallint" 16 0 1
-6399 6396 "two" "smallint" 16 0 2
-6402 6401 "result" "bigint" 64 0 0
-6403 6401 "one" "int" 32 0 1
-6404 6401 "two" "int" 32 0 2
+6224 6223 "result" "table" 6210 0 0
+6254 6253 "result" "bigint" 64 0 0
+6255 6253 "nme" "clob" 0 0 1
+6256 6253 "i" "bigint" 64 0 2
+6257 6253 "d" "bigint" 64 0 3
+6260 6259 "result" "bigint" 64 0 0
+6261 6259 "tpe" "clob" 0 0 1
+6262 6259 "i" "bigint" 64 0 2
+6263 6259 "w" "int" 32 0 3
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
