Changeset: 6e4bf6d6df22 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6e4bf6d6df22 Modified Files: clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.int128 clients/Tests/SQL-dump.stable.out.oid32 clients/Tests/SQL-dump.stable.out.oid32.int128 sql/scripts/Makefile.ag sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions.stable.out.int128 sql/test/leaks/Tests/check1.stable.out sql/test/leaks/Tests/check1.stable.out.int128 sql/test/leaks/Tests/check2.stable.out sql/test/leaks/Tests/check2.stable.out.int128 sql/test/leaks/Tests/check3.stable.out sql/test/leaks/Tests/check3.stable.out.int128 sql/test/leaks/Tests/check4.stable.out sql/test/leaks/Tests/check4.stable.out.int128 sql/test/leaks/Tests/check5.stable.out sql/test/leaks/Tests/check5.stable.out.int128 Branch: resultset Log Message:
re-applied lost merge from default / fixed incorrect merge conflict resolve detected more or less by chance --- are there more such problems ... ? diffs (truncated from 12442 to 300 lines): 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 @@ -106,8 +106,6 @@ SYSTEM FUNCTION sys.broadcast SYSTEM FUNCTION sys.buffer SYSTEM FUNCTION sys.chi2prob SYSTEM FUNCTION sys.clearrejects -SYSTEM FUNCTION sys.cluster1 -SYSTEM FUNCTION sys.cluster2 SYSTEM FUNCTION sys.columnsize SYSTEM FUNCTION sys.contains SYSTEM FUNCTION sys.convert @@ -502,23 +500,6 @@ create function buffer(a geometry, dista -- Calculate Chi squared probability create function sys.chi2prob(chi2 double, datapoints double) returns double external name gsl."chi2prob"; --- This Source Code Form is subject to the terms of the Mozilla Public --- License, v. 2.0. If a copy of the MPL was not distributed with this --- file, You can obtain one at http://mozilla.org/MPL/2.0/. --- --- Copyright 2008-2015 MonetDB B.V. - --- Clustering a relational table should be done with care. --- For, the oid's are used in join-indices. - --- Clustering of tables may improve IO performance --- The foreign key constraints should be dropped before --- and re-established after the cluster operation. - -create procedure cluster1(sys string, tab string) - external name sql.cluster1; -create procedure cluster2(sys string, tab string) - external name sql.cluster2; -- The predicted storage footprint of the complete database -- determines the amount of diskspace needed for persistent storage -- and the upperbound when all possible index structures are created. @@ -1567,125 +1548,125 @@ 5508 "minflt" "bigint" 64 0 5512 NULL tr 5509 "majflt" "bigint" 64 0 5512 NULL true 10 NULL 5510 "nvcsw" "bigint" 64 0 5512 NULL true 11 NULL 5511 "stmt" "clob" 0 0 5512 NULL true 12 NULL -5650 "user" "clob" 0 0 5656 NULL true 0 NULL -5651 "login" "timestamp" 7 0 5656 NULL true 1 NULL -5652 "sessiontimeout" "bigint" 64 0 5656 NULL true 2 NULL -5653 "lastcommand" "timestamp" 7 0 5656 NULL true 3 NULL -5654 "querytimeout" "bigint" 64 0 5656 NULL true 4 NULL -5655 "active" "boolean" 1 0 5656 NULL true 5 NULL -5733 "name" "clob" 0 0 5736 NULL true 0 NULL -5734 "def" "clob" 0 0 5736 NULL true 1 NULL -5735 "status" "clob" 0 0 5736 NULL true 2 NULL -5742 "name" "clob" 0 0 5744 NULL true 0 NULL -5743 "value" "clob" 0 0 5744 NULL true 1 NULL -5774 "qtag" "bigint" 64 0 5782 NULL true 0 NULL -5775 "user" "clob" 0 0 5782 NULL true 1 NULL -5776 "started" "timestamp" 7 0 5782 NULL true 2 NULL -5777 "estimate" "timestamp" 7 0 5782 NULL true 3 NULL -5778 "progress" "int" 32 0 5782 NULL true 4 NULL -5779 "status" "clob" 0 0 5782 NULL true 5 NULL -5780 "tag" "oid" 63 0 5782 NULL true 6 NULL -5781 "query" "clob" 0 0 5782 NULL true 7 NULL -5808 "rowid" "bigint" 64 0 5812 NULL true 0 NULL -5809 "fldid" "int" 32 0 5812 NULL true 1 NULL -5810 "message" "clob" 0 0 5812 NULL true 2 NULL -5811 "input" "clob" 0 0 5812 NULL true 3 NULL -6454 "schema" "clob" 0 0 6467 NULL true 0 NULL -6455 "table" "clob" 0 0 6467 NULL true 1 NULL -6456 "column" "clob" 0 0 6467 NULL true 2 NULL -6457 "type" "clob" 0 0 6467 NULL true 3 NULL -6458 "mode" "clob" 0 0 6467 NULL true 4 NULL -6459 "location" "clob" 0 0 6467 NULL true 5 NULL -6460 "count" "bigint" 64 0 6467 NULL true 6 NULL -6461 "typewidth" "int" 32 0 6467 NULL true 7 NULL -6462 "columnsize" "bigint" 64 0 6467 NULL true 8 NULL -6463 "heapsize" "bigint" 64 0 6467 NULL true 9 NULL -6464 "hashes" "bigint" 64 0 6467 NULL true 10 NULL -6465 "imprints" "bigint" 64 0 6467 NULL true 11 NULL -6466 "sorted" "boolean" 1 0 6467 NULL true 12 NULL -6469 "schema" "clob" 0 0 6479 NULL true 0 NULL -6470 "table" "clob" 0 0 6479 NULL true 1 NULL -6471 "column" "clob" 0 0 6479 NULL true 2 NULL -6472 "type" "clob" 0 0 6479 NULL true 3 NULL -6473 "typewidth" "int" 32 0 6479 NULL true 4 NULL -6474 "count" "bigint" 64 0 6479 NULL true 5 NULL -6475 "distinct" "bigint" 64 0 6479 NULL true 6 NULL -6476 "atomwidth" "int" 32 0 6479 NULL true 7 NULL -6477 "reference" "boolean" 1 0 6479 NULL true 8 NULL -6478 "sorted" "boolean" 1 0 6479 NULL true 9 NULL -6517 "schema" "clob" 0 0 6527 NULL true 0 NULL -6518 "table" "clob" 0 0 6527 NULL true 1 NULL -6519 "column" "clob" 0 0 6527 NULL true 2 NULL -6520 "type" "clob" 0 0 6527 NULL true 3 NULL -6521 "count" "bigint" 64 0 6527 NULL true 4 NULL -6522 "columnsize" "bigint" 64 0 6527 NULL true 5 NULL -6523 "heapsize" "bigint" 64 0 6527 NULL true 6 NULL -6524 "hashes" "bigint" 64 0 6527 NULL true 7 NULL -6525 "imprints" "bigint" 64 0 6527 NULL true 8 NULL -6526 "sorted" "boolean" 1 0 6527 NULL true 9 NULL -6529 "schema" "clob" 0 0 6537 NULL true 0 NULL -6530 "table" "clob" 0 0 6537 NULL true 1 NULL -6531 "count" "bigint" 64 0 6537 NULL true 2 NULL -6532 "columnsize" "bigint" 64 0 6537 NULL true 3 NULL -6533 "heapsize" "bigint" 64 0 6537 NULL true 4 NULL -6534 "hashes" "bigint" 64 0 6537 NULL true 5 NULL -6535 "imprints" "bigint" 64 0 6537 NULL true 6 NULL -6536 "auxiliary" "bigint" 64 0 6537 NULL true 7 NULL -6539 "column_id" "int" 32 0 6550 NULL true 0 NULL -6540 "type" "clob" 0 0 6550 NULL true 1 NULL -6541 "width" "int" 32 0 6550 NULL true 2 NULL -6542 "stamp" "timestamp" 7 0 6550 NULL true 3 NULL -6543 "sample" "bigint" 64 0 6550 NULL true 4 NULL -6544 "count" "bigint" 64 0 6550 NULL true 5 NULL -6545 "unique" "bigint" 64 0 6550 NULL true 6 NULL -6546 "nils" "bigint" 64 0 6550 NULL true 7 NULL -6547 "minval" "clob" 0 0 6550 NULL true 8 NULL -6548 "maxval" "clob" 0 0 6550 NULL true 9 NULL -6549 "sorted" "boolean" 1 0 6550 NULL true 10 NULL -6645 "file_id" "bigint" 64 0 6653 NULL false 0 NULL -6646 "file_location" "clob" 0 0 6653 NULL false 1 NULL -6647 "dbschema" "smallint" 16 0 6653 NULL false 2 NULL -6648 "format_version" "varchar" 7 0 6653 NULL true 3 NULL -6649 "sorting_order" "varchar" 10 0 6653 NULL true 4 NULL -6650 "comments" "clob" 0 0 6653 NULL true 5 NULL -6655 "sn" "clob" 0 0 6666 NULL false 0 NULL -6656 "file_id" "bigint" 64 0 6666 NULL false 1 NULL -6657 "ln" "int" 32 0 6666 NULL true 2 NULL -6658 "as" "int" 32 0 6666 NULL true 3 NULL -6659 "m5" "clob" 0 0 6666 NULL true 4 NULL -6660 "sp" "clob" 0 0 6666 NULL true 5 NULL -6661 "ur" "clob" 0 0 6666 NULL true 6 NULL -6668 "id" "clob" 0 0 6685 NULL false 0 NULL -6669 "file_id" "bigint" 64 0 6685 NULL false 1 NULL -6670 "cn" "clob" 0 0 6685 NULL true 2 NULL -6671 "ds" "clob" 0 0 6685 NULL true 3 NULL -6672 "dt" "timestamp" 7 0 6685 NULL true 4 NULL -6673 "fo" "clob" 0 0 6685 NULL true 5 NULL -6674 "ks" "clob" 0 0 6685 NULL true 6 NULL -6675 "lb" "clob" 0 0 6685 NULL true 7 NULL -6676 "pg" "clob" 0 0 6685 NULL true 8 NULL -6677 "pi" "int" 32 0 6685 NULL true 9 NULL -6678 "pl" "clob" 0 0 6685 NULL true 10 NULL -6679 "pu" "clob" 0 0 6685 NULL true 11 NULL -6680 "sm" "clob" 0 0 6685 NULL true 12 NULL -6687 "id" "clob" 0 0 6697 NULL false 0 NULL -6688 "file_id" "bigint" 64 0 6697 NULL false 1 NULL -6689 "pn" "clob" 0 0 6697 NULL true 2 NULL -6690 "cl" "clob" 0 0 6697 NULL true 3 NULL -6691 "pp" "clob" 0 0 6697 NULL true 4 NULL -6692 "vn" "clob" 0 0 6697 NULL true 5 NULL -6699 "qname" "clob" 0 0 6710 NULL false 0 NULL -6700 "flag" "smallint" 16 0 6710 NULL false 1 NULL -6701 "rname" "clob" 0 0 6710 NULL false 2 NULL -6702 "pos" "int" 32 0 6710 NULL false 3 NULL -6703 "mapq" "smallint" 16 0 6710 NULL false 4 NULL -6704 "cigar" "clob" 0 0 6710 NULL false 5 NULL -6705 "rnext" "clob" 0 0 6710 NULL false 6 NULL -6706 "pnext" "int" 32 0 6710 NULL false 7 NULL -6707 "tlen" "int" 32 0 6710 NULL false 8 NULL -6708 "seq" "clob" 0 0 6710 NULL false 9 NULL -6709 "qual" "clob" 0 0 6710 NULL false 10 NULL -6780 "function_id" "int" 32 0 6781 NULL true 0 NULL +5642 "user" "clob" 0 0 5648 NULL true 0 NULL +5643 "login" "timestamp" 7 0 5648 NULL true 1 NULL +5644 "sessiontimeout" "bigint" 64 0 5648 NULL true 2 NULL +5645 "lastcommand" "timestamp" 7 0 5648 NULL true 3 NULL +5646 "querytimeout" "bigint" 64 0 5648 NULL true 4 NULL +5647 "active" "boolean" 1 0 5648 NULL true 5 NULL +5725 "name" "clob" 0 0 5728 NULL true 0 NULL +5726 "def" "clob" 0 0 5728 NULL true 1 NULL +5727 "status" "clob" 0 0 5728 NULL true 2 NULL +5734 "name" "clob" 0 0 5736 NULL true 0 NULL +5735 "value" "clob" 0 0 5736 NULL true 1 NULL +5766 "qtag" "bigint" 64 0 5774 NULL true 0 NULL +5767 "user" "clob" 0 0 5774 NULL true 1 NULL +5768 "started" "timestamp" 7 0 5774 NULL true 2 NULL +5769 "estimate" "timestamp" 7 0 5774 NULL true 3 NULL +5770 "progress" "int" 32 0 5774 NULL true 4 NULL +5771 "status" "clob" 0 0 5774 NULL true 5 NULL +5772 "tag" "oid" 63 0 5774 NULL true 6 NULL +5773 "query" "clob" 0 0 5774 NULL true 7 NULL +5800 "rowid" "bigint" 64 0 5804 NULL true 0 NULL +5801 "fldid" "int" 32 0 5804 NULL true 1 NULL +5802 "message" "clob" 0 0 5804 NULL true 2 NULL +5803 "input" "clob" 0 0 5804 NULL true 3 NULL +6446 "schema" "clob" 0 0 6459 NULL true 0 NULL +6447 "table" "clob" 0 0 6459 NULL true 1 NULL +6448 "column" "clob" 0 0 6459 NULL true 2 NULL +6449 "type" "clob" 0 0 6459 NULL true 3 NULL +6450 "mode" "clob" 0 0 6459 NULL true 4 NULL +6451 "location" "clob" 0 0 6459 NULL true 5 NULL +6452 "count" "bigint" 64 0 6459 NULL true 6 NULL +6453 "typewidth" "int" 32 0 6459 NULL true 7 NULL +6454 "columnsize" "bigint" 64 0 6459 NULL true 8 NULL +6455 "heapsize" "bigint" 64 0 6459 NULL true 9 NULL +6456 "hashes" "bigint" 64 0 6459 NULL true 10 NULL +6457 "imprints" "bigint" 64 0 6459 NULL true 11 NULL +6458 "sorted" "boolean" 1 0 6459 NULL true 12 NULL +6461 "schema" "clob" 0 0 6471 NULL true 0 NULL +6462 "table" "clob" 0 0 6471 NULL true 1 NULL +6463 "column" "clob" 0 0 6471 NULL true 2 NULL +6464 "type" "clob" 0 0 6471 NULL true 3 NULL +6465 "typewidth" "int" 32 0 6471 NULL true 4 NULL +6466 "count" "bigint" 64 0 6471 NULL true 5 NULL +6467 "distinct" "bigint" 64 0 6471 NULL true 6 NULL +6468 "atomwidth" "int" 32 0 6471 NULL true 7 NULL +6469 "reference" "boolean" 1 0 6471 NULL true 8 NULL +6470 "sorted" "boolean" 1 0 6471 NULL true 9 NULL +6509 "schema" "clob" 0 0 6519 NULL true 0 NULL +6510 "table" "clob" 0 0 6519 NULL true 1 NULL +6511 "column" "clob" 0 0 6519 NULL true 2 NULL +6512 "type" "clob" 0 0 6519 NULL true 3 NULL +6513 "count" "bigint" 64 0 6519 NULL true 4 NULL +6514 "columnsize" "bigint" 64 0 6519 NULL true 5 NULL +6515 "heapsize" "bigint" 64 0 6519 NULL true 6 NULL +6516 "hashes" "bigint" 64 0 6519 NULL true 7 NULL +6517 "imprints" "bigint" 64 0 6519 NULL true 8 NULL +6518 "sorted" "boolean" 1 0 6519 NULL true 9 NULL +6521 "schema" "clob" 0 0 6529 NULL true 0 NULL +6522 "table" "clob" 0 0 6529 NULL true 1 NULL +6523 "count" "bigint" 64 0 6529 NULL true 2 NULL +6524 "columnsize" "bigint" 64 0 6529 NULL true 3 NULL +6525 "heapsize" "bigint" 64 0 6529 NULL true 4 NULL +6526 "hashes" "bigint" 64 0 6529 NULL true 5 NULL +6527 "imprints" "bigint" 64 0 6529 NULL true 6 NULL +6528 "auxiliary" "bigint" 64 0 6529 NULL true 7 NULL +6531 "column_id" "int" 32 0 6542 NULL true 0 NULL +6532 "type" "clob" 0 0 6542 NULL true 1 NULL +6533 "width" "int" 32 0 6542 NULL true 2 NULL +6534 "stamp" "timestamp" 7 0 6542 NULL true 3 NULL +6535 "sample" "bigint" 64 0 6542 NULL true 4 NULL +6536 "count" "bigint" 64 0 6542 NULL true 5 NULL +6537 "unique" "bigint" 64 0 6542 NULL true 6 NULL +6538 "nils" "bigint" 64 0 6542 NULL true 7 NULL +6539 "minval" "clob" 0 0 6542 NULL true 8 NULL +6540 "maxval" "clob" 0 0 6542 NULL true 9 NULL +6541 "sorted" "boolean" 1 0 6542 NULL true 10 NULL +6637 "file_id" "bigint" 64 0 6645 NULL false 0 NULL +6638 "file_location" "clob" 0 0 6645 NULL false 1 NULL +6639 "dbschema" "smallint" 16 0 6645 NULL false 2 NULL +6640 "format_version" "varchar" 7 0 6645 NULL true 3 NULL +6641 "sorting_order" "varchar" 10 0 6645 NULL true 4 NULL +6642 "comments" "clob" 0 0 6645 NULL true 5 NULL +6647 "sn" "clob" 0 0 6658 NULL false 0 NULL +6648 "file_id" "bigint" 64 0 6658 NULL false 1 NULL +6649 "ln" "int" 32 0 6658 NULL true 2 NULL +6650 "as" "int" 32 0 6658 NULL true 3 NULL +6651 "m5" "clob" 0 0 6658 NULL true 4 NULL +6652 "sp" "clob" 0 0 6658 NULL true 5 NULL +6653 "ur" "clob" 0 0 6658 NULL true 6 NULL +6660 "id" "clob" 0 0 6677 NULL false 0 NULL +6661 "file_id" "bigint" 64 0 6677 NULL false 1 NULL +6662 "cn" "clob" 0 0 6677 NULL true 2 NULL +6663 "ds" "clob" 0 0 6677 NULL true 3 NULL +6664 "dt" "timestamp" 7 0 6677 NULL true 4 NULL +6665 "fo" "clob" 0 0 6677 NULL true 5 NULL +6666 "ks" "clob" 0 0 6677 NULL true 6 NULL +6667 "lb" "clob" 0 0 6677 NULL true 7 NULL +6668 "pg" "clob" 0 0 6677 NULL true 8 NULL +6669 "pi" "int" 32 0 6677 NULL true 9 NULL +6670 "pl" "clob" 0 0 6677 NULL true 10 NULL +6671 "pu" "clob" 0 0 6677 NULL true 11 NULL +6672 "sm" "clob" 0 0 6677 NULL true 12 NULL +6679 "id" "clob" 0 0 6689 NULL false 0 NULL +6680 "file_id" "bigint" 64 0 6689 NULL false 1 NULL +6681 "pn" "clob" 0 0 6689 NULL true 2 NULL +6682 "cl" "clob" 0 0 6689 NULL true 3 NULL +6683 "pp" "clob" 0 0 6689 NULL true 4 NULL +6684 "vn" "clob" 0 0 6689 NULL true 5 NULL +6691 "qname" "clob" 0 0 6702 NULL false 0 NULL +6692 "flag" "smallint" 16 0 6702 NULL false 1 NULL +6693 "rname" "clob" 0 0 6702 NULL false 2 NULL +6694 "pos" "int" 32 0 6702 NULL false 3 NULL +6695 "mapq" "smallint" 16 0 6702 NULL false 4 NULL +6696 "cigar" "clob" 0 0 6702 NULL false 5 NULL +6697 "rnext" "clob" 0 0 6702 NULL false 6 NULL +6698 "pnext" "int" 32 0 6702 NULL false 7 NULL +6699 "tlen" "int" 32 0 6702 NULL false 8 NULL +6700 "seq" "clob" 0 0 6702 NULL false 9 NULL +6701 "qual" "clob" 0 0 6702 NULL false 10 NULL +6772 "function_id" "int" 32 0 6773 NULL true 0 NULL COMMIT; START TRANSACTION; CREATE TABLE "sys"."_tables" ( @@ -1729,22 +1710,22 @@ 5444 "querylog_catalog" 2000 "-- create 5455 "querylog_calls" 2000 "create view sys.querylog_calls as select * from sys.querylog_calls();" 1 true 0 0 5473 "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.io \nfrom sys.querylog_catalog() qd, sys.querylog_calls() ql\nwhere qd.id = ql.id and qd.owner = user;" 1 true 0 0 5512 "tracelog" 2000 "create view sys.tracelog as select * from sys.tracelog();" 1 true 0 0 -5656 "sessions" 2000 "create view sys.sessions as select * from sys.sessions();" 1 true 0 0 -5736 "optimizers" 2000 "create view sys.optimizers as select * from sys.optimizers();" 1 true 0 0 -5744 "environment" 2000 "create view sys.environment as select * from sys.environment();" 1 true 0 0 -5782 "queue" 2000 "create view sys.queue as select * from sys.queue();" 1 true 0 0 -5812 "rejects" 2000 "create view sys.rejects as select * from sys.rejects();" 1 true 0 0 -6467 "storage" 2000 "create view sys.""storage"" as select * from sys.""storage""();" 1 true 0 0 -6479 "storagemodelinput" 2000 NULL 0 true 0 0 -6527 "storagemodel" 2000 "create view sys.storagemodel as select * from sys.storagemodel();" 1 true 0 0 -6537 "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 0 -6550 "statistics" 2000 NULL 0 true 0 0 -6653 "files" 6602 NULL 0 true 0 0 -6666 "sq" 6602 NULL 0 true 0 0 -6685 "rg" 6602 NULL 0 true 0 0 -6697 "pg" 6602 NULL 0 true 0 0 -6710 "export" 6602 NULL 0 true 0 0 _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
