Changeset: 82c1f33d7c2a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=82c1f33d7c2a
Added Files:
sql/scripts/61_wlcr.sql
sql/test/wlcr/Tests/wlc80.py
sql/test/wlcr/Tests/wlr10.py
sql/test/wlcr/Tests/wlr10.stable.err
sql/test/wlcr/Tests/wlr10.stable.out
sql/test/wlcr/Tests/wlr80.py
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
monetdb5/modules/mal/wlc.c
monetdb5/modules/mal/wlc.h
monetdb5/modules/mal/wlc.mal
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/wlr.c
sql/backends/monet5/wlr.h
sql/backends/monet5/wlr.mal
sql/scripts/60_wlcr.sql
sql/scripts/Makefile.ag
sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.stable.out
sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out.int128
sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.out
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/sys-schema/Tests/systemfunctions.stable.out
sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
sql/test/wlcr/Tests/All
sql/test/wlcr/Tests/wlc01.py
sql/test/wlcr/Tests/wlc100.py
sql/test/wlcr/Tests/wlcr00.py
sql/test/wlcr/Tests/wlr01.py
sql/test/wlcr/Tests/wlr100.py
sql/test/wlcr/Tests/wlr100.stable.err
sql/test/wlcr/Tests/wlr100.stable.out
sql/test/wlcr/Tests/wlr20.py
sql/test/wlcr/Tests/wlr20.stable.err
sql/test/wlcr/Tests/wlr20.stable.out
sql/test/wlcr/Tests/wlr30.py
sql/test/wlcr/Tests/wlr30.stable.err
sql/test/wlcr/Tests/wlr30.stable.out
sql/test/wlcr/Tests/wlr40.py
sql/test/wlcr/Tests/wlr40.stable.err
sql/test/wlcr/Tests/wlr40.stable.out
sql/test/wlcr/Tests/wlr50.py
sql/test/wlcr/Tests/wlr50.stable.err
sql/test/wlcr/Tests/wlr50.stable.out
sql/test/wlcr/Tests/wlr70.py
sql/test/wlcr/Tests/wlr70.stable.err
sql/test/wlcr/Tests/wlr70.stable.out
Branch: Nov2019
Log Message:
Manually merged changes from wlcrNov2019 branch.
diffs (truncated from 4340 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
@@ -12059,9 +12059,9 @@ stdout of test 'MAL-signatures` in direc
[ "wlc", "drop_user", "pattern wlc.drop_user(sname:str, auth:str,
action:int):void ", "WLCgeneric;", "Catalog operation drop_user" ]
[ "wlc", "drop_view", "pattern wlc.drop_view(sname:str, name:str,
action:int, ifexists:int):void ", "WLCgeneric;", "Catalog operation
drop_view" ]
[ "wlc", "flush", "pattern wlc.flush():void ", "WLCflush;",
"Flush current log buffer" ]
-[ "wlc", "getmasterbeat", "pattern
wlc.getmasterbeat(duration:int):str ", "WLCgetmasterbeat;", "Maximal delay
for transaction log flushing" ]
-[ "wlc", "getmasterclock", "pattern wlc.getmasterclock():str ",
"WLCgetmasterclock;", "Timestamp of last update transaction" ]
-[ "wlc", "getmastertick", "pattern wlc.getmastertick():lng ",
"WLCgetmastertick;", "Transaction identifier of the last committed
transaction" ]
+[ "wlc", "getbeat", "pattern wlc.getbeat(duration:int):str ",
"WLCgetbeat;", "Maximal delay for transaction log flushing" ]
+[ "wlc", "getclock", "pattern wlc.getclock():str ", "WLCgetclock;",
"Timestamp of last update transaction" ]
+[ "wlc", "gettick", "pattern wlc.gettick():lng ", "WLCgettick;",
"Transaction identifier of the last committed transaction" ]
[ "wlc", "grant", "pattern wlc.grant(sname:str, tbl:str,
grantee:str, privs:int, cname:str, gr:int, grantor:int):void ", "WLCgeneric;",
"Catalog operation grant" ]
[ "wlc", "grant_function", "pattern wlc.grant_function(sname:str,
fcnid:int, grantee:str, privs:int, grant:int, grantor:int):void ",
"WLCgeneric;", "Catalog operation grant_function" ]
[ "wlc", "grant_roles", "pattern wlc.grant_roles(sname:str, auth:str,
grantor:int, admin:int):void ", "WLCgeneric;", "Catalog operation
grant_roles" ]
@@ -12078,14 +12078,15 @@ stdout of test 'MAL-signatures` in direc
[ "wlc", "revoke_roles", "pattern wlc.revoke_roles(sname:str, auth:str,
grantor:int, admin:int):void ", "WLCgeneric;", "Catalog operation
revoke_roles" ]
[ "wlc", "rollback", "pattern wlc.rollback():void ",
"WLCcommitCmd;", "Rollback the workload-capture-replay record" ]
[ "wlc", "rollback", "pattern wlc.rollback():void ",
"WLCrollbackCmd;", "Mark the end of the work unit" ]
-[ "wlc", "setmasterbeat", "pattern
wlc.setmasterbeat(duration:int):void ", "WLCsetmasterbeat;", "Maximal
delay for transaction log flushing" ]
-[ "wlc", "stopmaster", "pattern wlc.stopmaster():void ",
"WLCstopmaster;", "Stop capturing the logs" ]
+[ "wlc", "setbeat", "pattern wlc.setbeat(duration:int):void ",
"WLCsetbeat;", "Maximal delay for transaction log flushing" ]
+[ "wlc", "stop", "pattern wlc.stop():void ", "WLCstop;", "Stop
capturing the logs" ]
[ "wlc", "transaction", "unsafe pattern wlc.transaction():void ",
"WLCgeneric;", "Start an autocommit transaction" ]
[ "wlc", "transaction_begin", "pattern
wlc.transaction_begin(chain:int, name:str):void ", "WLCgeneric;", "A
transaction statement (type can be commit,release,rollback or start)" ]
[ "wlc", "transaction_commit", "pattern
wlc.transaction_commit(chain:int, name:str):void ", "WLCgeneric;", "A
transaction statement (type can be commit,release,rollback or start)" ]
[ "wlc", "transaction_release", "pattern
wlc.transaction_release(chain:int, name:str):void ", "WLCgeneric;", "A
transaction statement (type can be commit,release,rollback or start)" ]
[ "wlc", "transaction_rollback", "pattern
wlc.transaction_rollback(chain:int, name:str):void ", "WLCgeneric;", "A
transaction statement (type can be commit,release,rollback or start)" ]
[ "wlc", "update", "pattern wlc.update(sname:str, tname:str,
cname:str, tid:any, val:any):int ", "WLCupdate;", "Keep the update in the
workload-capture-replay list" ]
+[ "wlr", "accept", "pattern wlr.accept():void ", "WLRaccept;",
"Accept failing transaction" ]
[ "wlr", "action", "pattern wlr.action(q:str):void ",
"WLRaction;", "A query producing updates" ]
[ "wlr", "alter_add_range_partition", "pattern
wlr.alter_add_range_partition(sname:str, mtnme:str, psnme:str, ptnme:str,
min:str, max:str, nills:int, update:int):void ", "WLRgeneric;", "Catalog
operation alter_add_range_partition" ]
[ "wlr", "alter_add_table", "pattern wlr.alter_add_table(sname:str,
mtnme:str, psnme:str, ptnme:str, action:int):void ", "WLRgeneric;",
"Catalog operation alter_add_table" ]
@@ -12124,11 +12125,12 @@ stdout of test 'MAL-signatures` in direc
[ "wlr", "drop_user", "pattern wlr.drop_user(sname:str,
action:int):void ", "WLRgeneric;", "Catalog operation drop_user" ]
[ "wlr", "drop_user", "pattern wlr.drop_user(sname:str, auth:str,
action:int):void ", "WLRgeneric;", "Catalog operation drop_user" ]
[ "wlr", "drop_view", "pattern wlr.drop_view(sname:str, name:str,
action:int, ifexists:int):void ", "WLRgeneric;", "Catalog operation
drop_view" ]
-[ "wlr", "getreplicaclock", "pattern wlr.getreplicaclock():str ",
"WLRgetreplicaclock;", "Timestamp of last replicated transaction." ]
-[ "wlr", "getreplicatick", "pattern wlr.getreplicatick():lng ",
"WLRgetreplicatick;", "Transaction identifier of the last replicated
transaction." ]
+[ "wlr", "getclock", "pattern wlr.getclock():str ", "WLRgetclock;",
"Timestamp of last replicated transaction." ]
+[ "wlr", "gettick", "pattern wlr.gettick():lng ", "WLRgettick;",
"Transaction identifier of the last replicated transaction." ]
[ "wlr", "grant", "pattern wlr.grant(sname:str, tbl:str,
grantee:str, privs:int, cname:str, gr:int, grantor:int):void ", "WLRgeneric;",
"Catalog operation grant" ]
[ "wlr", "grant_function", "pattern wlr.grant_function(sname:str,
fcnid:int, grantee:str, privs:int, grant:int, grantor:int):void ",
"WLRgeneric;", "Catalog operation grant_function" ]
[ "wlr", "grant_roles", "pattern wlr.grant_roles(sname:str, auth:str,
grantor:int, admin:int):void ", "WLRgeneric;", "Catalog operation
grant_roles" ]
+[ "wlr", "master", "pattern wlr.master(dbname:str):void ",
"WLRmaster;", "Initialize the replicator thread" ]
[ "wlr", "rename_column", "pattern wlr.rename_column(sname:str,
tname:str, cname:str, newnme:str):void ", "WLRgeneric;", "Catalog operation
rename_column" ]
[ "wlr", "rename_schema", "pattern wlr.rename_schema(sname:str,
newnme:str):void ", "WLRgeneric;", "Catalog operation rename_schema"
]
[ "wlr", "rename_table", "pattern wlr.rename_table(osname:str,
nsname:str, otname:str, ntname:str):void ", "WLRgeneric;", "Catalog
operation rename_table" ]
@@ -12139,13 +12141,12 @@ stdout of test 'MAL-signatures` in direc
[ "wlr", "replicate", "pattern wlr.replicate(id:lng):void ",
"WLRreplicate;", "Roll the snapshot forward to a specific transaction
id" ]
[ "wlr", "replicate", "pattern wlr.replicate(id:sht):void ",
"WLRreplicate;", "Roll the snapshot forward to a specific transaction
id" ]
[ "wlr", "replicate", "pattern wlr.replicate(ts:timestamp):void ",
"WLRreplicate;", "Roll the snapshot forward to an up-to-date clone"
]
-[ "wlr", "replicate", "pattern wlr.replicate(dbname:str):void ",
"WLRstartreplicate;", "Initialize the replicator thread" ]
[ "wlr", "revoke", "pattern wlr.revoke(sname:str, tbl:str,
grantee:str, privs:int, cname:str, grant:int, grantor:int):void ",
"WLRgeneric;", "Catalog operation revoke" ]
[ "wlr", "revoke_function", "pattern wlr.revoke_function(sname:str,
fcnid:int, grantee:str, privs:int, grant:int, grantor:int):void ",
"WLRgeneric;", "Catalog operation revoke_function" ]
[ "wlr", "revoke_roles", "pattern wlr.revoke_roles(sname:str, auth:str,
grantor:int, admin:int):void ", "WLRgeneric;", "Catalog operation
revoke_roles" ]
[ "wlr", "rollback", "pattern wlr.rollback():void ", "WLRrollback;",
"Mark the end of the work unit" ]
-[ "wlr", "setreplicabeat", "pattern
wlr.setreplicabeat(dur:int):void ", "WLRsetreplicabeat;", "Threshold (in
seconds) for re-running queries" ]
-[ "wlr", "stopreplicate", "pattern wlr.stopreplicate():void ",
"WLRstopreplicate;", "Stop the replicator thread" ]
+[ "wlr", "setbeat", "pattern wlr.setbeat(dur:int):void ",
"WLRsetbeat;", "Threshold (in seconds) for re-running queries" ]
+[ "wlr", "stop", "pattern wlr.stop():void ", "WLRstop;", "Stop
the replicator thread" ]
[ "wlr", "transaction", "unsafe pattern wlr.transaction():void ",
"WLRgeneric;", "Start an autocommit transaction" ]
[ "wlr", "transaction", "pattern wlr.transaction(tid:lng, started:str,
user:str):void ", "WLRtransaction;", "Mark the beginning of the
work unit which can be a compound transaction" ]
[ "wlr", "transaction_begin", "pattern
wlr.transaction_begin(chain:int, name:str):void ", "WLRgeneric;", "A
transaction statement (type can be commit,release,rollback or start)" ]
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
@@ -16479,9 +16479,9 @@ stdout of test 'MAL-signatures` in direc
[ "wlc", "drop_user", "pattern wlc.drop_user(sname:str, auth:str,
action:int):void ", "WLCgeneric;", "Catalog operation drop_user" ]
[ "wlc", "drop_view", "pattern wlc.drop_view(sname:str, name:str,
action:int, ifexists:int):void ", "WLCgeneric;", "Catalog operation
drop_view" ]
[ "wlc", "flush", "pattern wlc.flush():void ", "WLCflush;",
"Flush current log buffer" ]
-[ "wlc", "getmasterbeat", "pattern
wlc.getmasterbeat(duration:int):str ", "WLCgetmasterbeat;", "Maximal delay
for transaction log flushing" ]
-[ "wlc", "getmasterclock", "pattern wlc.getmasterclock():str ",
"WLCgetmasterclock;", "Timestamp of last update transaction" ]
-[ "wlc", "getmastertick", "pattern wlc.getmastertick():lng ",
"WLCgetmastertick;", "Transaction identifier of the last committed
transaction" ]
+[ "wlc", "getbeat", "pattern wlc.getbeat(duration:int):str ",
"WLCgetbeat;", "Maximal delay for transaction log flushing" ]
+[ "wlc", "getclock", "pattern wlc.getclock():str ", "WLCgetclock;",
"Timestamp of last update transaction" ]
+[ "wlc", "gettick", "pattern wlc.gettick():lng ", "WLCgettick;",
"Transaction identifier of the last committed transaction" ]
[ "wlc", "grant", "pattern wlc.grant(sname:str, tbl:str,
grantee:str, privs:int, cname:str, gr:int, grantor:int):void ", "WLCgeneric;",
"Catalog operation grant" ]
[ "wlc", "grant_function", "pattern wlc.grant_function(sname:str,
fcnid:int, grantee:str, privs:int, grant:int, grantor:int):void ",
"WLCgeneric;", "Catalog operation grant_function" ]
[ "wlc", "grant_roles", "pattern wlc.grant_roles(sname:str, auth:str,
grantor:int, admin:int):void ", "WLCgeneric;", "Catalog operation
grant_roles" ]
@@ -16498,14 +16498,15 @@ stdout of test 'MAL-signatures` in direc
[ "wlc", "revoke_roles", "pattern wlc.revoke_roles(sname:str, auth:str,
grantor:int, admin:int):void ", "WLCgeneric;", "Catalog operation
revoke_roles" ]
[ "wlc", "rollback", "pattern wlc.rollback():void ",
"WLCcommitCmd;", "Rollback the workload-capture-replay record" ]
[ "wlc", "rollback", "pattern wlc.rollback():void ",
"WLCrollbackCmd;", "Mark the end of the work unit" ]
-[ "wlc", "setmasterbeat", "pattern
wlc.setmasterbeat(duration:int):void ", "WLCsetmasterbeat;", "Maximal
delay for transaction log flushing" ]
-[ "wlc", "stopmaster", "pattern wlc.stopmaster():void ",
"WLCstopmaster;", "Stop capturing the logs" ]
+[ "wlc", "setbeat", "pattern wlc.setbeat(duration:int):void ",
"WLCsetbeat;", "Maximal delay for transaction log flushing" ]
+[ "wlc", "stop", "pattern wlc.stop():void ", "WLCstop;", "Stop
capturing the logs" ]
[ "wlc", "transaction", "unsafe pattern wlc.transaction():void ",
"WLCgeneric;", "Start an autocommit transaction" ]
[ "wlc", "transaction_begin", "pattern
wlc.transaction_begin(chain:int, name:str):void ", "WLCgeneric;", "A
transaction statement (type can be commit,release,rollback or start)" ]
[ "wlc", "transaction_commit", "pattern
wlc.transaction_commit(chain:int, name:str):void ", "WLCgeneric;", "A
transaction statement (type can be commit,release,rollback or start)" ]
[ "wlc", "transaction_release", "pattern
wlc.transaction_release(chain:int, name:str):void ", "WLCgeneric;", "A
transaction statement (type can be commit,release,rollback or start)" ]
[ "wlc", "transaction_rollback", "pattern
wlc.transaction_rollback(chain:int, name:str):void ", "WLCgeneric;", "A
transaction statement (type can be commit,release,rollback or start)" ]
[ "wlc", "update", "pattern wlc.update(sname:str, tname:str,
cname:str, tid:any, val:any):int ", "WLCupdate;", "Keep the update in the
workload-capture-replay list" ]
+[ "wlr", "accept", "pattern wlr.accept():void ", "WLRaccept;",
"Accept failing transaction" ]
[ "wlr", "action", "pattern wlr.action(q:str):void ",
"WLRaction;", "A query producing updates" ]
[ "wlr", "alter_add_range_partition", "pattern
wlr.alter_add_range_partition(sname:str, mtnme:str, psnme:str, ptnme:str,
min:str, max:str, nills:int, update:int):void ", "WLRgeneric;", "Catalog
operation alter_add_range_partition" ]
[ "wlr", "alter_add_table", "pattern wlr.alter_add_table(sname:str,
mtnme:str, psnme:str, ptnme:str, action:int):void ", "WLRgeneric;",
"Catalog operation alter_add_table" ]
@@ -16544,11 +16545,12 @@ stdout of test 'MAL-signatures` in direc
[ "wlr", "drop_user", "pattern wlr.drop_user(sname:str,
action:int):void ", "WLRgeneric;", "Catalog operation drop_user" ]
[ "wlr", "drop_user", "pattern wlr.drop_user(sname:str, auth:str,
action:int):void ", "WLRgeneric;", "Catalog operation drop_user" ]
[ "wlr", "drop_view", "pattern wlr.drop_view(sname:str, name:str,
action:int, ifexists:int):void ", "WLRgeneric;", "Catalog operation
drop_view" ]
-[ "wlr", "getreplicaclock", "pattern wlr.getreplicaclock():str ",
"WLRgetreplicaclock;", "Timestamp of last replicated transaction." ]
-[ "wlr", "getreplicatick", "pattern wlr.getreplicatick():lng ",
"WLRgetreplicatick;", "Transaction identifier of the last replicated
transaction." ]
+[ "wlr", "getclock", "pattern wlr.getclock():str ", "WLRgetclock;",
"Timestamp of last replicated transaction." ]
+[ "wlr", "gettick", "pattern wlr.gettick():lng ", "WLRgettick;",
"Transaction identifier of the last replicated transaction." ]
[ "wlr", "grant", "pattern wlr.grant(sname:str, tbl:str,
grantee:str, privs:int, cname:str, gr:int, grantor:int):void ", "WLRgeneric;",
"Catalog operation grant" ]
[ "wlr", "grant_function", "pattern wlr.grant_function(sname:str,
fcnid:int, grantee:str, privs:int, grant:int, grantor:int):void ",
"WLRgeneric;", "Catalog operation grant_function" ]
[ "wlr", "grant_roles", "pattern wlr.grant_roles(sname:str, auth:str,
grantor:int, admin:int):void ", "WLRgeneric;", "Catalog operation
grant_roles" ]
+[ "wlr", "master", "pattern wlr.master(dbname:str):void ",
"WLRmaster;", "Initialize the replicator thread" ]
[ "wlr", "rename_column", "pattern wlr.rename_column(sname:str,
tname:str, cname:str, newnme:str):void ", "WLRgeneric;", "Catalog operation
rename_column" ]
[ "wlr", "rename_schema", "pattern wlr.rename_schema(sname:str,
newnme:str):void ", "WLRgeneric;", "Catalog operation rename_schema"
]
[ "wlr", "rename_table", "pattern wlr.rename_table(osname:str,
nsname:str, otname:str, ntname:str):void ", "WLRgeneric;", "Catalog
operation rename_table" ]
@@ -16559,13 +16561,12 @@ stdout of test 'MAL-signatures` in direc
[ "wlr", "replicate", "pattern wlr.replicate(id:lng):void ",
"WLRreplicate;", "Roll the snapshot forward to a specific transaction
id" ]
[ "wlr", "replicate", "pattern wlr.replicate(id:sht):void ",
"WLRreplicate;", "Roll the snapshot forward to a specific transaction
id" ]
[ "wlr", "replicate", "pattern wlr.replicate(ts:timestamp):void ",
"WLRreplicate;", "Roll the snapshot forward to an up-to-date clone"
]
-[ "wlr", "replicate", "pattern wlr.replicate(dbname:str):void ",
"WLRstartreplicate;", "Initialize the replicator thread" ]
[ "wlr", "revoke", "pattern wlr.revoke(sname:str, tbl:str,
grantee:str, privs:int, cname:str, grant:int, grantor:int):void ",
"WLRgeneric;", "Catalog operation revoke" ]
[ "wlr", "revoke_function", "pattern wlr.revoke_function(sname:str,
fcnid:int, grantee:str, privs:int, grant:int, grantor:int):void ",
"WLRgeneric;", "Catalog operation revoke_function" ]
[ "wlr", "revoke_roles", "pattern wlr.revoke_roles(sname:str, auth:str,
grantor:int, admin:int):void ", "WLRgeneric;", "Catalog operation
revoke_roles" ]
[ "wlr", "rollback", "pattern wlr.rollback():void ", "WLRrollback;",
"Mark the end of the work unit" ]
-[ "wlr", "setreplicabeat", "pattern
wlr.setreplicabeat(dur:int):void ", "WLRsetreplicabeat;", "Threshold (in
seconds) for re-running queries" ]
-[ "wlr", "stopreplicate", "pattern wlr.stopreplicate():void ",
"WLRstopreplicate;", "Stop the replicator thread" ]
+[ "wlr", "setbeat", "pattern wlr.setbeat(dur:int):void ",
"WLRsetbeat;", "Threshold (in seconds) for re-running queries" ]
+[ "wlr", "stop", "pattern wlr.stop():void ", "WLRstop;", "Stop
the replicator thread" ]
[ "wlr", "transaction", "unsafe pattern wlr.transaction():void ",
"WLRgeneric;", "Start an autocommit transaction" ]
[ "wlr", "transaction", "pattern wlr.transaction(tid:lng, started:str,
user:str):void ", "WLRtransaction;", "Mark the beginning of the
work unit which can be a compound transaction" ]
[ "wlr", "transaction_begin", "pattern
wlr.transaction_begin(chain:int, name:str):void ", "WLRgeneric;", "A
transaction statement (type can be commit,release,rollback or start)" ]
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -904,9 +904,7 @@ str CLRstr(str *val, const color *c);
str CLRvalue(flt *b, const color *c);
str CLRvalueInt(int *b, const color *c);
str CLRycc(color *c, const int *y, const int *cr, const int *cb);
-str CLTActions(bat *ret);
str CLTInfo(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str CLTLastCommand(bat *ret);
str CLTLogin(bat *ret, bat *nme);
str CLTaddUser(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CLTbackendsum(str *ret, str *pw);
@@ -935,7 +933,6 @@ str CLTsha2sum(str *ret, str *pw, int *b
str CLTshutdown(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CLTstop(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CLTsuspend(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str CLTusers(bat *ret);
str CLTwakeup(void *ret, int *id);
str CMDBATimprints(void *ret, bat *bid);
str CMDBATimprintsize(lng *ret, bat *bid);
@@ -1908,11 +1905,12 @@ str WLCcommit(int clientid);
str WLCcommitCmd(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str WLCdelete(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str WLCfinish(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str WLCflush(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str WLCgeneric(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str WLCgetConfig(void);
-str WLCgetmasterbeat(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str WLCgetmasterclock(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str WLCgetmastertick(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str WLCgetbeat(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str WLCgetclock(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str WLCgettick(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str WLCinit(void);
str WLCinitCmd(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str WLCmaster(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
@@ -1921,8 +1919,8 @@ str WLCreadConfig(FILE *fd);
void WLCreset(void);
str WLCrollback(int clientid);
str WLCrollbackCmd(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str WLCsetmasterbeat(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str WLCstopmaster(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str WLCsetbeat(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str WLCstop(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str WLCtransaction(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str WLCupdate(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
int WLCused(void);
@@ -2492,7 +2490,7 @@ str pyapi3Ref;
str pyapi3mapRef;
str pyapiRef;
str pyapimapRef;
-int qtop;
+lng qtop;
str queryRef;
str querylogRef;
str raiseRef;
@@ -2656,6 +2654,7 @@ char wlc_dir[FILENAME_MAX];
lng wlc_id;
MT_Lock wlc_lock;
int wlc_state;
+lng wlc_tag;
char wlc_write[26];
str wlrRef;
str zero_or_oneRef;
diff --git a/monetdb5/modules/mal/wlc.c b/monetdb5/modules/mal/wlc.c
--- a/monetdb5/modules/mal/wlc.c
+++ b/monetdb5/modules/mal/wlc.c
@@ -45,7 +45,7 @@
* from most storage system related failures, e.g. using RAID disks or LSF
systems.
*
* A database can be set into 'master' mode only once using the SQL command:
- * CALL master() whose access permission is limited to the 'monetdb'
user.[CHECK]
+ * CALL wrc_master.master() whose access permission is limited to the
'monetdb' user.[CHECK]
* An optional path to the log record directory can be given to reduce the IO
latency,
* e.g. using a nearby SSD, or where there is ample of space to keep a long
history,
* e.g. a HDD or cold storage location.
@@ -73,7 +73,7 @@
* A transaction log file is created by the master using a heartbeat (in
seconds).
* A new transaction log file is published when the system has been collecting
transaction records for some time.
* The beat can be set using a SQL command, e.g.
- * CALL masterbeat(duration)
+ * CALL wcr_master.beat(duration)
* Setting it to zero leads to a log file per transaction and may cause a
large log directory
* with thousands of small files.
* The default of 5 minutes should balance polling overhead in most practical
situations.
@@ -86,7 +86,7 @@
* After closing, the replicas can see from the master configuration file that
a new log batch is available.
*
* The final step is to close stop transaction logging with the command
- * CALL stopmaster().
+ * CALL wcr_master.stop().
* It typically is the end-of-life-time for a snapshot. For example, when
planning to do
* a large bulk load of the database, stopping logging avoids a double write
into the
* database. The database can only be brought back into master mode using a
fresh snapshot.
@@ -117,7 +117,7 @@
*
* Every clone should start off with a copy of the binary snapshot identified
by 'snapshot'.
* A fresh database can be turned into a clone using the call
- * CALL replicate('mastername')
+ * CALL wcr_replica.master('mastername')
* It will grab the latest snapshot of the master and applies all
* available log files before releasing the system.
* The master has no knowledge about the number of clones and their
whereabouts.
@@ -129,23 +129,23 @@
* apply the logs until a given moment. This is particularly handy when an
unexpected
* desastrous user action (drop persistent table) has to be recovered from.
*
- * CALL setmaster('mastername'); -- get logs from a specific master
+ * CALL wcr_replica.master('mastername'); -- get logs from a specific master
* ...
- * CALL replicate(tag); -- stops after we are in sink with tag
+ * CALL wcr_replicate.replicate(tag); -- stops after we are in sink with tag
* ...
- * CALL replicate(NOW()); -- stop after we sinked all transactions
+ * CALL wcr_replicate.replicate(NOW()); -- stop after we sinked all
transactions
* ...
- * CALL replicate(); -- synchronize in background continuously
+ * CALL wcr_replicate.replicate(); -- synchronize in background continuously
* ...
- * CALL stopreplicate(); -- stop the synchroniation thread
+ * CALL wcr_replicate.stop(); -- stop the synchroniation thread
*
- * SELECT replicaClock();
+ * SELECT wcr_replica.clock();
* returns the timestamp of the last replicated transaction.
- * SELECT replicaTick();
+ * SELECT wcr_replica.tick();
* returns the transaction id of the last replicated transaction.
- * SELECT masterClock();
+ * SELECT wcr_master.clock();
* return the timestamp of the last committed transaction in the master.
- * SELECT masterTick();
+ * SELECT wcr_master.tick();
* return the transaction id of the last committed transaction in the master.
*
* Any failure encountered during a log replay terminates the replication
process,
@@ -422,7 +422,7 @@ WLCinitCmd(Client cntxt, MalBlkPtr mb, M
}
str
-WLCgetmasterclock(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
+WLCgetclock(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{ str *ret = getArgReference_str(stk,pci,0);
(void) cntxt;
(void) mb;
@@ -431,12 +431,12 @@ WLCgetmasterclock(Client cntxt, MalBlkPt
else
*ret = GDKstrdup(str_nil);
if(*ret == NULL)
- throw(MAL,"wlc.getmasterclock", MAL_MALLOC_FAIL);
+ throw(MAL,"wlc.getclock", MAL_MALLOC_FAIL);
return MAL_SUCCEED;
}
str
-WLCgetmastertick(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
+WLCgettick(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{ lng *ret = getArgReference_lng(stk,pci,0);
(void) cntxt;
(void) mb;
@@ -448,19 +448,19 @@ WLCgetmastertick(Client cntxt, MalBlkPtr
* It forces a new log file
*/
str
-WLCsetmasterbeat(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
+WLCsetbeat(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{ int beat;
(void) mb;
(void) cntxt;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
