Changeset: a42a74069de5 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a42a74069de5 Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.int128 monetdb5/mal/mal_client.c monetdb5/mal/mal_client.h monetdb5/modules/mal/wlcr.c sql/backends/monet5/sql_wlcr.c sql/backends/monet5/sql_wlcr.mal sql/scripts/60_wlcr.sql Branch: wlcr Log Message:
Move replay threshold to SQL variable. diffs (truncated from 441 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 @@ -8788,7 +8788,6 @@ Ready. [ "wlcr", "query", "pattern wlcr.query(q:str, pipe:str):void ", "WLCRquery;", "Initialize the workload-capture-replay " ] [ "wlcr", "rename_user", "pattern wlcr.rename_user(sname:str, newnme:str, action:int):void ", "WLCRgeneric;", "Catalog operation rename_user" ] [ "wlcr", "replay", "pattern wlcr.replay(dbname:str):void ", "WLCRreplay;", "Re-run all operations from another database in the same dbfarm" ] -[ "wlcr", "replay", "pattern wlcr.replay(dbname:str, threshold:int):void ", "WLCRreplay;", "Re-run all operations from another database in the dbfarm using a query execution threshold" ] [ "wlcr", "revoke", "pattern wlcr.revoke(sname:str, tbl:str, grantee:str, privs:int, cname:str, grant:int, grantor:int):void ", "WLCRgeneric;", "Catalog operation revoke" ] [ "wlcr", "revoke_function", "pattern wlcr.revoke_function(sname:str, fcnid:int, grantee:str, privs:int, grant:int, grantor:int):void ", "WLCRgeneric;", "Catalog operation revoke_function" ] [ "wlcr", "revoke_roles", "pattern wlcr.revoke_roles(sname:str, auth:str, grantor:int, admin:int):void ", "WLCRgeneric;", "Catalog operation revoke_roles" ] diff --git a/clients/Tests/MAL-signatures.stable.out.int128 b/clients/Tests/MAL-signatures.stable.out.int128 --- a/clients/Tests/MAL-signatures.stable.out.int128 +++ b/clients/Tests/MAL-signatures.stable.out.int128 @@ -11153,7 +11153,6 @@ Ready. [ "wlcr", "query", "pattern wlcr.query(q:str, pipe:str):void ", "WLCRquery;", "Initialize the workload-capture-replay " ] [ "wlcr", "rename_user", "pattern wlcr.rename_user(sname:str, newnme:str, action:int):void ", "WLCRgeneric;", "Catalog operation rename_user" ] [ "wlcr", "replay", "pattern wlcr.replay(dbname:str):void ", "WLCRreplay;", "Re-run all operations from another database in the same dbfarm" ] -[ "wlcr", "replay", "pattern wlcr.replay(dbname:str, threshold:int):void ", "WLCRreplay;", "Re-run all operations from another database in the dbfarm using a query execution threshold" ] [ "wlcr", "revoke", "pattern wlcr.revoke(sname:str, tbl:str, grantee:str, privs:int, cname:str, grant:int, grantor:int):void ", "WLCRgeneric;", "Catalog operation revoke" ] [ "wlcr", "revoke_function", "pattern wlcr.revoke_function(sname:str, fcnid:int, grantee:str, privs:int, grant:int, grantor:int):void ", "WLCRgeneric;", "Catalog operation revoke_function" ] [ "wlcr", "revoke_roles", "pattern wlcr.revoke_roles(sname:str, auth:str, grantor:int, admin:int):void ", "WLCRgeneric;", "Catalog operation revoke_roles" ] 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 @@ -347,6 +347,7 @@ Ready. \dSf sys."stddev_pop" \dSf sys."stddev_samp" \dSf sys."stop" +\dSf sys."stopmaster" \dSf sys."storage" \dSf sys."storagemodel" \dSf sys."storagemodelinit" @@ -763,6 +764,7 @@ SYSTEM FUNCTION sys.st_z SYSTEM FUNCTION sys.stddev_pop SYSTEM FUNCTION sys.stddev_samp SYSTEM FUNCTION sys.stop +SYSTEM FUNCTION sys.stopmaster SYSTEM FUNCTION sys.storage SYSTEM FUNCTION sys.storagemodel SYSTEM FUNCTION sys.storagemodelinit @@ -964,7 +966,6 @@ create procedure listdirpat(dirname stri create function sys.malfunctions() returns table("module" string, "function" string, "signature" string, "address" string, "comment" string) external name "manual"."functions"; create function "masklen" (p inet) returns int external name inet."masklen"; create procedure master() external name wlcr.master; -create procedure master(threshold integer) external name wlcr.master; create function mbr(geom geometry) returns mbr external name geom."mbr"; create function sys.md5(v string) returns string external name clients.md5sum; create aggregate median(val tinyint) returns tinyint external name "aggr"."median"; @@ -1013,10 +1014,7 @@ create procedure sys.querylog_enable(thr create function sys.queue() returns table(qtag bigint, "user" string, started timestamp, estimate timestamp, progress int, status string, tag oid, query string) external name sql.sysmon_queue; create function radians(d double) returns double return d*pi()/180; create function sys.rejects() returns table(rowid bigint, fldid int, "message" string, "input" string) external name sql.copy_rejects; -create procedure replay() external name wlcr.replay; -create procedure replay(threshold int) external name wlcr.replay; create procedure replay(dbname string) external name wlcr.replay; -create procedure replay(dbname string, threshold int) external name wlcr.replay; create procedure sys.resume(tag int) external name sql.sysmon_resume; create procedure sys.resume(tag bigint) external name sql.sysmon_resume; create procedure reuse(sys string, tab string) external name sql.reuse; @@ -1171,6 +1169,7 @@ create aggregate stddev_samp(val time) r create aggregate stddev_samp(val timestamp) returns double external name "aggr"."stdev"; create procedure sys.stop(tag int) external name sql.sysmon_stop; create procedure sys.stop(tag bigint) external name sql.sysmon_stop; +create procedure stopmaster() external name wlcr.stop; create function sys."storage"() returns table ("schema" string, "table" string, "column" string, "type" string, "mode" string, location string, "count" bigint, typewidth int, columnsize bigint, heapsize bigint, hashes bigint, phash boolean, "imprints" bigint, sorted boolean, revsorted boolean, "unique" boolean, orderidx bigint) external name sql."storage"; create function sys."storage"(sname string) returns table ("schema" string, "table" string, "column" string, "type" string, "mode" string, location string, "count" bigint, typewidth int, columnsize bigint, heapsize bigint, hashes bigint, phash boolean, "imprints" bigint, sorted boolean, revsorted boolean, "unique" boolean, orderidx bigint) external name sql."storage"; create function sys."storage"(sname string, tname string) returns table ("schema" string, "table" string, "column" string, "type" string, "mode" string, location string, "count" bigint, typewidth int, columnsize bigint, heapsize bigint, hashes bigint, phash boolean, "imprints" bigint, sorted boolean, revsorted boolean, "unique" boolean, orderidx bigint) external name sql."storage"; @@ -2113,7 +2112,6 @@ drop function pcre_replace(string, strin [ "sys", "malfunctions", "create function sys.malfunctions() returns table(\"module\" string, \"function\" string, \"signature\" string, \"address\" string, \"comment\" string) external name \"manual\".\"functions\";", "manual", 1, 5, false, false, false ] [ "sys", "masklen", "create function \"masklen\" (p inet) returns int external name inet.\"masklen\";", "inet", 1, 1, false, false, false ] [ "sys", "master", "create procedure master() external name wlcr.master;", "wlcr", 1, 2, true, false, false ] -[ "sys", "master", "create procedure master(threshold integer) external name wlcr.master;", "wlcr", 1, 2, true, false, false ] [ "sys", "max", "max", "aggr", 0, 3, false, false, false ] [ "sys", "mbr", "create function mbr(geom geometry) returns mbr external name geom.\"mbr\";", "geom", 1, 1, false, false, false ] [ "sys", "mbr_above", "mbrAbove", "geom", 0, 1, false, false, false ] @@ -2261,10 +2259,7 @@ drop function pcre_replace(string, strin [ "sys", "replace", "replace", "str", 0, 1, false, false, false ] [ "sys", "replace", "replace", "str", 0, 1, false, false, false ] [ "sys", "replace", "replace", "str", 0, 1, false, false, false ] -[ "sys", "replay", "create procedure replay() external name wlcr.replay;", "wlcr", 1, 2, true, false, false ] [ "sys", "replay", "create procedure replay(dbname string) external name wlcr.replay;", "wlcr", 1, 2, true, false, false ] -[ "sys", "replay", "create procedure replay(dbname string, threshold int) external name wlcr.replay;", "wlcr", 1, 2, true, false, false ] -[ "sys", "replay", "create procedure replay(threshold int) external name wlcr.replay;", "wlcr", 1, 2, true, false, false ] [ "sys", "restart", "restart", "sql", 0, 1, false, false, false ] [ "sys", "resume", "create procedure sys.resume(tag bigint) external name sql.sysmon_resume;", "sql", 1, 2, true, false, false ] [ "sys", "resume", "create procedure sys.resume(tag int) external name sql.sysmon_resume;", "sql", 1, 2, true, false, false ] @@ -3214,6 +3209,7 @@ drop function pcre_replace(string, strin [ "sys", "stddev_samp", "create aggregate stddev_samp(val tinyint) returns double external name \"aggr\".\"stdev\";", "aggr", 1, 3, false, false, false ] [ "sys", "stop", "create procedure sys.stop(tag bigint) external name sql.sysmon_stop;", "sql", 1, 2, true, false, false ] [ "sys", "stop", "create procedure sys.stop(tag int) external name sql.sysmon_stop;", "sql", 1, 2, true, false, false ] +[ "sys", "stopmaster", "create procedure stopmaster() external name wlcr.stop;", "wlcr", 1, 2, true, false, false ] [ "sys", "storage", "create function sys.\"storage\"() returns table (\"schema\" string, \"table\" string, \"column\" string, \"type\" string, \"mode\" string, location string, \"count\" bigint, typewidth int, columnsize bigint, heapsize bigint, hashes bigint, phash boolean, \"imprints\" bigint, sorted boolean, revsorted boolean, \"unique\" boolean, orderidx bigint) external name sql.\"storage\";", "sql", 1, 5, false, false, false ] [ "sys", "storage", "create function sys.\"storage\"(sname string) returns table (\"schema\" string, \"table\" string, \"column\" string, \"type\" string, \"mode\" string, location string, \"count\" bigint, typewidth int, columnsize bigint, heapsize bigint, hashes bigint, phash boolean, \"imprints\" bigint, sorted boolean, revsorted boolean, \"unique\" boolean, orderidx bigint) external name sql.\"storage\";", "sql", 1, 5, false, false, false ] [ "sys", "storage", "create function sys.\"storage\"(sname string, tname string) returns table (\"schema\" string, \"table\" string, \"column\" string, \"type\" string, \"mode\" string, location string, \"count\" bigint, typewidth int, columnsize bigint, heapsize bigint, hashes bigint, phash boolean, \"imprints\" bigint, sorted boolean, revsorted boolean, \"unique\" boolean, orderidx bigint) external name sql.\"storage\";", "sql", 1, 5, false, false, false ] @@ -3669,7 +3665,6 @@ drop function pcre_replace(string, strin [ "sys", "malfunctions", "function", "clob", 0, 0, 0, "signature", "clob", 0, 0, 0, "address", "clob", 0, 0, 0, "comment", "clob", 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "sys", "masklen", "p", "inet", 0, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "sys", "master", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] -[ "sys", "master", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "sys", "max", "arg", "any", 0, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "sys", "mbr", "geom", "geometry", 0, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "sys", "mbr_above", "arg_1", "geometry", 0, 0, 1, "arg_2", "geometry", 0, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] @@ -3818,9 +3813,6 @@ drop function pcre_replace(string, strin [ "sys", "replace", "arg_1", "clob", 0, 0, 1, "arg_2", "clob", 0, 0, 1, "arg_3", "clob", 0, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "sys", "replace", "arg_1", "varchar", 0, 0, 1, "arg_2", "varchar", 0, 0, 1, "arg_3", "varchar", 0, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "sys", "replay", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] -[ "sys", "replay", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] -[ "sys", "replay", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] -[ "sys", "replay", "threshold", "int", 32, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "sys", "restart", "arg_1", "varchar", 0, 0, 1, "arg_2", "varchar", 0, 0, 1, "arg_3", "bigint", 64, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "sys", "resume", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "sys", "resume", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] @@ -4770,6 +4762,7 @@ drop function pcre_replace(string, strin [ "sys", "stddev_samp", "val", "tinyint", 8, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "sys", "stop", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "sys", "stop", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] +[ "sys", "stopmaster", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "sys", "storage", "table", "clob", 0, 0, 0, "column", "clob", 0, 0, 0, "type", "clob", 0, 0, 0, "mode", "clob", 0, 0, 0, "location", "clob", 0, 0, 0, "count", "bigint", 64, 0, 0, "typewidth", "int", 32, 0, 0, "columnsize", "bigint", 64, 0, 0, "heapsize", "bigint", 64, 0, 0, "hashes", "bigint", 64, 0, 0, "phash", "boolean", 1, 0, 0, "imprints", "bigint", 64, 0, 0, "sorted", "boolean", 1, 0, 0, "revsorted", "boolean", 1, 0, 0, "unique", "boolean", 1, 0, 0 ] [ "sys", "storage", "table", "clob", 0, 0, 0, "column", "clob", 0, 0, 0, "type", "clob", 0, 0, 0, "mode", "clob", 0, 0, 0, "location", "clob", 0, 0, 0, "count", "bigint", 64, 0, 0, "typewidth", "int", 32, 0, 0, "columnsize", "bigint", 64, 0, 0, "heapsize", "bigint", 64, 0, 0, "hashes", "bigint", 64, 0, 0, "phash", "boolean", 1, 0, 0, "imprints", "bigint", 64, 0, 0, "sorted", "boolean", 1, 0, 0, "revsorted", "boolean", 1, 0, 0, "unique", "boolean", 1, 0, 0 ] [ "sys", "storage", "table", "clob", 0, 0, 0, "column", "clob", 0, 0, 0, "type", "clob", 0, 0, 0, "mode", "clob", 0, 0, 0, "location", "clob", 0, 0, 0, "count", "bigint", 64, 0, 0, "typewidth", "int", 32, 0, 0, "columnsize", "bigint", 64, 0, 0, "heapsize", "bigint", 64, 0, 0, "hashes", "bigint", 64, 0, 0, "phash", "boolean", 1, 0, 0, "imprints", "bigint", 64, 0, 0, "sorted", "boolean", 1, 0, 0, "revsorted", "boolean", 1, 0, 0, "unique", "boolean", 1, 0, 0 ] @@ -6031,7 +6024,6 @@ drop function pcre_replace(string, strin [ "malfunctions" ] [ "masklen" ] [ "master" ] -[ "master" ] [ "max" ] [ "mbr" ] [ "mbr_above" ] @@ -6181,9 +6173,6 @@ drop function pcre_replace(string, strin [ "replace" ] [ "replace" ] [ "replay" ] -[ "replay" ] -[ "replay" ] -[ "replay" ] [ "restart" ] [ "resume" ] [ "resume" ] @@ -7144,6 +7133,7 @@ drop function pcre_replace(string, strin [ "stop" ] [ "stop" ] [ "stop" ] +[ "stopmaster" ] [ "storage" ] [ "storage" ] [ "storage" ] diff --git a/clients/Tests/SQL-dump.stable.out.int128 b/clients/Tests/SQL-dump.stable.out.int128 --- a/clients/Tests/SQL-dump.stable.out.int128 +++ b/clients/Tests/SQL-dump.stable.out.int128 @@ -343,6 +343,7 @@ Ready. \dSf sys."stddev_pop" \dSf sys."stddev_samp" \dSf sys."stop" +\dSf sys."stopmaster" \dSf sys."storage" \dSf sys."storagemodel" \dSf sys."storagemodelinit" @@ -759,6 +760,7 @@ SYSTEM FUNCTION sys.st_z SYSTEM FUNCTION sys.stddev_pop SYSTEM FUNCTION sys.stddev_samp SYSTEM FUNCTION sys.stop +SYSTEM FUNCTION sys.stopmaster SYSTEM FUNCTION sys.storage SYSTEM FUNCTION sys.storagemodel SYSTEM FUNCTION sys.storagemodelinit @@ -964,7 +966,6 @@ create procedure listdirpat(dirname stri create function sys.malfunctions() returns table("module" string, "function" string, "signature" string, "address" string, "comment" string) external name "manual"."functions"; create function "masklen" (p inet) returns int external name inet."masklen"; create procedure master() external name wlcr.master; -create procedure master(threshold integer) external name wlcr.master; create function mbr(geom geometry) returns mbr external name geom."mbr"; create function sys.md5(v string) returns string external name clients.md5sum; create aggregate median(val tinyint) returns tinyint external name "aggr"."median"; @@ -1015,10 +1016,7 @@ create procedure sys.querylog_enable(thr create function sys.queue() returns table(qtag bigint, "user" string, started timestamp, estimate timestamp, progress int, status string, tag oid, query string) external name sql.sysmon_queue; create function radians(d double) returns double return d*pi()/180; create function sys.rejects() returns table(rowid bigint, fldid int, "message" string, "input" string) external name sql.copy_rejects; -create procedure replay() external name wlcr.replay; -create procedure replay(threshold int) external name wlcr.replay; create procedure replay(dbname string) external name wlcr.replay; -create procedure replay(dbname string, threshold int) external name wlcr.replay; create procedure sys.resume(tag int) external name sql.sysmon_resume; create procedure sys.resume(tag bigint) external name sql.sysmon_resume; create procedure reuse(sys string, tab string) external name sql.reuse; @@ -1175,6 +1173,7 @@ create aggregate stddev_samp(val timesta create aggregate stddev_samp(val hugeint) returns double external name "aggr"."stdev"; create procedure sys.stop(tag int) external name sql.sysmon_stop; create procedure sys.stop(tag bigint) external name sql.sysmon_stop; +create procedure stopmaster() external name wlcr.stop; create function sys."storage"() returns table ("schema" string, "table" string, "column" string, "type" string, "mode" string, location string, "count" bigint, typewidth int, columnsize bigint, heapsize bigint, hashes bigint, phash boolean, "imprints" bigint, sorted boolean, revsorted boolean, "unique" boolean, orderidx bigint) external name sql."storage"; create function sys."storage"(sname string) returns table ("schema" string, "table" string, "column" string, "type" string, "mode" string, location string, "count" bigint, typewidth int, columnsize bigint, heapsize bigint, hashes bigint, phash boolean, "imprints" bigint, sorted boolean, revsorted boolean, "unique" boolean, orderidx bigint) external name sql."storage"; create function sys."storage"(sname string, tname string) returns table ("schema" string, "table" string, "column" string, "type" string, "mode" string, location string, "count" bigint, typewidth int, columnsize bigint, heapsize bigint, hashes bigint, phash boolean, "imprints" bigint, sorted boolean, revsorted boolean, "unique" boolean, orderidx bigint) external name sql."storage"; @@ -2137,7 +2136,6 @@ drop function pcre_replace(string, strin [ "sys", "malfunctions", "create function sys.malfunctions() returns table(\"module\" string, \"function\" string, \"signature\" string, \"address\" string, \"comment\" string) external name \"manual\".\"functions\";", "manual", 1, 5, false, false, false ] [ "sys", "masklen", "create function \"masklen\" (p inet) returns int external name inet.\"masklen\";", "inet", 1, 1, false, false, false ] [ "sys", "master", "create procedure master() external name wlcr.master;", "wlcr", 1, 2, true, false, false ] -[ "sys", "master", "create procedure master(threshold integer) external name wlcr.master;", "wlcr", 1, 2, true, false, false ] [ "sys", "max", "max", "aggr", 0, 3, false, false, false ] [ "sys", "mbr", "create function mbr(geom geometry) returns mbr external name geom.\"mbr\";", "geom", 1, 1, false, false, false ] [ "sys", "mbr_above", "mbrAbove", "geom", 0, 1, false, false, false ] @@ -2291,10 +2289,7 @@ drop function pcre_replace(string, strin [ "sys", "replace", "replace", "str", 0, 1, false, false, false ] [ "sys", "replace", "replace", "str", 0, 1, false, false, false ] [ "sys", "replace", "replace", "str", 0, 1, false, false, false ] -[ "sys", "replay", "create procedure replay() external name wlcr.replay;", "wlcr", 1, 2, true, false, false ] [ "sys", "replay", "create procedure replay(dbname string) external name wlcr.replay;", "wlcr", 1, 2, true, false, false ] -[ "sys", "replay", "create procedure replay(dbname string, threshold int) external name wlcr.replay;", "wlcr", 1, 2, true, false, false ] -[ "sys", "replay", "create procedure replay(threshold int) external name wlcr.replay;", "wlcr", 1, 2, true, false, false ] [ "sys", "restart", "restart", "sql", 0, 1, false, false, false ] [ "sys", "resume", "create procedure sys.resume(tag bigint) external name sql.sysmon_resume;", "sql", 1, 2, true, false, false ] [ "sys", "resume", "create procedure sys.resume(tag int) external name sql.sysmon_resume;", "sql", 1, 2, true, false, false ] @@ -3397,6 +3392,7 @@ drop function pcre_replace(string, strin [ "sys", "stddev_samp", "create aggregate stddev_samp(val tinyint) returns double external name \"aggr\".\"stdev\";", "aggr", 1, 3, false, false, false ] [ "sys", "stop", "create procedure sys.stop(tag bigint) external name sql.sysmon_stop;", "sql", 1, 2, true, false, false ] [ "sys", "stop", "create procedure sys.stop(tag int) external name sql.sysmon_stop;", "sql", 1, 2, true, false, false ] +[ "sys", "stopmaster", "create procedure stopmaster() external name wlcr.stop;", "wlcr", 1, 2, true, false, false ] [ "sys", "storage", "create function sys.\"storage\"() returns table (\"schema\" string, \"table\" string, \"column\" string, \"type\" string, \"mode\" string, location string, \"count\" bigint, typewidth int, columnsize bigint, heapsize bigint, hashes bigint, phash boolean, \"imprints\" bigint, sorted boolean, revsorted boolean, \"unique\" boolean, orderidx bigint) external name sql.\"storage\";", "sql", 1, 5, false, false, false ] [ "sys", "storage", "create function sys.\"storage\"(sname string) returns table (\"schema\" string, \"table\" string, \"column\" string, \"type\" string, \"mode\" string, location string, \"count\" bigint, typewidth int, columnsize bigint, heapsize bigint, hashes bigint, phash boolean, \"imprints\" bigint, sorted boolean, revsorted boolean, \"unique\" boolean, orderidx bigint) external name sql.\"storage\";", "sql", 1, 5, false, false, false ] [ "sys", "storage", "create function sys.\"storage\"(sname string, tname string) returns table (\"schema\" string, \"table\" string, \"column\" string, \"type\" string, \"mode\" string, location string, \"count\" bigint, typewidth int, columnsize bigint, heapsize bigint, hashes bigint, phash boolean, \"imprints\" bigint, sorted boolean, revsorted boolean, \"unique\" boolean, orderidx bigint) external name sql.\"storage\";", "sql", 1, 5, false, false, false ] @@ -3874,7 +3870,6 @@ drop function pcre_replace(string, strin [ "sys", "malfunctions", "function", "clob", 0, 0, 0, "signature", "clob", 0, 0, 0, "address", "clob", 0, 0, 0, "comment", "clob", 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "sys", "masklen", "p", "inet", 0, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "sys", "master", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] -[ "sys", "master", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "sys", "max", "arg", "any", 0, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "sys", "mbr", "geom", "geometry", 0, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "sys", "mbr_above", "arg_1", "geometry", 0, 0, 1, "arg_2", "geometry", 0, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] @@ -4029,9 +4024,6 @@ drop function pcre_replace(string, strin [ "sys", "replace", "arg_1", "clob", 0, 0, 1, "arg_2", "clob", 0, 0, 1, "arg_3", "clob", 0, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "sys", "replace", "arg_1", "varchar", 0, 0, 1, "arg_2", "varchar", 0, 0, 1, "arg_3", "varchar", 0, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "sys", "replay", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] -[ "sys", "replay", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] -[ "sys", "replay", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] -[ "sys", "replay", "threshold", "int", 32, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "sys", "restart", "arg_1", "varchar", 0, 0, 1, "arg_2", "varchar", 0, 0, 1, "arg_3", "bigint", 64, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "sys", "resume", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "sys", "resume", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] @@ -5134,6 +5126,7 @@ drop function pcre_replace(string, strin [ "sys", "stddev_samp", "val", "tinyint", 8, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "sys", "stop", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "sys", "stop", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] +[ "sys", "stopmaster", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "sys", "storage", "table", "clob", 0, 0, 0, "column", "clob", 0, 0, 0, "type", "clob", 0, 0, 0, "mode", "clob", 0, 0, 0, "location", "clob", 0, 0, 0, "count", "bigint", 64, 0, 0, "typewidth", "int", 32, 0, 0, "columnsize", "bigint", 64, 0, 0, "heapsize", "bigint", 64, 0, 0, "hashes", "bigint", 64, 0, 0, "phash", "boolean", 1, 0, 0, "imprints", "bigint", 64, 0, 0, "sorted", "boolean", 1, 0, 0, "revsorted", "boolean", 1, 0, 0, "unique", "boolean", 1, 0, 0 ] [ "sys", "storage", "table", "clob", 0, 0, 0, "column", "clob", 0, 0, 0, "type", "clob", 0, 0, 0, "mode", "clob", 0, 0, 0, "location", "clob", 0, 0, 0, "count", "bigint", 64, 0, 0, "typewidth", "int", 32, 0, 0, "columnsize", "bigint", 64, 0, 0, "heapsize", "bigint", 64, 0, 0, "hashes", "bigint", 64, 0, 0, "phash", "boolean", 1, 0, 0, "imprints", "bigint", 64, 0, 0, "sorted", "boolean", 1, 0, 0, "revsorted", "boolean", 1, 0, 0, "unique", "boolean", 1, 0, 0 ] [ "sys", "storage", "table", "clob", 0, 0, 0, "column", "clob", 0, 0, 0, "type", "clob", 0, 0, 0, "mode", "clob", 0, 0, 0, "location", "clob", 0, 0, 0, "count", "bigint", 64, 0, 0, "typewidth", "int", 32, 0, 0, "columnsize", "bigint", 64, 0, 0, "heapsize", "bigint", 64, 0, 0, "hashes", "bigint", 64, 0, 0, "phash", "boolean", 1, 0, 0, "imprints", "bigint", 64, 0, 0, "sorted", "boolean", 1, 0, 0, "revsorted", "boolean", 1, 0, 0, "unique", "boolean", 1, 0, 0 ] @@ -6426,7 +6419,6 @@ drop function pcre_replace(string, strin [ "malfunctions" ] [ "masklen" ] [ "master" ] -[ "master" ] [ "max" ] [ "mbr" ] [ "mbr_above" ] @@ -6582,9 +6574,6 @@ drop function pcre_replace(string, strin [ "replace" ] [ "replace" ] [ "replay" ] -[ "replay" ] -[ "replay" ] -[ "replay" ] [ "restart" ] [ "resume" ] [ "resume" ] @@ -7698,6 +7687,7 @@ drop function pcre_replace(string, strin [ "stop" ] [ "stop" ] [ "stop" ] +[ "stopmaster" ] [ "storage" ] [ "storage" ] [ "storage" ] diff --git a/monetdb5/mal/mal_client.c b/monetdb5/mal/mal_client.c --- a/monetdb5/mal/mal_client.c +++ b/monetdb5/mal/mal_client.c @@ -243,6 +243,8 @@ MCinitClientRecord(Client c, oid user, b c->exception_buf_initialized = 0; c->error_row = c->error_fld = c->error_msg = c->error_input = NULL; c->wlcr_kind = 0; + c->wlcr_mode = 0; + c->wlcr_threshold = 0; c->wlcr = NULL; c->wlcr_replaylog = NULL; #ifndef HAVE_EMBEDDED /* no authentication in embedded mode */ @@ -400,6 +402,8 @@ freeClient(Client c) if( c->wlcr) freeMalBlk(c->wlcr); c->wlcr_kind = 0; + c->wlcr_mode = 0; + c->wlcr_threshold = 0; c->wlcr = NULL; if( c->wlcr_replaylog) GDKfree(c->wlcr_replaylog); diff --git a/monetdb5/mal/mal_client.h b/monetdb5/mal/mal_client.h --- a/monetdb5/mal/mal_client.h +++ b/monetdb5/mal/mal_client.h @@ -176,6 +176,7 @@ typedef struct CLIENT { */ int wlcr_kind; int wlcr_mode; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list