Changeset: 31b97ce8212c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=31b97ce8212c
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/SQL-dump.stable.out
clients/Tests/exports.stable.out
monetdb5/modules/atoms/mtime.c
monetdb5/modules/atoms/mtime.h
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
Branch: default
Log Message:
Approve tests after changesets 25440d27e642 and 52f796e14984,
diffs (truncated from 2416 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
@@ -38770,9 +38770,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
@@ -42862,7 +42866,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
@@ -1125,7 +1126,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)
@@ -1734,119 +1735,119 @@ 5527 "dep_type" "varchar" 32 0
5524 NULL
5532 "sch" "varchar" 100 0 5531 NULL true 0
NULL
5533 "usr" "varchar" 100 0 5531 NULL true 1
NULL
5534 "dep_type" "varchar" 32 0 5531 NULL true
2 NULL
-5592 "rewrite" "clob" 0 0 5591 NULL true 0
NULL
-5593 "count" "int" 32 0 5591 NULL true 1 NULL
-5598 "query" "clob" 0 0 5597 NULL true 0 NULL
-5599 "count" "int" 32 0 5597 NULL true 1 NULL
-5607 "name" "clob" 0 0 5606 NULL true 0 NULL
-5608 "def" "clob" 0 0 5606 NULL true 1 NULL
-5609 "status" "clob" 0 0 5606 NULL true 2
NULL
-5614 "name" "clob" 0 0 5617 NULL true 0 NULL
-5615 "def" "clob" 0 0 5617 NULL true 1 NULL
-5616 "status" "clob" 0 0 5617 NULL true 2
NULL
-5619 "name" "clob" 0 0 5618 NULL true 0 NULL
-5620 "value" "clob" 0 0 5618 NULL true 1 NULL
-5625 "name" "clob" 0 0 5627 NULL true 0 NULL
-5626 "value" "clob" 0 0 5627 NULL true 1 NULL
-5629 "id" "int" 32 0 5628 NULL true 0 NULL
-5630 "name" "clob" 0 0 5628 NULL true 1 NULL
-5631 "htype" "clob" 0 0 5628 NULL true 2 NULL
-5632 "ttype" "clob" 0 0 5628 NULL true 3 NULL
-5633 "count" "bigint" 64 0 5628 NULL true 4
NULL
-5634 "refcnt" "int" 32 0 5628 NULL true 5
NULL
-5635 "lrefcnt" "int" 32 0 5628 NULL true 6
NULL
-5636 "location" "clob" 0 0 5628 NULL true 7
NULL
-5637 "heat" "int" 32 0 5628 NULL true 8 NULL
-5638 "dirty" "clob" 0 0 5628 NULL true 9 NULL
-5639 "status" "clob" 0 0 5628 NULL true 10
NULL
-5640 "kind" "clob" 0 0 5628 NULL true 11 NULL
-5649 "qtag" "bigint" 64 0 5648 NULL true 0
NULL
-5650 "user" "clob" 0 0 5648 NULL true 1 NULL
-5651 "started" "timestamp" 7 0 5648 NULL true
2 NULL
-5652 "estimate" "timestamp" 7 0 5648 NULL true
3 NULL
-5653 "progress" "int" 32 0 5648 NULL true 4
NULL
-5654 "status" "clob" 0 0 5648 NULL true 5
NULL
-5655 "tag" "oid" 63 0 5648 NULL true 6 NULL
-5656 "query" "clob" 0 0 5648 NULL true 7 NULL
-5661 "qtag" "bigint" 64 0 5669 NULL true 0
NULL
-5662 "user" "clob" 0 0 5669 NULL true 1 NULL
-5663 "started" "timestamp" 7 0 5669 NULL true
2 NULL
-5664 "estimate" "timestamp" 7 0 5669 NULL true
3 NULL
-5665 "progress" "int" 32 0 5669 NULL true 4
NULL
-5666 "status" "clob" 0 0 5669 NULL true 5
NULL
-5667 "tag" "oid" 63 0 5669 NULL true 6 NULL
-5668 "query" "clob" 0 0 5669 NULL true 7 NULL
-6173 "schema" "clob" 0 0 6172 NULL true 0
NULL
-6174 "table" "clob" 0 0 6172 NULL true 1 NULL
-6175 "column" "clob" 0 0 6172 NULL true 2
NULL
-6176 "type" "clob" 0 0 6172 NULL true 3 NULL
-6177 "location" "clob" 0 0 6172 NULL true 4
NULL
-6178 "count" "bigint" 64 0 6172 NULL true 5
NULL
-6179 "typewidth" "int" 32 0 6172 NULL true 6
NULL
-6180 "columnsize" "bigint" 64 0 6172 NULL true
7 NULL
-6181 "heapsize" "bigint" 64 0 6172 NULL true
8 NULL
-6182 "indices" "bigint" 64 0 6172 NULL true
9 NULL
-6183 "sorted" "boolean" 1 0 6172 NULL true
10 NULL
-6188 "schema" "clob" 0 0 6199 NULL true 0
NULL
-6189 "table" "clob" 0 0 6199 NULL true 1 NULL
-6190 "column" "clob" 0 0 6199 NULL true 2
NULL
-6191 "type" "clob" 0 0 6199 NULL true 3 NULL
-6192 "location" "clob" 0 0 6199 NULL true 4
NULL
-6193 "count" "bigint" 64 0 6199 NULL true 5
NULL
-6194 "typewidth" "int" 32 0 6199 NULL true 6
NULL
-6195 "columnsize" "bigint" 64 0 6199 NULL true
7 NULL
-6196 "heapsize" "bigint" 64 0 6199 NULL true
8 NULL
-6197 "indices" "bigint" 64 0 6199 NULL true
9 NULL
-6198 "sorted" "boolean" 1 0 6199 NULL true
10 NULL
-6201 "schema" "clob" 0 0 6211 NULL true 0
NULL
-6202 "table" "clob" 0 0 6211 NULL true 1 NULL
-6203 "column" "clob" 0 0 6211 NULL true 2
NULL
-6204 "type" "clob" 0 0 6211 NULL true 3 NULL
-6205 "typewidth" "int" 32 0 6211 NULL true 4
NULL
-6206 "count" "bigint" 64 0 6211 NULL true 5
NULL
-6207 "distinct" "bigint" 64 0 6211 NULL true
6 NULL
-6208 "atomwidth" "int" 32 0 6211 NULL true 7
NULL
-6209 "reference" "boolean" 1 0 6211 NULL true
8 NULL
-6210 "sorted" "boolean" 1 0 6211 NULL true
9 NULL
-6232 "schema" "clob" 0 0 6231 NULL true 0
NULL
-6233 "table" "clob" 0 0 6231 NULL true 1 NULL
-6234 "column" "clob" 0 0 6231 NULL true 2
NULL
-6235 "type" "clob" 0 0 6231 NULL true 3 NULL
-6236 "count" "bigint" 64 0 6231 NULL true 4
NULL
-6237 "columnsize" "bigint" 64 0 6231 NULL true
5 NULL
-6238 "heapsize" "bigint" 64 0 6231 NULL true
6 NULL
-6239 "indices" "bigint" 64 0 6231 NULL true
7 NULL
-6240 "sorted" "boolean" 1 0 6231 NULL true
8 NULL
-6245 "schema" "clob" 0 0 6254 NULL true 0
NULL
-6246 "table" "clob" 0 0 6254 NULL true 1 NULL
-6247 "column" "clob" 0 0 6254 NULL true 2
NULL
-6248 "type" "clob" 0 0 6254 NULL true 3 NULL
-6249 "count" "bigint" 64 0 6254 NULL true 4
NULL
-6250 "columnsize" "bigint" 64 0 6254 NULL true
5 NULL
-6251 "heapsize" "bigint" 64 0 6254 NULL true
6 NULL
-6252 "indices" "bigint" 64 0 6254 NULL true
7 NULL
-6253 "sorted" "boolean" 1 0 6254 NULL true
8 NULL
-6256 "schema" "clob" 0 0 6263 NULL true 0
NULL
-6257 "table" "clob" 0 0 6263 NULL true 1 NULL
-6258 "count" "bigint" 64 0 6263 NULL true 2
NULL
-6259 "columnsize" "bigint" 64 0 6263 NULL true
3 NULL
-6260 "heapsize" "bigint" 64 0 6263 NULL true
4 NULL
-6261 "indices" "bigint" 64 0 6263 NULL true
5 NULL
-6262 "auxillary" "bigint" 53 0 6263 NULL true
6 NULL
-6265 "schema" "clob" 0 0 6278 NULL true 0
NULL
-6266 "table" "clob" 0 0 6278 NULL true 1 NULL
-6267 "column" "clob" 0 0 6278 NULL true 2
NULL
-6268 "type" "clob" 0 0 6278 NULL true 3 NULL
-6269 "width" "int" 32 0 6278 NULL true 4 NULL
-6270 "stamp" "timestamp" 7 0 6278 NULL true 5
NULL
-6271 "sample" "bigint" 64 0 6278 NULL true
6 NULL
-6272 "count" "bigint" 64 0 6278 NULL true 7
NULL
-6273 "unique" "bigint" 64 0 6278 NULL true
8 NULL
-6274 "nils" "bigint" 64 0 6278 NULL true 9
NULL
-6275 "minval" "clob" 0 0 6278 NULL true 10
NULL
-6276 "maxval" "clob" 0 0 6278 NULL true 11
NULL
-6277 "sorted" "boolean" 1 0 6278 NULL true
12 NULL
-6331 "function_id" "int" 32 0 6332 NULL true 0
NULL
+5595 "rewrite" "clob" 0 0 5594 NULL true 0
NULL
+5596 "count" "int" 32 0 5594 NULL true 1 NULL
+5601 "query" "clob" 0 0 5600 NULL true 0 NULL
+5602 "count" "int" 32 0 5600 NULL true 1 NULL
+5610 "name" "clob" 0 0 5609 NULL true 0 NULL
+5611 "def" "clob" 0 0 5609 NULL true 1 NULL
+5612 "status" "clob" 0 0 5609 NULL true 2
NULL
+5617 "name" "clob" 0 0 5620 NULL true 0 NULL
+5618 "def" "clob" 0 0 5620 NULL true 1 NULL
+5619 "status" "clob" 0 0 5620 NULL true 2
NULL
+5622 "name" "clob" 0 0 5621 NULL true 0 NULL
+5623 "value" "clob" 0 0 5621 NULL true 1 NULL
+5628 "name" "clob" 0 0 5630 NULL true 0 NULL
+5629 "value" "clob" 0 0 5630 NULL true 1 NULL
+5632 "id" "int" 32 0 5631 NULL true 0 NULL
+5633 "name" "clob" 0 0 5631 NULL true 1 NULL
+5634 "htype" "clob" 0 0 5631 NULL true 2 NULL
+5635 "ttype" "clob" 0 0 5631 NULL true 3 NULL
+5636 "count" "bigint" 64 0 5631 NULL true 4
NULL
+5637 "refcnt" "int" 32 0 5631 NULL true 5
NULL
+5638 "lrefcnt" "int" 32 0 5631 NULL true 6
NULL
+5639 "location" "clob" 0 0 5631 NULL true 7
NULL
+5640 "heat" "int" 32 0 5631 NULL true 8 NULL
+5641 "dirty" "clob" 0 0 5631 NULL true 9 NULL
+5642 "status" "clob" 0 0 5631 NULL true 10
NULL
+5643 "kind" "clob" 0 0 5631 NULL true 11 NULL
+5652 "qtag" "bigint" 64 0 5651 NULL true 0
NULL
+5653 "user" "clob" 0 0 5651 NULL true 1 NULL
+5654 "started" "timestamp" 7 0 5651 NULL true
2 NULL
+5655 "estimate" "timestamp" 7 0 5651 NULL true
3 NULL
+5656 "progress" "int" 32 0 5651 NULL true 4
NULL
+5657 "status" "clob" 0 0 5651 NULL true 5
NULL
+5658 "tag" "oid" 63 0 5651 NULL true 6 NULL
+5659 "query" "clob" 0 0 5651 NULL true 7 NULL
+5664 "qtag" "bigint" 64 0 5672 NULL true 0
NULL
+5665 "user" "clob" 0 0 5672 NULL true 1 NULL
+5666 "started" "timestamp" 7 0 5672 NULL true
2 NULL
+5667 "estimate" "timestamp" 7 0 5672 NULL true
3 NULL
+5668 "progress" "int" 32 0 5672 NULL true 4
NULL
+5669 "status" "clob" 0 0 5672 NULL true 5
NULL
+5670 "tag" "oid" 63 0 5672 NULL true 6 NULL
+5671 "query" "clob" 0 0 5672 NULL true 7 NULL
+6176 "schema" "clob" 0 0 6175 NULL true 0
NULL
+6177 "table" "clob" 0 0 6175 NULL true 1 NULL
+6178 "column" "clob" 0 0 6175 NULL true 2
NULL
+6179 "type" "clob" 0 0 6175 NULL true 3 NULL
+6180 "location" "clob" 0 0 6175 NULL true 4
NULL
+6181 "count" "bigint" 64 0 6175 NULL true 5
NULL
+6182 "typewidth" "int" 32 0 6175 NULL true 6
NULL
+6183 "columnsize" "bigint" 64 0 6175 NULL true
7 NULL
+6184 "heapsize" "bigint" 64 0 6175 NULL true
8 NULL
+6185 "indices" "bigint" 64 0 6175 NULL true
9 NULL
+6186 "sorted" "boolean" 1 0 6175 NULL true
10 NULL
+6191 "schema" "clob" 0 0 6202 NULL true 0
NULL
+6192 "table" "clob" 0 0 6202 NULL true 1 NULL
+6193 "column" "clob" 0 0 6202 NULL true 2
NULL
+6194 "type" "clob" 0 0 6202 NULL true 3 NULL
+6195 "location" "clob" 0 0 6202 NULL true 4
NULL
+6196 "count" "bigint" 64 0 6202 NULL true 5
NULL
+6197 "typewidth" "int" 32 0 6202 NULL true 6
NULL
+6198 "columnsize" "bigint" 64 0 6202 NULL true
7 NULL
+6199 "heapsize" "bigint" 64 0 6202 NULL true
8 NULL
+6200 "indices" "bigint" 64 0 6202 NULL true
9 NULL
+6201 "sorted" "boolean" 1 0 6202 NULL true
10 NULL
+6204 "schema" "clob" 0 0 6214 NULL true 0
NULL
+6205 "table" "clob" 0 0 6214 NULL true 1 NULL
+6206 "column" "clob" 0 0 6214 NULL true 2
NULL
+6207 "type" "clob" 0 0 6214 NULL true 3 NULL
+6208 "typewidth" "int" 32 0 6214 NULL true 4
NULL
+6209 "count" "bigint" 64 0 6214 NULL true 5
NULL
+6210 "distinct" "bigint" 64 0 6214 NULL true
6 NULL
+6211 "atomwidth" "int" 32 0 6214 NULL true 7
NULL
+6212 "reference" "boolean" 1 0 6214 NULL true
8 NULL
+6213 "sorted" "boolean" 1 0 6214 NULL true
9 NULL
+6235 "schema" "clob" 0 0 6234 NULL true 0
NULL
+6236 "table" "clob" 0 0 6234 NULL true 1 NULL
+6237 "column" "clob" 0 0 6234 NULL true 2
NULL
+6238 "type" "clob" 0 0 6234 NULL true 3 NULL
+6239 "count" "bigint" 64 0 6234 NULL true 4
NULL
+6240 "columnsize" "bigint" 64 0 6234 NULL true
5 NULL
+6241 "heapsize" "bigint" 64 0 6234 NULL true
6 NULL
+6242 "indices" "bigint" 64 0 6234 NULL true
7 NULL
+6243 "sorted" "boolean" 1 0 6234 NULL true
8 NULL
+6248 "schema" "clob" 0 0 6257 NULL true 0
NULL
+6249 "table" "clob" 0 0 6257 NULL true 1 NULL
+6250 "column" "clob" 0 0 6257 NULL true 2
NULL
+6251 "type" "clob" 0 0 6257 NULL true 3 NULL
+6252 "count" "bigint" 64 0 6257 NULL true 4
NULL
+6253 "columnsize" "bigint" 64 0 6257 NULL true
5 NULL
+6254 "heapsize" "bigint" 64 0 6257 NULL true
6 NULL
+6255 "indices" "bigint" 64 0 6257 NULL true
7 NULL
+6256 "sorted" "boolean" 1 0 6257 NULL true
8 NULL
+6259 "schema" "clob" 0 0 6266 NULL true 0
NULL
+6260 "table" "clob" 0 0 6266 NULL true 1 NULL
+6261 "count" "bigint" 64 0 6266 NULL true 2
NULL
+6262 "columnsize" "bigint" 64 0 6266 NULL true
3 NULL
+6263 "heapsize" "bigint" 64 0 6266 NULL true
4 NULL
+6264 "indices" "bigint" 64 0 6266 NULL true
5 NULL
+6265 "auxillary" "bigint" 53 0 6266 NULL true
6 NULL
+6268 "schema" "clob" 0 0 6281 NULL true 0
NULL
+6269 "table" "clob" 0 0 6281 NULL true 1 NULL
+6270 "column" "clob" 0 0 6281 NULL true 2
NULL
+6271 "type" "clob" 0 0 6281 NULL true 3 NULL
+6272 "width" "int" 32 0 6281 NULL true 4 NULL
+6273 "stamp" "timestamp" 7 0 6281 NULL true 5
NULL
+6274 "sample" "bigint" 64 0 6281 NULL true
6 NULL
+6275 "count" "bigint" 64 0 6281 NULL true 7
NULL
+6276 "unique" "bigint" 64 0 6281 NULL true
8 NULL
+6277 "nils" "bigint" 64 0 6281 NULL true 9
NULL
+6278 "minval" "clob" 0 0 6281 NULL true 10
NULL
+6279 "maxval" "clob" 0 0 6281 NULL true 11
NULL
+6280 "sorted" "boolean" 1 0 6281 NULL true
12 NULL
+6334 "function_id" "int" 32 0 6335 NULL true 0
NULL
COMMIT;
START TRANSACTION;
CREATE TABLE "sys"."_tables" (
@@ -1913,23 +1914,23 @@ 5510 "#dependencies_views_on_triggers" 2
5517 "#dependencies_functions_on_functions" 2000 NULL 2 true
0 false
5524 "#dependencies_functions_os_triggers" 2000 NULL 2 true
0 false
5531 "#dependencies_keys_on_foreignkeys" 2000 NULL 2 true
0 false
-5591 "#optimizer_stats" 2000 NULL 2 true 0 false
-5597 "#querycache" 2000 NULL 2 true 0 false
-5606 "#optimizers" 2000 NULL 2 true 0 false
-5617 "optimizers" 2000 "create view sys.optimizers as select * from
sys.optimizers();" 1 true 0 false
-5618 "#environment" 2000 NULL 2 true 0 false
-5627 "environment" 2000 "create view sys.environment as select * from
sys.environment();" 1 true 0 false
-5628 "#bbp" 2000 NULL 2 true 0 false
-5648 "#queue" 2000 NULL 2 true 0 false
-5669 "queue" 2000 "create view sys.queue as select * from sys.queue();"
1 true 0 false
-6172 "#storage" 2000 NULL 2 true 0 false
-6199 "storage" 2000 "create view sys.storage as select * from
sys.storage();" 1 true 0 false
-6211 "storagemodelinput" 2000 NULL 0 true 0 false
-6231 "#storagemodel" 2000 NULL 2 true 0 false
-6254 "storagemodel" 2000 "create view sys.storagemodel as select * from
sys.storagemodel();" 1 true 0 false
-6263 "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
-6278 "statistics" 2000 NULL 0 true 0 false
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
