Changeset: 72865e02d92e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=72865e02d92e
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
clients/Tests/exports.stable.out
monetdb5/modules/mal/wlcr.c
monetdb5/modules/mal/wlcr.h
monetdb5/modules/mal/wlcr.mal
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/optimizer/opt_wlcr.c
sql/backends/monet5/sql_wlcr.c
sql/backends/monet5/sql_wlcr.h
sql/backends/monet5/sql_wlcr.mal
sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out
sql/test/Tests/setoptimizer.stable.out
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
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
sql/test/wlcr/Tests/wlc01.py
sql/test/wlcr/Tests/wlc01.stable.out
Branch: wlcr
Log Message:
Simplify the interface for wlcr
Remove superflous arguments and use function names to
communicate the state of affairs.
diffs (truncated from 2026 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
@@ -8698,9 +8698,11 @@ Ready.
[ "wlcr", "alter_table", "pattern wlcr.alter_table(sname:str,
action:int):void ", "WLCgeneric;", "Catalog operation alter_table" ]
[ "wlcr", "alter_user", "pattern wlcr.alter_user(sname:str,
passwrd:str, enc:int, schema:str, oldpasswrd:str):void ", "WLCgeneric;",
"Catalog operation alter_user" ]
[ "wlcr", "append", "pattern wlcr.append(sname:str, tname:str,
cname:str, ins:any):int ", "WLCappend;", "Keep the insertions in the
workload-capture-replay list" ]
+[ "wlcr", "catalog", "pattern wlcr.catalog(q:str):void ",
"WLCcatalog;", "Keep the catalog changing queries for replay. " ]
+[ "wlcr", "change", "pattern wlcr.change(q:str):void ",
"WLCchange;", "Keep the database changing queries for replay. " ]
[ "wlcr", "clear_table", "pattern wlcr.clear_table(sname:str,
tname:str):int ", "WLCclear_table;", "Keep the deletions in the
workload-capture-replay list" ]
-[ "wlcr", "commit", "pattern wlcr.commit():void ", "WLCcommit;",
"Finish keeping a log for this session" ]
[ "wlcr", "commit", "pattern wlcr.commit():void ",
"WLCcommitCmd;", "Commit the workload-capture-replay record" ]
+[ "wlcr", "commit", "pattern wlcr.commit():void ", "WLCfinish;",
"Mark the end of the work unit" ]
[ "wlcr", "create_function", "pattern
wlcr.create_function(sname:str, fname:str):void ", "WLCgeneric;", "Catalog
operation create_function" ]
[ "wlcr", "create_role", "pattern wlcr.create_role(sname:str, role:str,
grator:int):void ", "WLCgeneric;", "Catalog operation create_role" ]
[ "wlcr", "create_schema", "pattern wlcr.create_schema(sname:str,
auth:str, action:int):void ", "WLCgeneric;", "Catalog operation
create_schema" ]
@@ -8710,7 +8712,7 @@ Ready.
[ "wlcr", "create_type", "pattern wlcr.create_type(sname:str, nme:str,
impl:str):void ", "WLCgeneric;", "Catalog operation create_type" ]
[ "wlcr", "create_user", "pattern wlcr.create_user(sname:str,
passwrd:str, enc:int, schema:str, fullname:str):void ", "WLCgeneric;",
"Catalog operation create_user" ]
[ "wlcr", "create_view", "pattern wlcr.create_view(sname:str, tname:str,
temp:int):void ", "WLCgeneric;", "Catalog operation create_view" ]
-[ "wlcr", "delete", "pattern wlcr.delete(sname:str, tname:str,
b:any):int ", "WLCreset;", "Keep the deletions in the
workload-capture-replay list" ]
+[ "wlcr", "delete", "pattern wlcr.delete(sname:str, tname:str,
b:any):int ", "WLCdelete;", "Keep the deletions in the
workload-capture-replay list" ]
[ "wlcr", "drift", "pattern wlcr.drift(duration:int):void ",
"WLCdrift;", "Maximal duration of collecting a transaction log befor
releasing it" ]
[ "wlcr", "drop_constraint", "pattern
wlcr.drop_constraint(sname:str, name:str, action:int):void ", "WLCgeneric;",
"Catalog operation drop_constraint" ]
[ "wlcr", "drop_function", "pattern wlcr.drop_function(sname:str,
fname:str, fid:int, type:int, action:int):void ", "WLCgeneric;",
"Catalog operation drop_function" ]
@@ -8728,22 +8730,22 @@ Ready.
[ "wlcr", "drop_user", "pattern wlcr.drop_user(sname:str, auth:str,
action:int):void ", "WLCgeneric;", "Catalog operation drop_user" ]
[ "wlcr", "drop_view", "pattern wlcr.drop_view(sname:str, name:str,
action:int):void ", "WLCgeneric;", "Catalog operation drop_view" ]
[ "wlcr", "drop_view", "pattern wlcr.drop_view(sname:str, name:str,
action:int, ifexists:int):void ", "WLCgeneric;", "Catalog operation
drop_view" ]
-[ "wlcr", "exec", "pattern wlcr.exec():void ", "WLCexec;", "Mark
the end of the work unit" ]
+[ "wlcr", "finish", "pattern wlcr.finish(started:str, user:str,
action:str, runtime:int):void ", "WLCjob;", "Mark the beginning of the
work unit which can be a compound transaction" ]
[ "wlcr", "grant", "pattern wlcr.grant(sname:str, tbl:str,
grantee:str, privs:int, cname:str, gr:int, grantor:int):void ", "WLCgeneric;",
"Catalog operation grant" ]
[ "wlcr", "grant_function", "pattern wlcr.grant_function(sname:str,
fcnid:int, grantee:str, privs:int, grant:int, grantor:int):void ",
"WLCgeneric;", "Catalog operation grant_function" ]
[ "wlcr", "grant_roles", "pattern wlcr.grant_roles(sname:str, auth:str,
grantor:int, admin:int):void ", "WLCgeneric;", "Catalog operation
grant_roles" ]
[ "wlcr", "init", "pattern wlcr.init():void ", "WLCinitCmd;", "Test
for running as master" ]
-[ "wlcr", "job", "pattern wlcr.job(user:str, tid:int, started:str,
action:str, kind:str, runtime:int):void ", "WLCjob;", "Mark the
beginning of the work unit which can be a compound transaction" ]
+[ "wlcr", "logrollback", "pattern wlcr.logrollback(flag:int):void ",
"WLClogrollback;", "Activate the workload-capture-replay. Also keep the
aborted transactions is flag !=0" ]
[ "wlcr", "logthreshold", "pattern wlcr.logthreshold(limit:int):void ",
"WLClogthreshold;", "Activate the workload-capture-replay. Only queries
surpassing the threshold (in milliseconds) are kept." ]
[ "wlcr", "master", "pattern wlcr.master():void ", "WLCmaster;",
"Activate the workload-capture-replay" ]
-[ "wlcr", "query", "pattern wlcr.query(q:str, pipe:str):void ",
"WLCquery;", "Initialize the workload-capture-replay " ]
+[ "wlcr", "query", "pattern wlcr.query(q:str):void ",
"WLCquery;", "Keep the queries for replay." ]
[ "wlcr", "rename_user", "pattern wlcr.rename_user(sname:str,
newnme:str, action:int):void ", "WLCgeneric;", "Catalog operation
rename_user" ]
[ "wlcr", "replicate", "pattern wlcr.replicate(dbname:str):void ",
"WLCRreplicate;", "Roll the snapshot forward to an up-to-date clone"
]
-[ "wlcr", "replicate", "pattern wlcr.replicate(dbname:str,
waitformaster:bit):void ", "WLCRreplicate;", "Roll the snapshot forward
to an up-to-date clone and wait for it" ]
[ "wlcr", "revoke", "pattern wlcr.revoke(sname:str, tbl:str,
grantee:str, privs:int, cname:str, grant:int, grantor:int):void ",
"WLCgeneric;", "Catalog operation revoke" ]
[ "wlcr", "revoke_function", "pattern
wlcr.revoke_function(sname:str, fcnid:int, grantee:str, privs:int, grant:int,
grantor:int):void ", "WLCgeneric;", "Catalog operation revoke_function"
]
[ "wlcr", "revoke_roles", "pattern wlcr.revoke_roles(sname:str, auth:str,
grantor:int, admin:int):void ", "WLCgeneric;", "Catalog operation
revoke_roles" ]
[ "wlcr", "rollback", "pattern wlcr.rollback():void ",
"WLCcommitCmd;", "Rollback the workload-capture-replay record" ]
+[ "wlcr", "rollback", "pattern wlcr.rollback():void ",
"WLCfinish;", "Mark the end of the work unit" ]
[ "wlcr", "stopmaster", "pattern wlcr.stopmaster():void ",
"WLCstopmaster;", "Terminate keeping a log on this branch" ]
[ "wlcr", "transaction", "pattern wlcr.transaction():void ",
"WLCgeneric;", "Start an autocommit transaction" ]
[ "wlcr", "transaction_begin", "pattern
wlcr.transaction_begin(chain:int, name:str):void ", "WLCgeneric;", "A
transaction statement (type can be commit,release,rollback or start)" ]
@@ -8758,7 +8760,10 @@ Ready.
[ "wlr", "alter_table", "pattern wlr.alter_table(sname:str,
action:int):void ", "WLRgeneric;", "Catalog operation alter_table" ]
[ "wlr", "alter_user", "pattern wlr.alter_user(sname:str, passwrd:str,
enc:int, schema:str, oldpasswrd:str):void ", "WLRgeneric;", "Catalog
operation alter_user" ]
[ "wlr", "append", "pattern wlr.append(sname:str, tname:str,
cname:str, ins:any...):int ", "WLRappend;", "Apply the insertions in the
workload-capture-replay list" ]
+[ "wlr", "catalog", "pattern wlr.catalog(q:str):void ",
"WLRcatalog;", "A catalog changing query" ]
+[ "wlr", "change", "pattern wlr.change(q:str):void ",
"WLRchange;", "A query producing updates" ]
[ "wlr", "clear_table", "pattern wlr.clear_table(sname:str,
tname:str):int ", "WLRclear_table;", "Destroy the tuples in the table"
]
+[ "wlr", "commit", "pattern wlr.commit():void ", "WLRfinish;",
"Mark the end of the work unit" ]
[ "wlr", "create_function", "pattern wlr.create_function(sname:str,
fname:str):void ", "WLRgeneric;", "Catalog operation create_function"
]
[ "wlr", "create_role", "pattern wlr.create_role(sname:str, role:str,
grator:int):void ", "WLRgeneric;", "Catalog operation create_role" ]
[ "wlr", "create_schema", "pattern wlr.create_schema(sname:str,
auth:str, action:int):void ", "WLRgeneric;", "Catalog operation
create_schema" ]
@@ -8785,18 +8790,18 @@ Ready.
[ "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):void ", "WLRgeneric;", "Catalog operation drop_view" ]
[ "wlr", "drop_view", "pattern wlr.drop_view(sname:str, name:str,
action:int, ifexists:int):void ", "WLRgeneric;", "Catalog operation
drop_view" ]
-[ "wlr", "exec", "pattern wlr.exec():void ", "WLRexec;", "Mark
the end of the work unit" ]
[ "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", "job", "pattern wlr.job(user:str, tid:int, started:str,
action:str, kind:str, runtime:lng):void ", "WLRjob;", "Mark the
beginning of the work unit which can be a compound transaction" ]
-[ "wlr", "query", "pattern wlr.query(q:str, pipe:str):void ",
"WLRquery;", "The actual query applied" ]
+[ "wlr", "query", "pattern wlr.query(q:str):void ",
"WLRquery;", "The actual query applied" ]
[ "wlr", "rename_user", "pattern wlr.rename_user(sname:str, newnme:str,
action:int):void ", "WLRgeneric;", "Catalog operation rename_user" ]
[ "wlr", "replaythreshold", "pattern
wlr.replaythreshold(dur:int):void ", "WLRreplaythreshold;", "Threshold (in
milliseconds) for re-running queries" ]
[ "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 ", "WLRfinish;",
"Mark the end of the work unit" ]
[ "wlr", "transaction", "pattern wlr.transaction():void ",
"WLRgeneric;", "Start an autocommit transaction" ]
+[ "wlr", "transaction", "pattern wlr.transaction(started:str, user:str,
runtime:lng):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)" ]
[ "wlr", "transaction_commit", "pattern
wlr.transaction_commit(chain:int, name:str):void ", "WLRgeneric;", "A
transaction statement (type can be commit,release,rollback or start)" ]
[ "wlr", "transaction_release", "pattern
wlr.transaction_release(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
@@ -11063,9 +11063,11 @@ Ready.
[ "wlcr", "alter_table", "pattern wlcr.alter_table(sname:str,
action:int):void ", "WLCgeneric;", "Catalog operation alter_table" ]
[ "wlcr", "alter_user", "pattern wlcr.alter_user(sname:str,
passwrd:str, enc:int, schema:str, oldpasswrd:str):void ", "WLCgeneric;",
"Catalog operation alter_user" ]
[ "wlcr", "append", "pattern wlcr.append(sname:str, tname:str,
cname:str, ins:any):int ", "WLCappend;", "Keep the insertions in the
workload-capture-replay list" ]
+[ "wlcr", "catalog", "pattern wlcr.catalog(q:str):void ",
"WLCcatalog;", "Keep the catalog changing queries for replay. " ]
+[ "wlcr", "change", "pattern wlcr.change(q:str):void ",
"WLCchange;", "Keep the database changing queries for replay. " ]
[ "wlcr", "clear_table", "pattern wlcr.clear_table(sname:str,
tname:str):int ", "WLCclear_table;", "Keep the deletions in the
workload-capture-replay list" ]
-[ "wlcr", "commit", "pattern wlcr.commit():void ", "WLCcommit;",
"Finish keeping a log for this session" ]
[ "wlcr", "commit", "pattern wlcr.commit():void ",
"WLCcommitCmd;", "Commit the workload-capture-replay record" ]
+[ "wlcr", "commit", "pattern wlcr.commit():void ", "WLCfinish;",
"Mark the end of the work unit" ]
[ "wlcr", "create_function", "pattern
wlcr.create_function(sname:str, fname:str):void ", "WLCgeneric;", "Catalog
operation create_function" ]
[ "wlcr", "create_role", "pattern wlcr.create_role(sname:str, role:str,
grator:int):void ", "WLCgeneric;", "Catalog operation create_role" ]
[ "wlcr", "create_schema", "pattern wlcr.create_schema(sname:str,
auth:str, action:int):void ", "WLCgeneric;", "Catalog operation
create_schema" ]
@@ -11075,7 +11077,7 @@ Ready.
[ "wlcr", "create_type", "pattern wlcr.create_type(sname:str, nme:str,
impl:str):void ", "WLCgeneric;", "Catalog operation create_type" ]
[ "wlcr", "create_user", "pattern wlcr.create_user(sname:str,
passwrd:str, enc:int, schema:str, fullname:str):void ", "WLCgeneric;",
"Catalog operation create_user" ]
[ "wlcr", "create_view", "pattern wlcr.create_view(sname:str, tname:str,
temp:int):void ", "WLCgeneric;", "Catalog operation create_view" ]
-[ "wlcr", "delete", "pattern wlcr.delete(sname:str, tname:str,
b:any):int ", "WLCreset;", "Keep the deletions in the
workload-capture-replay list" ]
+[ "wlcr", "delete", "pattern wlcr.delete(sname:str, tname:str,
b:any):int ", "WLCdelete;", "Keep the deletions in the
workload-capture-replay list" ]
[ "wlcr", "drift", "pattern wlcr.drift(duration:int):void ",
"WLCdrift;", "Maximal duration of collecting a transaction log befor
releasing it" ]
[ "wlcr", "drop_constraint", "pattern
wlcr.drop_constraint(sname:str, name:str, action:int):void ", "WLCgeneric;",
"Catalog operation drop_constraint" ]
[ "wlcr", "drop_function", "pattern wlcr.drop_function(sname:str,
fname:str, fid:int, type:int, action:int):void ", "WLCgeneric;",
"Catalog operation drop_function" ]
@@ -11093,22 +11095,22 @@ Ready.
[ "wlcr", "drop_user", "pattern wlcr.drop_user(sname:str, auth:str,
action:int):void ", "WLCgeneric;", "Catalog operation drop_user" ]
[ "wlcr", "drop_view", "pattern wlcr.drop_view(sname:str, name:str,
action:int):void ", "WLCgeneric;", "Catalog operation drop_view" ]
[ "wlcr", "drop_view", "pattern wlcr.drop_view(sname:str, name:str,
action:int, ifexists:int):void ", "WLCgeneric;", "Catalog operation
drop_view" ]
-[ "wlcr", "exec", "pattern wlcr.exec():void ", "WLCexec;", "Mark
the end of the work unit" ]
+[ "wlcr", "finish", "pattern wlcr.finish(started:str, user:str,
action:str, runtime:int):void ", "WLCjob;", "Mark the beginning of the
work unit which can be a compound transaction" ]
[ "wlcr", "grant", "pattern wlcr.grant(sname:str, tbl:str,
grantee:str, privs:int, cname:str, gr:int, grantor:int):void ", "WLCgeneric;",
"Catalog operation grant" ]
[ "wlcr", "grant_function", "pattern wlcr.grant_function(sname:str,
fcnid:int, grantee:str, privs:int, grant:int, grantor:int):void ",
"WLCgeneric;", "Catalog operation grant_function" ]
[ "wlcr", "grant_roles", "pattern wlcr.grant_roles(sname:str, auth:str,
grantor:int, admin:int):void ", "WLCgeneric;", "Catalog operation
grant_roles" ]
[ "wlcr", "init", "pattern wlcr.init():void ", "WLCinitCmd;", "Test
for running as master" ]
-[ "wlcr", "job", "pattern wlcr.job(user:str, tid:int, started:str,
action:str, kind:str, runtime:int):void ", "WLCjob;", "Mark the
beginning of the work unit which can be a compound transaction" ]
+[ "wlcr", "logrollback", "pattern wlcr.logrollback(flag:int):void ",
"WLClogrollback;", "Activate the workload-capture-replay. Also keep the
aborted transactions is flag !=0" ]
[ "wlcr", "logthreshold", "pattern wlcr.logthreshold(limit:int):void ",
"WLClogthreshold;", "Activate the workload-capture-replay. Only queries
surpassing the threshold (in milliseconds) are kept." ]
[ "wlcr", "master", "pattern wlcr.master():void ", "WLCmaster;",
"Activate the workload-capture-replay" ]
-[ "wlcr", "query", "pattern wlcr.query(q:str, pipe:str):void ",
"WLCquery;", "Initialize the workload-capture-replay " ]
+[ "wlcr", "query", "pattern wlcr.query(q:str):void ",
"WLCquery;", "Keep the queries for replay." ]
[ "wlcr", "rename_user", "pattern wlcr.rename_user(sname:str,
newnme:str, action:int):void ", "WLCgeneric;", "Catalog operation
rename_user" ]
[ "wlcr", "replicate", "pattern wlcr.replicate(dbname:str):void ",
"WLCRreplicate;", "Roll the snapshot forward to an up-to-date clone"
]
-[ "wlcr", "replicate", "pattern wlcr.replicate(dbname:str,
waitformaster:bit):void ", "WLCRreplicate;", "Roll the snapshot forward
to an up-to-date clone and wait for it" ]
[ "wlcr", "revoke", "pattern wlcr.revoke(sname:str, tbl:str,
grantee:str, privs:int, cname:str, grant:int, grantor:int):void ",
"WLCgeneric;", "Catalog operation revoke" ]
[ "wlcr", "revoke_function", "pattern
wlcr.revoke_function(sname:str, fcnid:int, grantee:str, privs:int, grant:int,
grantor:int):void ", "WLCgeneric;", "Catalog operation revoke_function"
]
[ "wlcr", "revoke_roles", "pattern wlcr.revoke_roles(sname:str, auth:str,
grantor:int, admin:int):void ", "WLCgeneric;", "Catalog operation
revoke_roles" ]
[ "wlcr", "rollback", "pattern wlcr.rollback():void ",
"WLCcommitCmd;", "Rollback the workload-capture-replay record" ]
+[ "wlcr", "rollback", "pattern wlcr.rollback():void ",
"WLCfinish;", "Mark the end of the work unit" ]
[ "wlcr", "stopmaster", "pattern wlcr.stopmaster():void ",
"WLCstopmaster;", "Terminate keeping a log on this branch" ]
[ "wlcr", "transaction", "pattern wlcr.transaction():void ",
"WLCgeneric;", "Start an autocommit transaction" ]
[ "wlcr", "transaction_begin", "pattern
wlcr.transaction_begin(chain:int, name:str):void ", "WLCgeneric;", "A
transaction statement (type can be commit,release,rollback or start)" ]
@@ -11123,7 +11125,10 @@ Ready.
[ "wlr", "alter_table", "pattern wlr.alter_table(sname:str,
action:int):void ", "WLRgeneric;", "Catalog operation alter_table" ]
[ "wlr", "alter_user", "pattern wlr.alter_user(sname:str, passwrd:str,
enc:int, schema:str, oldpasswrd:str):void ", "WLRgeneric;", "Catalog
operation alter_user" ]
[ "wlr", "append", "pattern wlr.append(sname:str, tname:str,
cname:str, ins:any...):int ", "WLRappend;", "Apply the insertions in the
workload-capture-replay list" ]
+[ "wlr", "catalog", "pattern wlr.catalog(q:str):void ",
"WLRcatalog;", "A catalog changing query" ]
+[ "wlr", "change", "pattern wlr.change(q:str):void ",
"WLRchange;", "A query producing updates" ]
[ "wlr", "clear_table", "pattern wlr.clear_table(sname:str,
tname:str):int ", "WLRclear_table;", "Destroy the tuples in the table"
]
+[ "wlr", "commit", "pattern wlr.commit():void ", "WLRfinish;",
"Mark the end of the work unit" ]
[ "wlr", "create_function", "pattern wlr.create_function(sname:str,
fname:str):void ", "WLRgeneric;", "Catalog operation create_function"
]
[ "wlr", "create_role", "pattern wlr.create_role(sname:str, role:str,
grator:int):void ", "WLRgeneric;", "Catalog operation create_role" ]
[ "wlr", "create_schema", "pattern wlr.create_schema(sname:str,
auth:str, action:int):void ", "WLRgeneric;", "Catalog operation
create_schema" ]
@@ -11150,18 +11155,18 @@ Ready.
[ "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):void ", "WLRgeneric;", "Catalog operation drop_view" ]
[ "wlr", "drop_view", "pattern wlr.drop_view(sname:str, name:str,
action:int, ifexists:int):void ", "WLRgeneric;", "Catalog operation
drop_view" ]
-[ "wlr", "exec", "pattern wlr.exec():void ", "WLRexec;", "Mark
the end of the work unit" ]
[ "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", "job", "pattern wlr.job(user:str, tid:int, started:str,
action:str, kind:str, runtime:lng):void ", "WLRjob;", "Mark the
beginning of the work unit which can be a compound transaction" ]
-[ "wlr", "query", "pattern wlr.query(q:str, pipe:str):void ",
"WLRquery;", "The actual query applied" ]
+[ "wlr", "query", "pattern wlr.query(q:str):void ",
"WLRquery;", "The actual query applied" ]
[ "wlr", "rename_user", "pattern wlr.rename_user(sname:str, newnme:str,
action:int):void ", "WLRgeneric;", "Catalog operation rename_user" ]
[ "wlr", "replaythreshold", "pattern
wlr.replaythreshold(dur:int):void ", "WLRreplaythreshold;", "Threshold (in
milliseconds) for re-running queries" ]
[ "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 ", "WLRfinish;",
"Mark the end of the work unit" ]
[ "wlr", "transaction", "pattern wlr.transaction():void ",
"WLRgeneric;", "Start an autocommit transaction" ]
+[ "wlr", "transaction", "pattern wlr.transaction(started:str, user:str,
runtime:lng):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)" ]
[ "wlr", "transaction_commit", "pattern
wlr.transaction_commit(chain:int, name:str):void ", "WLRgeneric;", "A
transaction statement (type can be commit,release,rollback or start)" ]
[ "wlr", "transaction_release", "pattern
wlr.transaction_release(chain:int, name:str):void ", "WLRgeneric;", "A
transaction statement (type can be commit,release,rollback or start)" ]
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
@@ -212,6 +212,7 @@ Ready.
\dSf sys."like"
\dSf sys."listdir"
\dSf sys."listdirpat"
+\dSf sys."logrollback"
\dSf sys."logthreshold"
\dSf sys."malfunctions"
\dSf sys."masklen"
@@ -571,6 +572,7 @@ SYSTEM FUNCTION sys.localtimestamp
SYSTEM FUNCTION sys.locate
SYSTEM FUNCTION sys.log
SYSTEM FUNCTION sys.log10
+SYSTEM FUNCTION sys.logrollback
SYSTEM FUNCTION sys.logthreshold
SYSTEM FUNCTION sys.lower
SYSTEM FUNCTION sys.lpad
@@ -982,6 +984,7 @@ create filter function "like"(val string
create procedure listdir(dirname string) external name fits.listdir;
create procedure listdirpat(dirname string,pat string) external name
fits.listdirpattern;
+create procedure logrollback(flag int) external name wlcr.logrollback;
create procedure logthreshold(duration int) external name wlcr.logthreshold;
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";
@@ -2130,6 +2133,7 @@ drop function pcre_replace(string, strin
[ "sys", "log", "log", "mmath", 0, 1, false, false,
false ]
[ "sys", "log10", "log10", "mmath", 0, 1,
false, false, false ]
[ "sys", "log10", "log10", "mmath", 0, 1,
false, false, false ]
+[ "sys", "logrollback", "create procedure logrollback(flag int)
external name wlcr.logrollback;", "wlcr", 1, 2, true, false,
false ]
[ "sys", "logthreshold", "create procedure logthreshold(duration int)
external name wlcr.logthreshold;", "wlcr", 1, 2, true, false,
false ]
[ "sys", "lower", "toLower", "str", 0, 1, false,
false, false ]
[ "sys", "lower", "toLower", "str", 0, 1, false,
false, false ]
@@ -3685,6 +3689,7 @@ drop function pcre_replace(string, strin
[ "sys", "log", "arg_1", "real", 24, 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", "log10", "arg_1", "double", 53, 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", "log10", "arg_1", "real", 24, 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", "logrollback", NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, 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", "logthreshold", NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, 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", "lower", "arg_1", "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,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
]
[ "sys", "lower", "arg_1", "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,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
]
@@ -6101,6 +6106,7 @@ drop function pcre_replace(string, strin
[ "log" ]
[ "log10" ]
[ "log10" ]
+[ "logrollback" ]
[ "logthreshold" ]
[ "lower" ]
[ "lower" ]
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
@@ -208,6 +208,7 @@ Ready.
\dSf sys."like"
\dSf sys."listdir"
\dSf sys."listdirpat"
+\dSf sys."logrollback"
\dSf sys."logthreshold"
\dSf sys."malfunctions"
\dSf sys."masklen"
@@ -567,6 +568,7 @@ SYSTEM FUNCTION sys.localtimestamp
SYSTEM FUNCTION sys.locate
SYSTEM FUNCTION sys.log
SYSTEM FUNCTION sys.log10
+SYSTEM FUNCTION sys.logrollback
SYSTEM FUNCTION sys.logthreshold
SYSTEM FUNCTION sys.lower
SYSTEM FUNCTION sys.lpad
@@ -982,6 +984,7 @@ create filter function "like"(val string
create procedure listdir(dirname string) external name fits.listdir;
create procedure listdirpat(dirname string,pat string) external name
fits.listdirpattern;
+create procedure logrollback(flag int) external name wlcr.logrollback;
create procedure logthreshold(duration int) external name wlcr.logthreshold;
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";
@@ -2154,6 +2157,7 @@ drop function pcre_replace(string, strin
[ "sys", "log", "log", "mmath", 0, 1, false, false,
false ]
[ "sys", "log10", "log10", "mmath", 0, 1,
false, false, false ]
[ "sys", "log10", "log10", "mmath", 0, 1,
false, false, false ]
+[ "sys", "logrollback", "create procedure logrollback(flag int)
external name wlcr.logrollback;", "wlcr", 1, 2, true, false,
false ]
[ "sys", "logthreshold", "create procedure logthreshold(duration int)
external name wlcr.logthreshold;", "wlcr", 1, 2, true, false,
false ]
[ "sys", "lower", "toLower", "str", 0, 1, false,
false, false ]
[ "sys", "lower", "toLower", "str", 0, 1, false,
false, false ]
@@ -3890,6 +3894,7 @@ drop function pcre_replace(string, strin
[ "sys", "log", "arg_1", "real", 24, 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", "log10", "arg_1", "double", 53, 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", "log10", "arg_1", "real", 24, 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", "logrollback", NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, 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", "logthreshold", NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, 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", "lower", "arg_1", "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,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
]
[ "sys", "lower", "arg_1", "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,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
]
@@ -6496,6 +6501,7 @@ drop function pcre_replace(string, strin
[ "log" ]
[ "log10" ]
[ "log10" ]
+[ "logrollback" ]
[ "logthreshold" ]
[ "lower" ]
[ "lower" ]
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
@@ -1881,24 +1881,27 @@ int UUIDtoString(str *retval, int *len,
str UUIDuuid2str(str *retval, uuid **u);
gdk_return UUIDwrite(const uuid *u, stream *s, size_t cnt);
str WLCappend(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str WLCcatalog(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str WLCchange(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str WLCclear_table(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
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 WLCdrift(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str WLCexec(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str WLCexit(void);
+str WLCfinish(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str WLCgeneric(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str WLCgetConfig(void);
str WLCinit(Client cntxt);
str WLCinitCmd(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str WLCjob(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str WLClogrollback(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str WLClogthreshold(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str WLCmaster(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str WLCquery(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str WLCrollback(int clientid);
str WLCrollbackCmd(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list