Changeset: 90d75a632fdb for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=90d75a632fdb Modified Files: sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.int128 sql/test/leaks/Tests/check1.stable.out.int128 sql/test/leaks/Tests/check2.stable.out.int128 sql/test/leaks/Tests/check3.stable.out.int128 sql/test/leaks/Tests/check4.stable.out.int128 sql/test/leaks/Tests/check5.stable.out.int128 Branch: wlcr Log Message:
Approve output diffs (truncated from 917 to 300 lines): diff --git a/sql/test/emptydb/Tests/check.stable.out b/sql/test/emptydb/Tests/check.stable.out --- a/sql/test/emptydb/Tests/check.stable.out +++ b/sql/test/emptydb/Tests/check.stable.out @@ -179,8 +179,9 @@ Ready. \dSf sys."malfunctions" \dSf sys."masklen" \dSf sys."master" +\dSf sys."masterbeat" \dSf sys."masterclock" -\dSf sys."masterdrift" +\dSf sys."mastertick" \dSf sys."mbr" \dSf sys."md5" \dSf sys."median" @@ -208,10 +209,10 @@ Ready. \dSf sys."queue" \dSf sys."radians" \dSf sys."rejects" -\dSf sys."replicabacklog" +\dSf sys."replicabeat" \dSf sys."replicaclock" -\dSf sys."replicadrift" \dSf sys."replicate" +\dSf sys."replicatick" \dSf sys."resume" \dSf sys."reuse" \dSf sys."reverse" @@ -941,10 +942,11 @@ create procedure listdir(dirname string) create procedure listdirpat(dirname string,pat string) external name fits.listdirpattern; 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(path string) external name wlcr.master; -create function masterclock() returns string external name wlcr."getmasterclock"; -create procedure masterdrift(duration int) external name wlcr."setmasterdrift"; +create procedure master() external name wlc.master; +create procedure master(path string) external name wlc.master; +create procedure masterbeat(duration int) external name wlc."setmasterbeat"; +create function masterclock() returns string external name wlc."getmasterclock"; +create function mastertick() returns bigint external name wlc."getmastertick"; 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"; @@ -993,16 +995,16 @@ 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 function replicabacklog() returns integer external name wlr."getreplicabacklog"; +create procedure replicabeat(duration integer) external name wlr."setreplicabeat"; create function replicaclock() returns string external name wlr."getreplicaclock"; -create procedure replicadrift(duration int) external name wlr."setreplicadrift"; create procedure replicate() external name wlr.replicate; create procedure replicate(dbname string) external name wlr.replicate; -create procedure replicate(dbname string, pit timestamp) external name wlr.replicate; +create procedure replicate(dbname string, pointintime timestamp) external name wlr.replicate; create procedure replicate(dbname string, id tinyint) external name wlr.replicate; create procedure replicate(dbname string, id smallint) external name wlr.replicate; create procedure replicate(dbname string, id integer) external name wlr.replicate; create procedure replicate(dbname string, id bigint) external name wlr.replicate; +create function replicatick() returns bigint external name wlr."getreplicatick"; 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; @@ -1157,7 +1159,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.stopmaster; +create procedure stopmaster() external name wlc.stopmaster; 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"; @@ -2101,10 +2103,11 @@ drop function pcre_replace(string, strin [ "sys", "ltrim", "ltrim", "str", 0, 1, false, false, false ] [ "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(path string) external name wlcr.master;", "wlcr", 1, 2, true, false, false ] -[ "sys", "masterclock", "create function masterclock() returns string external name wlcr.\"getmasterclock\";", "wlcr", 1, 1, false, false, false ] -[ "sys", "masterdrift", "create procedure masterdrift(duration int) external name wlcr.\"setmasterdrift\";", "wlcr", 1, 2, true, false, false ] +[ "sys", "master", "create procedure master() external name wlc.master;", "wlc", 1, 2, true, false, false ] +[ "sys", "master", "create procedure master(path string) external name wlc.master;", "wlc", 1, 2, true, false, false ] +[ "sys", "masterbeat", "create procedure masterbeat(duration int) external name wlc.\"setmasterbeat\";", "wlc", 1, 2, true, false, false ] +[ "sys", "masterclock", "create function masterclock() returns string external name wlc.\"getmasterclock\";", "wlc", 1, 1, false, false, false ] +[ "sys", "mastertick", "create function mastertick() returns bigint external name wlc.\"getmastertick\";", "wlc", 1, 1, false, 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 ] @@ -2252,16 +2255,16 @@ 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", "replicabacklog", "create function replicabacklog() returns integer external name wlr.\"getreplicabacklog\";", "wlr", 1, 1, false, false, false ] +[ "sys", "replicabeat", "create procedure replicabeat(duration integer) external name wlr.\"setreplicabeat\";", "wlr", 1, 2, true, false, false ] [ "sys", "replicaclock", "create function replicaclock() returns string external name wlr.\"getreplicaclock\";", "wlr", 1, 1, false, false, false ] -[ "sys", "replicadrift", "create procedure replicadrift(duration int) external name wlr.\"setreplicadrift\";", "wlr", 1, 2, true, false, false ] [ "sys", "replicate", "create procedure replicate() external name wlr.replicate;", "wlr", 1, 2, true, false, false ] [ "sys", "replicate", "create procedure replicate(dbname string) external name wlr.replicate;", "wlr", 1, 2, true, false, false ] [ "sys", "replicate", "create procedure replicate(dbname string, id bigint) external name wlr.replicate;", "wlr", 1, 2, true, false, false ] [ "sys", "replicate", "create procedure replicate(dbname string, id integer) external name wlr.replicate;", "wlr", 1, 2, true, false, false ] [ "sys", "replicate", "create procedure replicate(dbname string, id smallint) external name wlr.replicate;", "wlr", 1, 2, true, false, false ] [ "sys", "replicate", "create procedure replicate(dbname string, id tinyint) external name wlr.replicate;", "wlr", 1, 2, true, false, false ] -[ "sys", "replicate", "create procedure replicate(dbname string, pit timestamp) external name wlr.replicate;", "wlr", 1, 2, true, false, false ] +[ "sys", "replicate", "create procedure replicate(dbname string, pointintime timestamp) external name wlr.replicate;", "wlr", 1, 2, true, false, false ] +[ "sys", "replicatick", "create function replicatick() returns bigint external name wlr.\"getreplicatick\";", "wlr", 1, 1, false, 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 ] @@ -3211,7 +3214,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.stopmaster;", "wlcr", 1, 2, true, false, false ] +[ "sys", "stopmaster", "create procedure stopmaster() external name wlc.stopmaster;", "wlc", 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 ] @@ -3666,8 +3669,9 @@ drop function pcre_replace(string, strin [ "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", "masterbeat", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 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", "masterclock", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 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", "masterdrift", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 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", "mastertick", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 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 ] @@ -3815,16 +3819,16 @@ drop function pcre_replace(string, strin [ "sys", "replace", "arg_1", "char", 0, 0, 1, "arg_2", "char", 0, 0, 1, "arg_3", "char", 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", "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", "replicabacklog", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 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", "replicabeat", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 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", "replicaclock", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 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", "replicadrift", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 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", "replicate", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 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", "replicate", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 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", "replicate", "id", "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, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "sys", "replicate", "id", "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", "replicate", "id", "smallint", 16, 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", "replicate", "id", "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", "replicate", "pit", "timestamp", 7, 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", "replicate", "pointintime", "timestamp", 7, 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", "replicatick", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 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 ] @@ -6084,8 +6088,9 @@ drop function pcre_replace(string, strin [ "masklen" ] [ "master" ] [ "master" ] +[ "masterbeat" ] [ "masterclock" ] -[ "masterdrift" ] +[ "mastertick" ] [ "max" ] [ "mbr" ] [ "mbr_above" ] @@ -6234,9 +6239,8 @@ drop function pcre_replace(string, strin [ "replace" ] [ "replace" ] [ "replace" ] -[ "replicabacklog" ] +[ "replicabeat" ] [ "replicaclock" ] -[ "replicadrift" ] [ "replicate" ] [ "replicate" ] [ "replicate" ] @@ -6244,6 +6248,7 @@ drop function pcre_replace(string, strin [ "replicate" ] [ "replicate" ] [ "replicate" ] +[ "replicatick" ] [ "restart" ] [ "resume" ] [ "resume" ] diff --git a/sql/test/emptydb/Tests/check.stable.out.32bit b/sql/test/emptydb/Tests/check.stable.out.32bit --- a/sql/test/emptydb/Tests/check.stable.out.32bit +++ b/sql/test/emptydb/Tests/check.stable.out.32bit @@ -183,8 +183,9 @@ Ready. \dSf sys."malfunctions" \dSf sys."masklen" \dSf sys."master" +\dSf sys."masterbeat" \dSf sys."masterclock" -\dSf sys."masterdrift" +\dSf sys."mastertick" \dSf sys."mbr" \dSf sys."md5" \dSf sys."median" @@ -212,10 +213,10 @@ Ready. \dSf sys."queue" \dSf sys."radians" \dSf sys."rejects" -\dSf sys."replicabacklog" +\dSf sys."replicabeat" \dSf sys."replicaclock" -\dSf sys."replicadrift" \dSf sys."replicate" +\dSf sys."replicatick" \dSf sys."resume" \dSf sys."reuse" \dSf sys."reverse" @@ -545,8 +546,9 @@ SYSTEM FUNCTION sys.ltrim SYSTEM FUNCTION sys.malfunctions SYSTEM FUNCTION sys.masklen SYSTEM FUNCTION sys.master +SYSTEM FUNCTION sys.masterbeat SYSTEM FUNCTION sys.masterclock -SYSTEM FUNCTION sys.masterdrift +SYSTEM FUNCTION sys.mastertick SYSTEM FUNCTION sys.max SYSTEM FUNCTION sys.mbr SYSTEM FUNCTION sys.mbr_above @@ -610,10 +612,10 @@ SYSTEM FUNCTION sys.rank SYSTEM FUNCTION sys.rejects SYSTEM FUNCTION sys.repeat SYSTEM FUNCTION sys.replace -SYSTEM FUNCTION sys.replicabacklog +SYSTEM FUNCTION sys.replicabeat SYSTEM FUNCTION sys.replicaclock -SYSTEM FUNCTION sys.replicadrift SYSTEM FUNCTION sys.replicate +SYSTEM FUNCTION sys.replicatick SYSTEM FUNCTION sys.restart SYSTEM FUNCTION sys.resume SYSTEM FUNCTION sys.reuse @@ -950,10 +952,11 @@ create procedure listdir(dirname string) create procedure listdirpat(dirname string,pat string) external name fits.listdirpattern; 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(path string) external name wlcr.master; -create function masterclock() returns string external name wlcr."getmasterclock"; -create procedure masterdrift(duration int) external name wlcr."setmasterdrift"; +create procedure master() external name wlc.master; +create procedure master(path string) external name wlc.master; +create procedure masterbeat(duration int) external name wlc."setmasterbeat"; +create function masterclock() returns string external name wlc."getmasterclock"; +create function mastertick() returns bigint external name wlc."getmastertick"; 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"; @@ -1002,16 +1005,16 @@ 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 function replicabacklog() returns integer external name wlr."getreplicabacklog"; +create procedure replicabeat(duration integer) external name wlr."setreplicabeat"; create function replicaclock() returns string external name wlr."getreplicaclock"; -create procedure replicadrift(duration int) external name wlr."setreplicadrift"; create procedure replicate() external name wlr.replicate; create procedure replicate(dbname string) external name wlr.replicate; -create procedure replicate(dbname string, pit timestamp) external name wlr.replicate; +create procedure replicate(dbname string, pointintime timestamp) external name wlr.replicate; create procedure replicate(dbname string, id tinyint) external name wlr.replicate; create procedure replicate(dbname string, id smallint) external name wlr.replicate; create procedure replicate(dbname string, id integer) external name wlr.replicate; create procedure replicate(dbname string, id bigint) external name wlr.replicate; +create function replicatick() returns bigint external name wlr."getreplicatick"; 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; @@ -1166,7 +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.stopmaster; +create procedure stopmaster() external name wlc.stopmaster; 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"; @@ -2110,10 +2113,11 @@ drop function pcre_replace(string, strin [ "sys", "ltrim", "ltrim", "str", 0, 1, false, false, false ] [ "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(path string) external name wlcr.master;", "wlcr", 1, 2, true, false, false ] -[ "sys", "masterclock", "create function masterclock() returns string external name wlcr.\"getmasterclock\";", "wlcr", 1, 1, false, false, false ] -[ "sys", "masterdrift", "create procedure masterdrift(duration int) external name wlcr.\"setmasterdrift\";", "wlcr", 1, 2, true, false, false ] +[ "sys", "master", "create procedure master() external name wlc.master;", "wlc", 1, 2, true, false, false ] +[ "sys", "master", "create procedure master(path string) external name wlc.master;", "wlc", 1, 2, true, false, false ] +[ "sys", "masterbeat", "create procedure masterbeat(duration int) external name wlc.\"setmasterbeat\";", "wlc", 1, 2, true, false, false ] +[ "sys", "masterclock", "create function masterclock() returns string external name wlc.\"getmasterclock\";", "wlc", 1, 1, false, false, false ] +[ "sys", "mastertick", "create function mastertick() returns bigint external name wlc.\"getmastertick\";", "wlc", 1, 1, false, 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,16 +2265,16 @@ 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", "replicabacklog", "create function replicabacklog() returns integer external name wlr.\"getreplicabacklog\";", "wlr", 1, 1, false, false, false ] +[ "sys", "replicabeat", "create procedure replicabeat(duration integer) external name wlr.\"setreplicabeat\";", "wlr", 1, 2, true, false, false ] [ "sys", "replicaclock", "create function replicaclock() returns string external name wlr.\"getreplicaclock\";", "wlr", 1, 1, false, false, false ] -[ "sys", "replicadrift", "create procedure replicadrift(duration int) external name wlr.\"setreplicadrift\";", "wlr", 1, 2, true, false, false ] [ "sys", "replicate", "create procedure replicate() external name wlr.replicate;", "wlr", 1, 2, true, false, false ] [ "sys", "replicate", "create procedure replicate(dbname string) external name wlr.replicate;", "wlr", 1, 2, true, false, false ] _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list