Changeset: cbd59cbb418d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cbd59cbb418d Modified Files: clients/Tests/SQL-dump_geom.stable.out clients/Tests/SQL-dump_geom.stable.out.32bit clients/Tests/SQL-dump_geom.stable.out.64bit.oid32 clients/Tests/SQL-dump_none.stable.out Branch: Oct2014 Log Message:
Approvals. diffs (truncated from 10675 to 300 lines): diff --git a/clients/Tests/SQL-dump_geom.stable.out b/clients/Tests/SQL-dump_geom.stable.out --- a/clients/Tests/SQL-dump_geom.stable.out +++ b/clients/Tests/SQL-dump_geom.stable.out @@ -167,6 +167,8 @@ SYSTEM FUNCTION sys.isaurl SYSTEM FUNCTION sys.isauuid SYSTEM FUNCTION sys.isempty SYSTEM FUNCTION sys.issimple +SYSTEM FUNCTION sys.left_shift +SYSTEM FUNCTION sys.left_shift_assign SYSTEM FUNCTION sys.length SYSTEM FUNCTION sys.like SYSTEM FUNCTION sys.linefromtext @@ -208,6 +210,8 @@ SYSTEM FUNCTION sys.relate SYSTEM FUNCTION sys.resume SYSTEM FUNCTION sys.reuse SYSTEM FUNCTION sys.reverse +SYSTEM FUNCTION sys.right_shift +SYSTEM FUNCTION sys.right_shift_assign SYSTEM FUNCTION sys.sessions SYSTEM FUNCTION sys.setmasklen SYSTEM FUNCTION sys.setsession @@ -1699,124 +1703,124 @@ 5240 "auth_id" "int" 32 0 5238 NULL true 5241 "privileges" "int" 32 0 5238 NULL true 2 NULL 5242 "grantor" "int" 32 0 5238 NULL true 3 NULL 5243 "grantable" "int" 32 0 5238 NULL true 4 NULL -5404 "id" "oid" 63 0 5411 NULL true 0 NULL -5405 "owner" "clob" 0 0 5411 NULL true 1 NULL -5406 "defined" "timestamp" 7 0 5411 NULL true 2 NULL -5407 "query" "clob" 0 0 5411 NULL true 3 NULL -5408 "pipe" "clob" 0 0 5411 NULL true 4 NULL -5409 "mal" "int" 32 0 5411 NULL true 5 NULL -5410 "optimize" "bigint" 64 0 5411 NULL true 6 NULL -5413 "id" "oid" 63 0 5423 NULL true 0 NULL -5414 "start" "timestamp" 7 0 5423 NULL true 1 NULL -5415 "stop" "timestamp" 7 0 5423 NULL true 2 NULL -5416 "arguments" "clob" 0 0 5423 NULL true 3 NULL -5417 "tuples" "wrd" 64 0 5423 NULL true 4 NULL -5418 "run" "bigint" 64 0 5423 NULL true 5 NULL -5419 "ship" "bigint" 64 0 5423 NULL true 6 NULL -5420 "cpu" "int" 32 0 5423 NULL true 7 NULL -5421 "io" "int" 32 0 5423 NULL true 8 NULL -5422 "space" "bigint" 64 0 5423 NULL true 9 NULL -5425 "id" "oid" 63 0 5441 NULL true 0 NULL -5426 "owner" "clob" 0 0 5441 NULL true 1 NULL -5427 "defined" "timestamp" 7 0 5441 NULL true 2 NULL -5428 "query" "clob" 0 0 5441 NULL true 3 NULL -5429 "pipe" "clob" 0 0 5441 NULL true 4 NULL -5430 "mal" "int" 32 0 5441 NULL true 5 NULL -5431 "optimize" "bigint" 64 0 5441 NULL true 6 NULL -5432 "start" "timestamp" 7 0 5441 NULL true 7 NULL -5433 "stop" "timestamp" 7 0 5441 NULL true 8 NULL -5434 "arguments" "clob" 0 0 5441 NULL true 9 NULL -5435 "tuples" "wrd" 64 0 5441 NULL true 10 NULL -5436 "run" "bigint" 64 0 5441 NULL true 11 NULL -5437 "ship" "bigint" 64 0 5441 NULL true 12 NULL -5438 "cpu" "int" 32 0 5441 NULL true 13 NULL -5439 "space" "bigint" 64 0 5441 NULL true 14 NULL -5440 "io" "int" 32 0 5441 NULL true 15 NULL -5466 "event" "int" 32 0 5478 NULL true 0 NULL -5467 "clk" "varchar" 20 0 5478 NULL true 1 NULL -5468 "pc" "varchar" 50 0 5478 NULL true 2 NULL -5469 "thread" "int" 32 0 5478 NULL true 3 NULL -5470 "user" "int" 32 0 5478 NULL true 4 NULL -5471 "ticks" "bigint" 64 0 5478 NULL true 5 NULL -5472 "reads" "bigint" 64 0 5478 NULL true 6 NULL -5473 "writes" "bigint" 64 0 5478 NULL true 7 NULL -5474 "rbytes" "bigint" 64 0 5478 NULL true 8 NULL -5475 "wbytes" "bigint" 64 0 5478 NULL true 9 NULL -5476 "type" "clob" 0 0 5478 NULL true 10 NULL -5477 "stmt" "clob" 0 0 5478 NULL true 11 NULL -5597 "user" "clob" 0 0 5603 NULL true 0 NULL -5598 "login" "timestamp" 7 0 5603 NULL true 1 NULL -5599 "sessiontimeout" "bigint" 64 0 5603 NULL true 2 NULL -5600 "lastcommand" "timestamp" 7 0 5603 NULL true 3 NULL -5601 "querytimeout" "bigint" 64 0 5603 NULL true 4 NULL -5602 "active" "boolean" 1 0 5603 NULL true 5 NULL -5680 "name" "clob" 0 0 5683 NULL true 0 NULL -5681 "def" "clob" 0 0 5683 NULL true 1 NULL -5682 "status" "clob" 0 0 5683 NULL true 2 NULL -5689 "name" "clob" 0 0 5691 NULL true 0 NULL -5690 "value" "clob" 0 0 5691 NULL true 1 NULL -5721 "qtag" "bigint" 64 0 5729 NULL true 0 NULL -5722 "user" "clob" 0 0 5729 NULL true 1 NULL -5723 "started" "timestamp" 7 0 5729 NULL true 2 NULL -5724 "estimate" "timestamp" 7 0 5729 NULL true 3 NULL -5725 "progress" "int" 32 0 5729 NULL true 4 NULL -5726 "status" "clob" 0 0 5729 NULL true 5 NULL -5727 "tag" "oid" 63 0 5729 NULL true 6 NULL -5728 "query" "clob" 0 0 5729 NULL true 7 NULL -6368 "schema" "clob" 0 0 6380 NULL true 0 NULL -6369 "table" "clob" 0 0 6380 NULL true 1 NULL -6370 "column" "clob" 0 0 6380 NULL true 2 NULL -6371 "type" "clob" 0 0 6380 NULL true 3 NULL -6372 "location" "clob" 0 0 6380 NULL true 4 NULL -6373 "count" "bigint" 64 0 6380 NULL true 5 NULL -6374 "typewidth" "int" 32 0 6380 NULL true 6 NULL -6375 "columnsize" "bigint" 64 0 6380 NULL true 7 NULL -6376 "heapsize" "bigint" 64 0 6380 NULL true 8 NULL -6377 "hashes" "bigint" 64 0 6380 NULL true 9 NULL -6378 "imprints" "bigint" 64 0 6380 NULL true 10 NULL -6379 "sorted" "boolean" 1 0 6380 NULL true 11 NULL -6382 "schema" "clob" 0 0 6392 NULL true 0 NULL -6383 "table" "clob" 0 0 6392 NULL true 1 NULL -6384 "column" "clob" 0 0 6392 NULL true 2 NULL -6385 "type" "clob" 0 0 6392 NULL true 3 NULL -6386 "typewidth" "int" 32 0 6392 NULL true 4 NULL -6387 "count" "bigint" 64 0 6392 NULL true 5 NULL -6388 "distinct" "bigint" 64 0 6392 NULL true 6 NULL -6389 "atomwidth" "int" 32 0 6392 NULL true 7 NULL -6390 "reference" "boolean" 1 0 6392 NULL true 8 NULL -6391 "sorted" "boolean" 1 0 6392 NULL true 9 NULL -6430 "schema" "clob" 0 0 6440 NULL true 0 NULL -6431 "table" "clob" 0 0 6440 NULL true 1 NULL -6432 "column" "clob" 0 0 6440 NULL true 2 NULL -6433 "type" "clob" 0 0 6440 NULL true 3 NULL -6434 "count" "bigint" 64 0 6440 NULL true 4 NULL -6435 "columnsize" "bigint" 64 0 6440 NULL true 5 NULL -6436 "heapsize" "bigint" 64 0 6440 NULL true 6 NULL -6437 "hashes" "bigint" 64 0 6440 NULL true 7 NULL -6438 "imprints" "bigint" 64 0 6440 NULL true 8 NULL -6439 "sorted" "boolean" 1 0 6440 NULL true 9 NULL -6442 "schema" "clob" 0 0 6450 NULL true 0 NULL -6443 "table" "clob" 0 0 6450 NULL true 1 NULL -6444 "count" "bigint" 64 0 6450 NULL true 2 NULL -6445 "columnsize" "bigint" 64 0 6450 NULL true 3 NULL -6446 "heapsize" "bigint" 64 0 6450 NULL true 4 NULL -6447 "hashes" "bigint" 64 0 6450 NULL true 5 NULL -6448 "imprints" "bigint" 64 0 6450 NULL true 6 NULL -6449 "auxiliary" "bigint" 53 0 6450 NULL true 7 NULL -6452 "schema" "clob" 0 0 6465 NULL true 0 NULL -6453 "table" "clob" 0 0 6465 NULL true 1 NULL -6454 "column" "clob" 0 0 6465 NULL true 2 NULL -6455 "type" "clob" 0 0 6465 NULL true 3 NULL -6456 "width" "int" 32 0 6465 NULL true 4 NULL -6457 "stamp" "timestamp" 7 0 6465 NULL true 5 NULL -6458 "sample" "bigint" 64 0 6465 NULL true 6 NULL -6459 "count" "bigint" 64 0 6465 NULL true 7 NULL -6460 "unique" "bigint" 64 0 6465 NULL true 8 NULL -6461 "nils" "bigint" 64 0 6465 NULL true 9 NULL -6462 "minval" "clob" 0 0 6465 NULL true 10 NULL -6463 "maxval" "clob" 0 0 6465 NULL true 11 NULL -6464 "sorted" "boolean" 1 0 6465 NULL true 12 NULL -6586 "function_id" "int" 32 0 6587 NULL true 0 NULL +5424 "id" "oid" 63 0 5431 NULL true 0 NULL +5425 "owner" "clob" 0 0 5431 NULL true 1 NULL +5426 "defined" "timestamp" 7 0 5431 NULL true 2 NULL +5427 "query" "clob" 0 0 5431 NULL true 3 NULL +5428 "pipe" "clob" 0 0 5431 NULL true 4 NULL +5429 "mal" "int" 32 0 5431 NULL true 5 NULL +5430 "optimize" "bigint" 64 0 5431 NULL true 6 NULL +5433 "id" "oid" 63 0 5443 NULL true 0 NULL +5434 "start" "timestamp" 7 0 5443 NULL true 1 NULL +5435 "stop" "timestamp" 7 0 5443 NULL true 2 NULL +5436 "arguments" "clob" 0 0 5443 NULL true 3 NULL +5437 "tuples" "wrd" 64 0 5443 NULL true 4 NULL +5438 "run" "bigint" 64 0 5443 NULL true 5 NULL +5439 "ship" "bigint" 64 0 5443 NULL true 6 NULL +5440 "cpu" "int" 32 0 5443 NULL true 7 NULL +5441 "io" "int" 32 0 5443 NULL true 8 NULL +5442 "space" "bigint" 64 0 5443 NULL true 9 NULL +5445 "id" "oid" 63 0 5461 NULL true 0 NULL +5446 "owner" "clob" 0 0 5461 NULL true 1 NULL +5447 "defined" "timestamp" 7 0 5461 NULL true 2 NULL +5448 "query" "clob" 0 0 5461 NULL true 3 NULL +5449 "pipe" "clob" 0 0 5461 NULL true 4 NULL +5450 "mal" "int" 32 0 5461 NULL true 5 NULL +5451 "optimize" "bigint" 64 0 5461 NULL true 6 NULL +5452 "start" "timestamp" 7 0 5461 NULL true 7 NULL +5453 "stop" "timestamp" 7 0 5461 NULL true 8 NULL +5454 "arguments" "clob" 0 0 5461 NULL true 9 NULL +5455 "tuples" "wrd" 64 0 5461 NULL true 10 NULL +5456 "run" "bigint" 64 0 5461 NULL true 11 NULL +5457 "ship" "bigint" 64 0 5461 NULL true 12 NULL +5458 "cpu" "int" 32 0 5461 NULL true 13 NULL +5459 "space" "bigint" 64 0 5461 NULL true 14 NULL +5460 "io" "int" 32 0 5461 NULL true 15 NULL +5486 "event" "int" 32 0 5498 NULL true 0 NULL +5487 "clk" "varchar" 20 0 5498 NULL true 1 NULL +5488 "pc" "varchar" 50 0 5498 NULL true 2 NULL +5489 "thread" "int" 32 0 5498 NULL true 3 NULL +5490 "user" "int" 32 0 5498 NULL true 4 NULL +5491 "ticks" "bigint" 64 0 5498 NULL true 5 NULL +5492 "reads" "bigint" 64 0 5498 NULL true 6 NULL +5493 "writes" "bigint" 64 0 5498 NULL true 7 NULL +5494 "rbytes" "bigint" 64 0 5498 NULL true 8 NULL +5495 "wbytes" "bigint" 64 0 5498 NULL true 9 NULL +5496 "type" "clob" 0 0 5498 NULL true 10 NULL +5497 "stmt" "clob" 0 0 5498 NULL true 11 NULL +5617 "user" "clob" 0 0 5623 NULL true 0 NULL +5618 "login" "timestamp" 7 0 5623 NULL true 1 NULL +5619 "sessiontimeout" "bigint" 64 0 5623 NULL true 2 NULL +5620 "lastcommand" "timestamp" 7 0 5623 NULL true 3 NULL +5621 "querytimeout" "bigint" 64 0 5623 NULL true 4 NULL +5622 "active" "boolean" 1 0 5623 NULL true 5 NULL +5700 "name" "clob" 0 0 5703 NULL true 0 NULL +5701 "def" "clob" 0 0 5703 NULL true 1 NULL +5702 "status" "clob" 0 0 5703 NULL true 2 NULL +5709 "name" "clob" 0 0 5711 NULL true 0 NULL +5710 "value" "clob" 0 0 5711 NULL true 1 NULL +5741 "qtag" "bigint" 64 0 5749 NULL true 0 NULL +5742 "user" "clob" 0 0 5749 NULL true 1 NULL +5743 "started" "timestamp" 7 0 5749 NULL true 2 NULL +5744 "estimate" "timestamp" 7 0 5749 NULL true 3 NULL +5745 "progress" "int" 32 0 5749 NULL true 4 NULL +5746 "status" "clob" 0 0 5749 NULL true 5 NULL +5747 "tag" "oid" 63 0 5749 NULL true 6 NULL +5748 "query" "clob" 0 0 5749 NULL true 7 NULL +6388 "schema" "clob" 0 0 6400 NULL true 0 NULL +6389 "table" "clob" 0 0 6400 NULL true 1 NULL +6390 "column" "clob" 0 0 6400 NULL true 2 NULL +6391 "type" "clob" 0 0 6400 NULL true 3 NULL +6392 "location" "clob" 0 0 6400 NULL true 4 NULL +6393 "count" "bigint" 64 0 6400 NULL true 5 NULL +6394 "typewidth" "int" 32 0 6400 NULL true 6 NULL +6395 "columnsize" "bigint" 64 0 6400 NULL true 7 NULL +6396 "heapsize" "bigint" 64 0 6400 NULL true 8 NULL +6397 "hashes" "bigint" 64 0 6400 NULL true 9 NULL +6398 "imprints" "bigint" 64 0 6400 NULL true 10 NULL +6399 "sorted" "boolean" 1 0 6400 NULL true 11 NULL +6402 "schema" "clob" 0 0 6412 NULL true 0 NULL +6403 "table" "clob" 0 0 6412 NULL true 1 NULL +6404 "column" "clob" 0 0 6412 NULL true 2 NULL +6405 "type" "clob" 0 0 6412 NULL true 3 NULL +6406 "typewidth" "int" 32 0 6412 NULL true 4 NULL +6407 "count" "bigint" 64 0 6412 NULL true 5 NULL +6408 "distinct" "bigint" 64 0 6412 NULL true 6 NULL +6409 "atomwidth" "int" 32 0 6412 NULL true 7 NULL +6410 "reference" "boolean" 1 0 6412 NULL true 8 NULL +6411 "sorted" "boolean" 1 0 6412 NULL true 9 NULL +6450 "schema" "clob" 0 0 6460 NULL true 0 NULL +6451 "table" "clob" 0 0 6460 NULL true 1 NULL +6452 "column" "clob" 0 0 6460 NULL true 2 NULL +6453 "type" "clob" 0 0 6460 NULL true 3 NULL +6454 "count" "bigint" 64 0 6460 NULL true 4 NULL +6455 "columnsize" "bigint" 64 0 6460 NULL true 5 NULL +6456 "heapsize" "bigint" 64 0 6460 NULL true 6 NULL +6457 "hashes" "bigint" 64 0 6460 NULL true 7 NULL +6458 "imprints" "bigint" 64 0 6460 NULL true 8 NULL +6459 "sorted" "boolean" 1 0 6460 NULL true 9 NULL +6462 "schema" "clob" 0 0 6470 NULL true 0 NULL +6463 "table" "clob" 0 0 6470 NULL true 1 NULL +6464 "count" "bigint" 64 0 6470 NULL true 2 NULL +6465 "columnsize" "bigint" 64 0 6470 NULL true 3 NULL +6466 "heapsize" "bigint" 64 0 6470 NULL true 4 NULL +6467 "hashes" "bigint" 64 0 6470 NULL true 5 NULL +6468 "imprints" "bigint" 64 0 6470 NULL true 6 NULL +6469 "auxiliary" "bigint" 53 0 6470 NULL true 7 NULL +6472 "schema" "clob" 0 0 6485 NULL true 0 NULL +6473 "table" "clob" 0 0 6485 NULL true 1 NULL +6474 "column" "clob" 0 0 6485 NULL true 2 NULL +6475 "type" "clob" 0 0 6485 NULL true 3 NULL +6476 "width" "int" 32 0 6485 NULL true 4 NULL +6477 "stamp" "timestamp" 7 0 6485 NULL true 5 NULL +6478 "sample" "bigint" 64 0 6485 NULL true 6 NULL +6479 "count" "bigint" 64 0 6485 NULL true 7 NULL +6480 "unique" "bigint" 64 0 6485 NULL true 8 NULL +6481 "nils" "bigint" 64 0 6485 NULL true 9 NULL +6482 "minval" "clob" 0 0 6485 NULL true 10 NULL +6483 "maxval" "clob" 0 0 6485 NULL true 11 NULL +6484 "sorted" "boolean" 1 0 6485 NULL true 12 NULL +6606 "function_id" "int" 32 0 6607 NULL true 0 NULL COMMIT; START TRANSACTION; CREATE TABLE "sys"."_tables" ( @@ -1856,20 +1860,20 @@ 5227 "users" 2000 "SELECT u.""name"" AS 5231 "user_role" 2000 NULL 0 true 0 false 5234 "auths" 2000 NULL 0 true 0 false 5238 "privileges" 2000 NULL 0 true 0 false -5411 "querylog_catalog" 2000 "-- create table views for convenience\ncreate view sys.querylog_catalog as select * from sys.querylog_catalog();" 1 true 0 false -5423 "querylog_calls" 2000 "create view sys.querylog_calls as select * from sys.querylog_calls();" 1 true 0 false -5441 "querylog_history" 2000 "create view sys.querylog_history as\nselect qd.*, ql.""start"",ql.""stop"", ql.arguments, ql.tuples, ql.run, ql.ship, ql.cpu, ql.space, ql.io \nfrom sys.querylog_catalog() qd, sys.querylog_calls() ql\nwhere qd.id = ql.id and qd.owner = user;" 1 true 0 false -5478 "tracelog" 2000 "create view sys.tracelog as select * from sys.tracelog();" 1 true 0 false -5603 "sessions" 2000 "create view sys.sessions as select * from sys.sessions();" 1 true 0 false -5683 "optimizers" 2000 "create view sys.optimizers as select * from sys.optimizers();" 1 true 0 false -5691 "environment" 2000 "create view sys.environment as select * from sys.environment();" 1 true 0 false -5729 "queue" 2000 "create view sys.queue as select * from sys.queue();" 1 true 0 false -6380 "storage" 2000 "create view sys.storage as select * from sys.storage();" 1 true 0 false -6392 "storagemodelinput" 2000 NULL 0 true 0 false -6440 "storagemodel" 2000 "create view sys.storagemodel as select * from sys.storagemodel();" 1 true 0 false -6450 "tablestoragemodel" 2000 "-- A summary of the table storage requirement is is available as a table view.\n-- The auxiliary 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(hashes) as hashes,\n\tsum(imprints) as imprints,\n\tsum(case when sorted = false then 8 * count else 0 end) as auxiliary\nfrom sys.storagemodel() group by ""schema"",""table"";" 1 true 0 false -6465 "statistics" 2000 NULL 0 true 0 false -6587 "systemfunctions" 2000 NULL 0 true 0 false +5431 "querylog_catalog" 2000 "-- create table views for convenience\ncreate view sys.querylog_catalog as select * from sys.querylog_catalog();" 1 true 0 false +5443 "querylog_calls" 2000 "create view sys.querylog_calls as select * from sys.querylog_calls();" 1 true 0 false +5461 "querylog_history" 2000 "create view sys.querylog_history as\nselect qd.*, ql.""start"",ql.""stop"", ql.arguments, ql.tuples, ql.run, ql.ship, ql.cpu, ql.space, ql.io \nfrom sys.querylog_catalog() qd, sys.querylog_calls() ql\nwhere qd.id = ql.id and qd.owner = user;" 1 true 0 false +5498 "tracelog" 2000 "create view sys.tracelog as select * from sys.tracelog();" 1 true 0 false +5623 "sessions" 2000 "create view sys.sessions as select * from sys.sessions();" 1 true 0 false +5703 "optimizers" 2000 "create view sys.optimizers as select * from sys.optimizers();" 1 true 0 false +5711 "environment" 2000 "create view sys.environment as select * from sys.environment();" 1 true 0 false +5749 "queue" 2000 "create view sys.queue as select * from sys.queue();" 1 true 0 false +6400 "storage" 2000 "create view sys.storage as select * from sys.storage();" 1 true 0 false +6412 "storagemodelinput" 2000 NULL 0 true 0 false +6460 "storagemodel" 2000 "create view sys.storagemodel as select * from sys.storagemodel();" 1 true 0 false +6470 "tablestoragemodel" 2000 "-- A summary of the table storage requirement is is available as a table view.\n-- The auxiliary 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(hashes) as hashes,\n\tsum(imprints) as imprints,\n\tsum(case when sorted = false then 8 * count else 0 end) as auxiliary\nfrom sys.storagemodel() group by ""schema"",""table"";" 1 true 0 false +6485 "statistics" 2000 NULL 0 true 0 false +6607 "systemfunctions" 2000 NULL 0 true 0 false COMMIT; START TRANSACTION; CREATE TABLE "sys"."args" ( @@ -1882,7 +1886,7 @@ CREATE TABLE "sys"."args" ( _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
