Changeset: eafba476c481 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=eafba476c481 Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 monetdb5/modules/mal/wlcr.mal sql/backends/monet5/sql_wlcr.h Branch: wlcr Log Message:
Export the functions properly diffs (73 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 @@ -8730,7 +8730,7 @@ 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", "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", "finish", "pattern wlcr.finish(started:str, user:str, action:str, runtime:int):void ", "WLCfinish;", "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" ] 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 @@ -11095,7 +11095,7 @@ 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", "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", "finish", "pattern wlcr.finish(started:str, user:str, action:str, runtime:int):void ", "WLCfinish;", "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" ] diff --git a/monetdb5/modules/mal/wlcr.mal b/monetdb5/modules/mal/wlcr.mal --- a/monetdb5/modules/mal/wlcr.mal +++ b/monetdb5/modules/mal/wlcr.mal @@ -31,7 +31,7 @@ address WLClogrollback comment "Activate the workload-capture-replay. Also keep the aborted transactions is flag !=0"; pattern finish(started:str, user:str, action:str, runtime:int) -address WLCjob +address WLCfinish comment "Mark the beginning of the work unit which can be a compound transaction"; pattern rollback() diff --git a/sql/backends/monet5/sql_wlcr.h b/sql/backends/monet5/sql_wlcr.h --- a/sql/backends/monet5/sql_wlcr.h +++ b/sql/backends/monet5/sql_wlcr.h @@ -15,19 +15,19 @@ #include <sql_mvc.h> #include <sql_qc.h> -extern str WLRinit(void); -extern str WLRreplicate(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -extern str WLRwaitformaster(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -extern str WLRtransaction(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -extern str WLRreplaythreshold(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -extern str WLRfinish(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -extern str WLRquery(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -extern str WLRcatalog(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -extern str WLRchange(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -extern str WLRgeneric(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -extern str WLRappend(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -extern str WLRdelete(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -extern str WLRupdate(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -extern str WLRclear_table(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); +sql_export str WLRinit(void); +sql_export str WLRreplicate(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); +sql_export str WLRwaitformaster(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); +sql_export str WLRtransaction(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); +sql_export str WLRreplaythreshold(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); +sql_export str WLRfinish(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); +sql_export str WLRquery(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); +sql_export str WLRcatalog(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); +sql_export str WLRchange(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); +sql_export str WLRgeneric(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); +sql_export str WLRappend(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); +sql_export str WLRdelete(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); +sql_export str WLRupdate(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); +sql_export str WLRclear_table(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); #endif /*SQL_WLR_H*/ _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
