Changeset: 05b451d81b7f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=05b451d81b7f
Added Files:
clients/python2/test/test_monetize.py
clients/python3/test/test_monetize.py
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/SQL-dump.stable.out
clients/Tests/exports.stable.out
clients/mapiclient/Tests/tomograph--help.stable.err
clients/mapiclient/tomograph.c
clients/python2/monetdb/sql/monetize.py
clients/python2/test/capabilities.py
clients/python2/test/runtests.py
clients/python3/monetdb/sql/monetize.py
clients/python3/test/capabilities.py
clients/python3/test/runtests.py
monetdb5/modules/atoms/batxml.c
monetdb5/modules/atoms/mtime.c
monetdb5/modules/atoms/mtime.h
monetdb5/modules/atoms/mtime.mal
monetdb5/modules/atoms/streams.h
monetdb5/modules/atoms/xml.c
monetdb5/modules/atoms/xml.h
monetdb5/modules/kernel/algebra.h
monetdb5/modules/kernel/batstr.c
monetdb5/modules/mal/clients.c
monetdb5/modules/mal/clients.h
monetdb5/modules/mal/clients.mal
monetdb5/modules/mal/tablet.c
monetdb5/modules/mal/tablet.h
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
sql/backends/monet5/datacell/emitter.c
sql/backends/monet5/datacell/receptor.c
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/vaults/vault.c
sql/scripts/22_clients.sql
sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.stable.out
sql/test/Tests/systemfunctions.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check5.stable.out
sql/test/mapi/Tests/php_monetdb.stable.out
sql/test/mapi/Tests/python2_test_monetdb_sql.stable.err
sql/test/mapi/Tests/python3_test_monetdb_sql.stable.err
Branch: int128
Log Message:
Merge with changeset 31b97ce8212c
diffs (truncated from 8263 to 300 lines):
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -49542,9 +49542,13 @@ address CLTsetTimeout;
comment Abort a query after q seconds (q=0 means run undisturbed).The session
timeout aborts the connection after spending toomany seconds on query
processing.
pattern clients.settimeout(n:lng):void
-address CLTsettimeout;
+address CLTsetTimeout;
comment Abort a query after n seconds.
+pattern clients.setsession(n:lng):void
+address CLTsetSessionTimeout;
+
+
pattern clients.suspend(id:int):void
address CLTsuspend;
comment Put a client process to sleep for some time.It will simple sleep for a
second at a time, untilthe awake bit has been set in its descriptor
@@ -53670,7 +53674,7 @@ address MTIMEepoch2int;
comment unix-time (epoch) support: seconds since epoch
command timestamp.epoch{unsafe}():timestamp
-address MTIMEepoch;
+address MTIMEcurrent_timestamp;
comment unix-time (epoch) support: seconds since the Unix epoch
command timestamp.#fromstr():timestamp
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
@@ -214,6 +214,7 @@ SYSTEM FUNCTION sys.resume
SYSTEM FUNCTION sys.reuse
SYSTEM FUNCTION sys.reverse
SYSTEM FUNCTION sys.setmasklen
+SYSTEM FUNCTION sys.setsession
SYSTEM FUNCTION sys.settimeout
SYSTEM FUNCTION sys.shrink
SYSTEM FUNCTION sys.srid
@@ -1129,7 +1130,7 @@ create function reverse(src string)
returns string external name udf.reverse;
create function "setmasklen" (p inet, mask int) returns inet
external name inet."setmasklen";
--- control the query time out
+-- control the query and session time out
create procedure sys.settimeout("query" bigint)
external name sql.settimeout;
create procedure sys.settimeout("query" bigint, "session" bigint)
@@ -1746,119 +1747,119 @@ 5980 "dep_type" "varchar" 32 0
5977 NULL
5985 "sch" "varchar" 100 0 5984 NULL true 0
NULL
5986 "usr" "varchar" 100 0 5984 NULL true 1
NULL
5987 "dep_type" "varchar" 32 0 5984 NULL true
2 NULL
-6045 "rewrite" "clob" 0 0 6044 NULL true 0
NULL
-6046 "count" "int" 32 0 6044 NULL true 1 NULL
-6051 "query" "clob" 0 0 6050 NULL true 0 NULL
-6052 "count" "int" 32 0 6050 NULL true 1 NULL
-6060 "name" "clob" 0 0 6059 NULL true 0 NULL
-6061 "def" "clob" 0 0 6059 NULL true 1 NULL
-6062 "status" "clob" 0 0 6059 NULL true 2
NULL
-6067 "name" "clob" 0 0 6070 NULL true 0 NULL
-6068 "def" "clob" 0 0 6070 NULL true 1 NULL
-6069 "status" "clob" 0 0 6070 NULL true 2
NULL
-6072 "name" "clob" 0 0 6071 NULL true 0 NULL
-6073 "value" "clob" 0 0 6071 NULL true 1 NULL
-6078 "name" "clob" 0 0 6080 NULL true 0 NULL
-6079 "value" "clob" 0 0 6080 NULL true 1 NULL
-6082 "id" "int" 32 0 6081 NULL true 0 NULL
-6083 "name" "clob" 0 0 6081 NULL true 1 NULL
-6084 "htype" "clob" 0 0 6081 NULL true 2 NULL
-6085 "ttype" "clob" 0 0 6081 NULL true 3 NULL
-6086 "count" "bigint" 64 0 6081 NULL true 4
NULL
-6087 "refcnt" "int" 32 0 6081 NULL true 5
NULL
-6088 "lrefcnt" "int" 32 0 6081 NULL true 6
NULL
-6089 "location" "clob" 0 0 6081 NULL true 7
NULL
-6090 "heat" "int" 32 0 6081 NULL true 8 NULL
-6091 "dirty" "clob" 0 0 6081 NULL true 9 NULL
-6092 "status" "clob" 0 0 6081 NULL true 10
NULL
-6093 "kind" "clob" 0 0 6081 NULL true 11 NULL
-6102 "qtag" "bigint" 64 0 6101 NULL true 0
NULL
-6103 "user" "clob" 0 0 6101 NULL true 1 NULL
-6104 "started" "timestamp" 7 0 6101 NULL true
2 NULL
-6105 "estimate" "timestamp" 7 0 6101 NULL true
3 NULL
-6106 "progress" "int" 32 0 6101 NULL true 4
NULL
-6107 "status" "clob" 0 0 6101 NULL true 5
NULL
-6108 "tag" "oid" 63 0 6101 NULL true 6 NULL
-6109 "query" "clob" 0 0 6101 NULL true 7 NULL
-6114 "qtag" "bigint" 64 0 6122 NULL true 0
NULL
-6115 "user" "clob" 0 0 6122 NULL true 1 NULL
-6116 "started" "timestamp" 7 0 6122 NULL true
2 NULL
-6117 "estimate" "timestamp" 7 0 6122 NULL true
3 NULL
-6118 "progress" "int" 32 0 6122 NULL true 4
NULL
-6119 "status" "clob" 0 0 6122 NULL true 5
NULL
-6120 "tag" "oid" 63 0 6122 NULL true 6 NULL
-6121 "query" "clob" 0 0 6122 NULL true 7 NULL
-6651 "schema" "clob" 0 0 6650 NULL true 0
NULL
-6652 "table" "clob" 0 0 6650 NULL true 1 NULL
-6653 "column" "clob" 0 0 6650 NULL true 2
NULL
-6654 "type" "clob" 0 0 6650 NULL true 3 NULL
-6655 "location" "clob" 0 0 6650 NULL true 4
NULL
-6656 "count" "bigint" 64 0 6650 NULL true 5
NULL
-6657 "typewidth" "int" 32 0 6650 NULL true 6
NULL
-6658 "columnsize" "bigint" 64 0 6650 NULL true
7 NULL
-6659 "heapsize" "bigint" 64 0 6650 NULL true
8 NULL
-6660 "indices" "bigint" 64 0 6650 NULL true
9 NULL
-6661 "sorted" "boolean" 1 0 6650 NULL true
10 NULL
-6666 "schema" "clob" 0 0 6677 NULL true 0
NULL
-6667 "table" "clob" 0 0 6677 NULL true 1 NULL
-6668 "column" "clob" 0 0 6677 NULL true 2
NULL
-6669 "type" "clob" 0 0 6677 NULL true 3 NULL
-6670 "location" "clob" 0 0 6677 NULL true 4
NULL
-6671 "count" "bigint" 64 0 6677 NULL true 5
NULL
-6672 "typewidth" "int" 32 0 6677 NULL true 6
NULL
-6673 "columnsize" "bigint" 64 0 6677 NULL true
7 NULL
-6674 "heapsize" "bigint" 64 0 6677 NULL true
8 NULL
-6675 "indices" "bigint" 64 0 6677 NULL true
9 NULL
-6676 "sorted" "boolean" 1 0 6677 NULL true
10 NULL
-6679 "schema" "clob" 0 0 6689 NULL true 0
NULL
-6680 "table" "clob" 0 0 6689 NULL true 1 NULL
-6681 "column" "clob" 0 0 6689 NULL true 2
NULL
-6682 "type" "clob" 0 0 6689 NULL true 3 NULL
-6683 "typewidth" "int" 32 0 6689 NULL true 4
NULL
-6684 "count" "bigint" 64 0 6689 NULL true 5
NULL
-6685 "distinct" "bigint" 64 0 6689 NULL true
6 NULL
-6686 "atomwidth" "int" 32 0 6689 NULL true 7
NULL
-6687 "reference" "boolean" 1 0 6689 NULL true
8 NULL
-6688 "sorted" "boolean" 1 0 6689 NULL true
9 NULL
-6710 "schema" "clob" 0 0 6709 NULL true 0
NULL
-6711 "table" "clob" 0 0 6709 NULL true 1 NULL
-6712 "column" "clob" 0 0 6709 NULL true 2
NULL
-6713 "type" "clob" 0 0 6709 NULL true 3 NULL
-6714 "count" "bigint" 64 0 6709 NULL true 4
NULL
-6715 "columnsize" "bigint" 64 0 6709 NULL true
5 NULL
-6716 "heapsize" "bigint" 64 0 6709 NULL true
6 NULL
-6717 "indices" "bigint" 64 0 6709 NULL true
7 NULL
-6718 "sorted" "boolean" 1 0 6709 NULL true
8 NULL
-6723 "schema" "clob" 0 0 6732 NULL true 0
NULL
-6724 "table" "clob" 0 0 6732 NULL true 1 NULL
-6725 "column" "clob" 0 0 6732 NULL true 2
NULL
-6726 "type" "clob" 0 0 6732 NULL true 3 NULL
-6727 "count" "bigint" 64 0 6732 NULL true 4
NULL
-6728 "columnsize" "bigint" 64 0 6732 NULL true
5 NULL
-6729 "heapsize" "bigint" 64 0 6732 NULL true
6 NULL
-6730 "indices" "bigint" 64 0 6732 NULL true
7 NULL
-6731 "sorted" "boolean" 1 0 6732 NULL true
8 NULL
-6734 "schema" "clob" 0 0 6741 NULL true 0
NULL
-6735 "table" "clob" 0 0 6741 NULL true 1 NULL
-6736 "count" "bigint" 64 0 6741 NULL true 2
NULL
-6737 "columnsize" "hugeint" 64 0 6741 NULL true
3 NULL
-6738 "heapsize" "hugeint" 64 0 6741 NULL true
4 NULL
-6739 "indices" "hugeint" 64 0 6741 NULL true
5 NULL
-6740 "auxillary" "hugeint" 53 0 6741 NULL true
6 NULL
-6743 "schema" "clob" 0 0 6756 NULL true 0
NULL
-6744 "table" "clob" 0 0 6756 NULL true 1 NULL
-6745 "column" "clob" 0 0 6756 NULL true 2
NULL
-6746 "type" "clob" 0 0 6756 NULL true 3 NULL
-6747 "width" "int" 32 0 6756 NULL true 4 NULL
-6748 "stamp" "timestamp" 7 0 6756 NULL true 5
NULL
-6749 "sample" "bigint" 64 0 6756 NULL true
6 NULL
-6750 "count" "bigint" 64 0 6756 NULL true 7
NULL
-6751 "unique" "bigint" 64 0 6756 NULL true
8 NULL
-6752 "nils" "bigint" 64 0 6756 NULL true 9
NULL
-6753 "minval" "clob" 0 0 6756 NULL true 10
NULL
-6754 "maxval" "clob" 0 0 6756 NULL true 11
NULL
-6755 "sorted" "boolean" 1 0 6756 NULL true
12 NULL
-6809 "function_id" "int" 32 0 6810 NULL true 0
NULL
+6048 "rewrite" "clob" 0 0 6047 NULL true 0
NULL
+6049 "count" "int" 32 0 6047 NULL true 1 NULL
+6054 "query" "clob" 0 0 6053 NULL true 0 NULL
+6055 "count" "int" 32 0 6053 NULL true 1 NULL
+6063 "name" "clob" 0 0 6062 NULL true 0 NULL
+6064 "def" "clob" 0 0 6062 NULL true 1 NULL
+6065 "status" "clob" 0 0 6062 NULL true 2
NULL
+6070 "name" "clob" 0 0 6073 NULL true 0 NULL
+6071 "def" "clob" 0 0 6073 NULL true 1 NULL
+6072 "status" "clob" 0 0 6073 NULL true 2
NULL
+6075 "name" "clob" 0 0 6074 NULL true 0 NULL
+6076 "value" "clob" 0 0 6074 NULL true 1 NULL
+6081 "name" "clob" 0 0 6083 NULL true 0 NULL
+6082 "value" "clob" 0 0 6083 NULL true 1 NULL
+6085 "id" "int" 32 0 6084 NULL true 0 NULL
+6086 "name" "clob" 0 0 6084 NULL true 1 NULL
+6087 "htype" "clob" 0 0 6084 NULL true 2 NULL
+6088 "ttype" "clob" 0 0 6084 NULL true 3 NULL
+6089 "count" "bigint" 64 0 6084 NULL true 4
NULL
+6090 "refcnt" "int" 32 0 6084 NULL true 5
NULL
+6091 "lrefcnt" "int" 32 0 6084 NULL true 6
NULL
+6092 "location" "clob" 0 0 6084 NULL true 7
NULL
+6093 "heat" "int" 32 0 6084 NULL true 8 NULL
+6094 "dirty" "clob" 0 0 6084 NULL true 9 NULL
+6095 "status" "clob" 0 0 6084 NULL true 10
NULL
+6096 "kind" "clob" 0 0 6084 NULL true 11 NULL
+6105 "qtag" "bigint" 64 0 6104 NULL true 0
NULL
+6106 "user" "clob" 0 0 6104 NULL true 1 NULL
+6107 "started" "timestamp" 7 0 6104 NULL true
2 NULL
+6108 "estimate" "timestamp" 7 0 6104 NULL true
3 NULL
+6109 "progress" "int" 32 0 6104 NULL true 4
NULL
+6110 "status" "clob" 0 0 6104 NULL true 5
NULL
+6111 "tag" "oid" 63 0 6104 NULL true 6 NULL
+6112 "query" "clob" 0 0 6104 NULL true 7 NULL
+6117 "qtag" "bigint" 64 0 6125 NULL true 0
NULL
+6118 "user" "clob" 0 0 6125 NULL true 1 NULL
+6119 "started" "timestamp" 7 0 6125 NULL true
2 NULL
+6120 "estimate" "timestamp" 7 0 6125 NULL true
3 NULL
+6121 "progress" "int" 32 0 6125 NULL true 4
NULL
+6122 "status" "clob" 0 0 6125 NULL true 5
NULL
+6123 "tag" "oid" 63 0 6125 NULL true 6 NULL
+6124 "query" "clob" 0 0 6125 NULL true 7 NULL
+6654 "schema" "clob" 0 0 6653 NULL true 0
NULL
+6655 "table" "clob" 0 0 6653 NULL true 1 NULL
+6656 "column" "clob" 0 0 6653 NULL true 2
NULL
+6657 "type" "clob" 0 0 6653 NULL true 3 NULL
+6658 "location" "clob" 0 0 6653 NULL true 4
NULL
+6659 "count" "bigint" 64 0 6653 NULL true 5
NULL
+6660 "typewidth" "int" 32 0 6653 NULL true 6
NULL
+6661 "columnsize" "bigint" 64 0 6653 NULL true
7 NULL
+6662 "heapsize" "bigint" 64 0 6653 NULL true
8 NULL
+6663 "indices" "bigint" 64 0 6653 NULL true
9 NULL
+6664 "sorted" "boolean" 1 0 6653 NULL true
10 NULL
+6669 "schema" "clob" 0 0 6680 NULL true 0
NULL
+6670 "table" "clob" 0 0 6680 NULL true 1 NULL
+6671 "column" "clob" 0 0 6680 NULL true 2
NULL
+6672 "type" "clob" 0 0 6680 NULL true 3 NULL
+6673 "location" "clob" 0 0 6680 NULL true 4
NULL
+6674 "count" "bigint" 64 0 6680 NULL true 5
NULL
+6675 "typewidth" "int" 32 0 6680 NULL true 6
NULL
+6676 "columnsize" "bigint" 64 0 6680 NULL true
7 NULL
+6677 "heapsize" "bigint" 64 0 6680 NULL true
8 NULL
+6678 "indices" "bigint" 64 0 6680 NULL true
9 NULL
+6679 "sorted" "boolean" 1 0 6680 NULL true
10 NULL
+6682 "schema" "clob" 0 0 6692 NULL true 0
NULL
+6683 "table" "clob" 0 0 6692 NULL true 1 NULL
+6684 "column" "clob" 0 0 6692 NULL true 2
NULL
+6685 "type" "clob" 0 0 6692 NULL true 3 NULL
+6686 "typewidth" "int" 32 0 6692 NULL true 4
NULL
+6687 "count" "bigint" 64 0 6692 NULL true 5
NULL
+6688 "distinct" "bigint" 64 0 6692 NULL true
6 NULL
+6689 "atomwidth" "int" 32 0 6692 NULL true 7
NULL
+6690 "reference" "boolean" 1 0 6692 NULL true
8 NULL
+6691 "sorted" "boolean" 1 0 6692 NULL true
9 NULL
+6713 "schema" "clob" 0 0 6712 NULL true 0
NULL
+6714 "table" "clob" 0 0 6712 NULL true 1 NULL
+6715 "column" "clob" 0 0 6712 NULL true 2
NULL
+6716 "type" "clob" 0 0 6712 NULL true 3 NULL
+6717 "count" "bigint" 64 0 6712 NULL true 4
NULL
+6718 "columnsize" "bigint" 64 0 6712 NULL true
5 NULL
+6719 "heapsize" "bigint" 64 0 6712 NULL true
6 NULL
+6720 "indices" "bigint" 64 0 6712 NULL true
7 NULL
+6721 "sorted" "boolean" 1 0 6712 NULL true
8 NULL
+6726 "schema" "clob" 0 0 6735 NULL true 0
NULL
+6727 "table" "clob" 0 0 6735 NULL true 1 NULL
+6728 "column" "clob" 0 0 6735 NULL true 2
NULL
+6729 "type" "clob" 0 0 6735 NULL true 3 NULL
+6730 "count" "bigint" 64 0 6735 NULL true 4
NULL
+6731 "columnsize" "bigint" 64 0 6735 NULL true
5 NULL
+6732 "heapsize" "bigint" 64 0 6735 NULL true
6 NULL
+6733 "indices" "bigint" 64 0 6735 NULL true
7 NULL
+6734 "sorted" "boolean" 1 0 6735 NULL true
8 NULL
+6737 "schema" "clob" 0 0 6744 NULL true 0
NULL
+6738 "table" "clob" 0 0 6744 NULL true 1 NULL
+6739 "count" "bigint" 64 0 6744 NULL true 2
NULL
+6740 "columnsize" "hugeint" 64 0 6744 NULL true
3 NULL
+6741 "heapsize" "hugeint" 64 0 6744 NULL true
4 NULL
+6742 "indices" "hugeint" 64 0 6744 NULL true
5 NULL
+6743 "auxillary" "hugeint" 53 0 6744 NULL true
6 NULL
+6746 "schema" "clob" 0 0 6759 NULL true 0
NULL
+6747 "table" "clob" 0 0 6759 NULL true 1 NULL
+6748 "column" "clob" 0 0 6759 NULL true 2
NULL
+6749 "type" "clob" 0 0 6759 NULL true 3 NULL
+6750 "width" "int" 32 0 6759 NULL true 4 NULL
+6751 "stamp" "timestamp" 7 0 6759 NULL true 5
NULL
+6752 "sample" "bigint" 64 0 6759 NULL true
6 NULL
+6753 "count" "bigint" 64 0 6759 NULL true 7
NULL
+6754 "unique" "bigint" 64 0 6759 NULL true
8 NULL
+6755 "nils" "bigint" 64 0 6759 NULL true 9
NULL
+6756 "minval" "clob" 0 0 6759 NULL true 10
NULL
+6757 "maxval" "clob" 0 0 6759 NULL true 11
NULL
+6758 "sorted" "boolean" 1 0 6759 NULL true
12 NULL
+6812 "function_id" "int" 32 0 6813 NULL true 0
NULL
COMMIT;
START TRANSACTION;
CREATE TABLE "sys"."_tables" (
@@ -1925,23 +1926,23 @@ 5963 "#dependencies_views_on_triggers" 2
5970 "#dependencies_functions_on_functions" 2000 NULL 2 true
0 false
5977 "#dependencies_functions_os_triggers" 2000 NULL 2 true
0 false
5984 "#dependencies_keys_on_foreignkeys" 2000 NULL 2 true
0 false
-6044 "#optimizer_stats" 2000 NULL 2 true 0 false
-6050 "#querycache" 2000 NULL 2 true 0 false
-6059 "#optimizers" 2000 NULL 2 true 0 false
-6070 "optimizers" 2000 "create view sys.optimizers as select * from
sys.optimizers();" 1 true 0 false
-6071 "#environment" 2000 NULL 2 true 0 false
-6080 "environment" 2000 "create view sys.environment as select * from
sys.environment();" 1 true 0 false
-6081 "#bbp" 2000 NULL 2 true 0 false
-6101 "#queue" 2000 NULL 2 true 0 false
-6122 "queue" 2000 "create view sys.queue as select * from sys.queue();"
1 true 0 false
-6650 "#storage" 2000 NULL 2 true 0 false
-6677 "storage" 2000 "create view sys.storage as select * from
sys.storage();" 1 true 0 false
-6689 "storagemodelinput" 2000 NULL 0 true 0 false
-6709 "#storagemodel" 2000 NULL 2 true 0 false
-6732 "storagemodel" 2000 "create view sys.storagemodel as select * from
sys.storagemodel();" 1 true 0 false
-6741 "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
-6756 "statistics" 2000 NULL 0 true 0 false
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
