Changeset: 4258d7059169 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4258d7059169
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
monetdb5/modules/mal/wlc.mal
sql/backends/monet5/wlr.mal
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
sql/test/leaks/Tests/check1.stable.out.int128
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check2.stable.out.int128
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check3.stable.out.int128
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check4.stable.out.int128
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/check5.stable.out.int128
Branch: sqlextra
Log Message:
Fixings for some tests
diffs (truncated from 643 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
@@ -7842,10 +7842,6 @@ Ready.
[ "language", "register", "pattern language.register(m:str, f:str,
code:str, help:str):void ", "CMDregisterFunction;", "Compile the code string
to MAL and register it as a function." ]
[ "language", "sink", "pattern language.sink(v:any...):void ",
"MALgarbagesink;", "Variables to be considered together when triggering
garbage collection.\nUsed in the dataflow blocks to avoid early release of
values." ]
[ "language", "source", "pattern language.source(f:str):void ",
"CMDevalFile;", "Merge the instructions stored in the file with the current
program." ]
-[ "lidar", "attach", "pattern lidar.attach(fname:str):void ",
"LIDARattach;", "Open a LIDAR file and return catalog of the table HDUs"
]
-[ "lidar", "export", "pattern lidar.export(tablename:str, fname:str,
type:str):void ", "LIDARexportTable;", "Exporta LIDAR table to a
LAS/LAZ file" ]
-[ "lidar", "load", "pattern lidar.load(tablename:str):void ",
"LIDARloadTable;", "Load a LIDAR table from an attached file" ]
-[ "lidar", "prelude", "command lidar.prelude():void ",
"LIDARprelude;", "" ]
[ "lsst", "angsep", "command lsst.angsep(ra1:dbl, dec1:dbl,
ra2:dbl, dec2:dbl):dbl ", "qserv_angSep;", "Returns the angular
separation in degrees between two spherical\ncoordinate pairs (ra1,dec1) and
(ra2,dec2)" ]
[ "lsst", "ptinsphbox", "command lsst.ptinsphbox(ra:dbl, dec:dbl,
ra_min:dbl, dec_min:dbl, ra_max:dbl, dec_max:dbl):int ",
"qserv_ptInSphBox;", "Returns 1 if the given spherical longitude/latitude
box contains the given position" ]
[ "lsst", "ptinsphcircle", "command lsst.ptinsphcircle(ra:dbl,
dec:dbl, ra_cen:dbl, dec_cen:dbl, radius:dbl):int ",
"qserv_ptInSphCircle;", "Returns 1 if the given spherical longitude/latitude
circle contains the given position" ]
@@ -8464,28 +8460,25 @@ Ready.
[ "sqlcatalog", "alter_user", "pattern
sqlcatalog.alter_user(sname:str, passwrd:str, enc:int, schema:str,
oldpasswrd:str):void ", "SQLalter_user;", "Catalog operation
alter_user" ]
[ "sqlcatalog", "create_function", "pattern
sqlcatalog.create_function(sname:str, fname:str, fcn:ptr):void ",
"SQLcreate_function;", "Catalog operation create_function" ]
[ "sqlcatalog", "create_role", "pattern
sqlcatalog.create_role(sname:str, role:str, grator:int):void ",
"SQLcreate_role;", "Catalog operation create_role" ]
-[ "sqlcatalog", "create_schema", "pattern
sqlcatalog.create_schema(sname:str, auth:str, action:int):void ",
"SQLcreate_schema;", "Catalog operation create_schema" ]
+[ "sqlcatalog", "create_schema", "pattern
sqlcatalog.create_schema(sname:str, auth:str, ifnotexists:int, action:int):void
", "SQLcreate_schema;", "Catalog operation create_schema" ]
[ "sqlcatalog", "create_seq", "pattern
sqlcatalog.create_seq(sname:str, seqname:str, seq:ptr, action:int):void ",
"SQLcreate_seq;", "Catalog operation create_seq" ]
[ "sqlcatalog", "create_table", "pattern
sqlcatalog.create_table(sname:str, tname:str, tbl:ptr, temp:int):void ",
"SQLcreate_table;", "Catalog operation create_table" ]
[ "sqlcatalog", "create_trigger", "pattern
sqlcatalog.create_trigger(sname:str, tname:str, triggername:str, time:int,
orientation:int, event:int, old:str, new:str, cond:str, qry:str):void ",
"SQLcreate_trigger;", "Catalog operation create_trigger" ]
[ "sqlcatalog", "create_type", "pattern
sqlcatalog.create_type(sname:str, nme:str, impl:str):void ",
"SQLcreate_type;", "Catalog operation create_type" ]
[ "sqlcatalog", "create_user", "pattern
sqlcatalog.create_user(sname:str, passwrd:str, enc:int, schema:str,
fullname:str):void ", "SQLcreate_user;", "Catalog operation
create_user" ]
[ "sqlcatalog", "create_view", "pattern
sqlcatalog.create_view(sname:str, vname:str, tbl:ptr, temp:int):void ",
"SQLcreate_view;", "Catalog operation create_view" ]
-[ "sqlcatalog", "drop_constraint", "pattern
sqlcatalog.drop_constraint(sname:str, name:str, action:int):void ",
"SQLdrop_constraint;", "Catalog operation drop_constraint" ]
+[ "sqlcatalog", "drop_constraint", "pattern
sqlcatalog.drop_constraint(sname:str, name:str, action:int, ifexists:int):void
", "SQLdrop_constraint;", "Catalog operation drop_constraint" ]
[ "sqlcatalog", "drop_function", "pattern
sqlcatalog.drop_function(sname:str, fname:str, fid:int, type:int,
action:int):void ", "SQLdrop_function;", "Catalog operation drop_function"
]
[ "sqlcatalog", "drop_index", "pattern
sqlcatalog.drop_index(sname:str, iname:str, action:int):void ",
"SQLdrop_index;", "Catalog operation drop_index" ]
[ "sqlcatalog", "drop_role", "pattern sqlcatalog.drop_role(auth:str,
role:str, action:int):void ", "SQLdrop_role;", "Catalog operation
drop_role" ]
[ "sqlcatalog", "drop_role", "pattern sqlcatalog.drop_role(role:str,
action:int):void ", "SQLdrop_role;", "Catalog operation drop_role"
]
-[ "sqlcatalog", "drop_schema", "pattern
sqlcatalog.drop_schema(sname:str, s:str, action:int):void ",
"SQLdrop_schema;", "Catalog operation drop_schema" ]
-[ "sqlcatalog", "drop_schema", "pattern
sqlcatalog.drop_schema(sname:str, s:str, action:int, ifexists:int):void ",
"SQLdrop_schema;", "Catalog operation drop_schema" ]
+[ "sqlcatalog", "drop_schema", "pattern
sqlcatalog.drop_schema(sname:str, s:str, ifexists:int, action:int):void ",
"SQLdrop_schema;", "Catalog operation drop_schema" ]
[ "sqlcatalog", "drop_seq", "pattern sqlcatalog.drop_seq(sname:str,
nme:str, action:int):void ", "SQLdrop_seq;", "Catalog operation drop_seq"
]
-[ "sqlcatalog", "drop_table", "pattern
sqlcatalog.drop_table(sname:str, name:str, action:int):void ",
"SQLdrop_table;", "Catalog operation drop_table" ]
[ "sqlcatalog", "drop_table", "pattern
sqlcatalog.drop_table(sname:str, name:str, action:int, ifexists:int):void ",
"SQLdrop_table;", "Catalog operation drop_table" ]
[ "sqlcatalog", "drop_trigger", "pattern
sqlcatalog.drop_trigger(sname:str, nme:str):void ", "SQLdrop_trigger;",
"Catalog operation drop_trigger" ]
[ "sqlcatalog", "drop_type", "pattern
sqlcatalog.drop_type(sname:str, nme:str, action:int):void ", "SQLdrop_type;",
"Catalog operation drop_type" ]
[ "sqlcatalog", "drop_user", "pattern
sqlcatalog.drop_user(sname:str, action:int):void ", "SQLdrop_user;",
"Catalog operation drop_user" ]
[ "sqlcatalog", "drop_user", "pattern
sqlcatalog.drop_user(sname:str, auth:str, action:int):void ", "SQLdrop_user;",
"Catalog operation drop_user" ]
-[ "sqlcatalog", "drop_view", "pattern
sqlcatalog.drop_view(sname:str, name:str, action:int):void ", "SQLdrop_view;",
"Catalog operation drop_view" ]
[ "sqlcatalog", "drop_view", "pattern
sqlcatalog.drop_view(sname:str, name:str, action:int, ifexists:int):void ",
"SQLdrop_view;", "Catalog operation drop_view" ]
[ "sqlcatalog", "grant", "pattern sqlcatalog.grant(sname:str,
tbl:str, grantee:str, privs:int, cname:str, gr:int, grantor:int):void ",
"SQLgrant;", "Catalog operation grant" ]
[ "sqlcatalog", "grant_function", "pattern
sqlcatalog.grant_function(sname:str, fcnid:int, grantee:str, privs:int,
grant:int, grantor:int):void ", "SQLgrant_function;", "Catalog
operation grant_function" ]
@@ -8692,7 +8685,7 @@ Ready.
[ "wlc", "commit", "pattern wlc.commit():void ",
"WLCcommitCmd;", "Mark the end of the work unit" ]
[ "wlc", "create_function", "pattern wlc.create_function(sname:str,
fname:str):void ", "WLCgeneric;", "Catalog operation create_function"
]
[ "wlc", "create_role", "pattern wlc.create_role(sname:str, role:str,
grator:int):void ", "WLCgeneric;", "Catalog operation create_role" ]
-[ "wlc", "create_schema", "pattern wlc.create_schema(sname:str,
auth:str, action:int):void ", "WLCgeneric;", "Catalog operation
create_schema" ]
+[ "wlc", "create_schema", "pattern wlc.create_schema(sname:str,
auth:str, ifnotexists:int, action:int):void ", "WLCgeneric;", "Catalog
operation create_schema" ]
[ "wlc", "create_seq", "pattern wlc.create_seq(sname:str, seqname:str,
action:int):void ", "WLCgeneric;", "Catalog operation create_seq" ]
[ "wlc", "create_table", "pattern wlc.create_table(sname:str, tname:str,
temp:int):void ", "WLCgeneric;", "Catalog operation create_table"
]
[ "wlc", "create_trigger", "pattern wlc.create_trigger(sname:str,
tname:str, triggername:str, time:int, orientation:int, event:int, old:str,
new:str, cond:str, qry:str):void ", "WLCgeneric;", "Catalog operation
create_trigger" ]
@@ -8700,21 +8693,18 @@ Ready.
[ "wlc", "create_user", "pattern wlc.create_user(sname:str,
passwrd:str, enc:int, schema:str, fullname:str):void ", "WLCgeneric;",
"Catalog operation create_user" ]
[ "wlc", "create_view", "pattern wlc.create_view(sname:str, tname:str,
temp:int):void ", "WLCgeneric;", "Catalog operation create_view" ]
[ "wlc", "delete", "pattern wlc.delete(sname:str, tname:str,
b:any):int ", "WLCdelete;", "Keep the deletions in the
workload-capture-replay list" ]
-[ "wlc", "drop_constraint", "pattern wlc.drop_constraint(sname:str,
name:str, action:int):void ", "WLCgeneric;", "Catalog operation
drop_constraint" ]
+[ "wlc", "drop_constraint", "pattern wlc.drop_constraint(sname:str,
name:str, action:int, ifexists:int):void ", "WLCgeneric;", "Catalog
operation drop_constraint" ]
[ "wlc", "drop_function", "pattern wlc.drop_function(sname:str,
fname:str, fid:int, type:int, action:int):void ", "WLCgeneric;", "Catalog
operation drop_function" ]
[ "wlc", "drop_index", "pattern wlc.drop_index(sname:str, iname:str,
action:int):void ", "WLCgeneric;", "Catalog operation drop_index" ]
[ "wlc", "drop_role", "pattern wlc.drop_role(auth:str, role:str,
action:int):void ", "WLCgeneric;", "Catalog operation drop_role" ]
[ "wlc", "drop_role", "pattern wlc.drop_role(role:str,
action:int):void ", "WLCgeneric;", "Catalog operation drop_role" ]
-[ "wlc", "drop_schema", "pattern wlc.drop_schema(sname:str, s:str,
action:int):void ", "WLCgeneric;", "Catalog operation drop_schema" ]
-[ "wlc", "drop_schema", "pattern wlc.drop_schema(sname:str, s:str,
action:int, ifexists:int):void ", "WLCgeneric;", "Catalog operation
drop_schema" ]
+[ "wlc", "drop_schema", "pattern wlc.drop_schema(sname:str, s:str,
ifexists:int, action:int):void ", "WLCgeneric;", "Catalog operation
drop_schema" ]
[ "wlc", "drop_seq", "pattern wlc.drop_seq(sname:str, nme:str,
action:int):void ", "WLCgeneric;", "Catalog operation drop_seq" ]
-[ "wlc", "drop_table", "pattern wlc.drop_table(sname:str, name:str,
action:int):void ", "WLCgeneric;", "Catalog operation drop_table" ]
[ "wlc", "drop_table", "pattern wlc.drop_table(sname:str, name:str,
action:int, ifexists:int):void ", "WLCgeneric;", "Catalog operation
drop_table" ]
[ "wlc", "drop_trigger", "pattern wlc.drop_trigger(sname:str,
nme:str):void ", "WLCgeneric;", "Catalog operation drop_trigger" ]
[ "wlc", "drop_type", "pattern wlc.drop_type(sname:str, nme:str,
action:int):void ", "WLCgeneric;", "Catalog operation drop_type" ]
[ "wlc", "drop_user", "pattern wlc.drop_user(sname:str,
action:int):void ", "WLCgeneric;", "Catalog operation drop_user" ]
[ "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):void ", "WLCgeneric;", "Catalog operation drop_view" ]
[ "wlc", "drop_view", "pattern wlc.drop_view(sname:str, name:str,
action:int, ifexists:int):void ", "WLCgeneric;", "Catalog operation
drop_view" ]
[ "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" ]
@@ -8766,16 +8756,13 @@ Ready.
[ "wlr", "drop_index", "pattern wlr.drop_index(sname:str, iname:str,
action:int):void ", "WLRgeneric;", "Catalog operation drop_index" ]
[ "wlr", "drop_role", "pattern wlr.drop_role(auth:str, role:str,
action:int):void ", "WLRgeneric;", "Catalog operation drop_role" ]
[ "wlr", "drop_role", "pattern wlr.drop_role(role:str,
action:int):void ", "WLRgeneric;", "Catalog operation drop_role" ]
-[ "wlr", "drop_schema", "pattern wlr.drop_schema(sname:str, s:str,
action:int):void ", "WLRgeneric;", "Catalog operation drop_schema" ]
[ "wlr", "drop_schema", "pattern wlr.drop_schema(sname:str, s:str,
action:int, ifexists:int):void ", "WLRgeneric;", "Catalog operation
drop_schema" ]
[ "wlr", "drop_seq", "pattern wlr.drop_seq(sname:str, nme:str,
action:int):void ", "WLRgeneric;", "Catalog operation drop_seq" ]
-[ "wlr", "drop_table", "pattern wlr.drop_table(sname:str, name:str,
action:int):void ", "WLRgeneric;", "Catalog operation drop_table" ]
[ "wlr", "drop_table", "pattern wlr.drop_table(sname:str, name:str,
action:int, ifexists:int):void ", "WLRgeneric;", "Catalog operation
drop_table" ]
[ "wlr", "drop_trigger", "pattern wlr.drop_trigger(sname:str,
nme:str):void ", "WLRgeneric;", "Catalog operation drop_trigger" ]
[ "wlr", "drop_type", "pattern wlr.drop_type(sname:str, nme:str,
action:int):void ", "WLRgeneric;", "Catalog operation drop_type" ]
[ "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):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", "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." ]
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
@@ -10202,10 +10202,6 @@ Ready.
[ "language", "register", "pattern language.register(m:str, f:str,
code:str, help:str):void ", "CMDregisterFunction;", "Compile the code string
to MAL and register it as a function." ]
[ "language", "sink", "pattern language.sink(v:any...):void ",
"MALgarbagesink;", "Variables to be considered together when triggering
garbage collection.\nUsed in the dataflow blocks to avoid early release of
values." ]
[ "language", "source", "pattern language.source(f:str):void ",
"CMDevalFile;", "Merge the instructions stored in the file with the current
program." ]
-[ "lidar", "attach", "pattern lidar.attach(fname:str):void ",
"LIDARattach;", "Open a LIDAR file and return catalog of the table HDUs"
]
-[ "lidar", "export", "pattern lidar.export(tablename:str, fname:str,
type:str):void ", "LIDARexportTable;", "Exporta LIDAR table to a
LAS/LAZ file" ]
-[ "lidar", "load", "pattern lidar.load(tablename:str):void ",
"LIDARloadTable;", "Load a LIDAR table from an attached file" ]
-[ "lidar", "prelude", "command lidar.prelude():void ",
"LIDARprelude;", "" ]
[ "lsst", "angsep", "command lsst.angsep(ra1:dbl, dec1:dbl,
ra2:dbl, dec2:dbl):dbl ", "qserv_angSep;", "Returns the angular
separation in degrees between two spherical\ncoordinate pairs (ra1,dec1) and
(ra2,dec2)" ]
[ "lsst", "ptinsphbox", "command lsst.ptinsphbox(ra:dbl, dec:dbl,
ra_min:dbl, dec_min:dbl, ra_max:dbl, dec_max:dbl):int ",
"qserv_ptInSphBox;", "Returns 1 if the given spherical longitude/latitude
box contains the given position" ]
[ "lsst", "ptinsphcircle", "command lsst.ptinsphcircle(ra:dbl,
dec:dbl, ra_cen:dbl, dec_cen:dbl, radius:dbl):int ",
"qserv_ptInSphCircle;", "Returns 1 if the given spherical longitude/latitude
circle contains the given position" ]
@@ -10828,28 +10824,25 @@ Ready.
[ "sqlcatalog", "alter_user", "pattern
sqlcatalog.alter_user(sname:str, passwrd:str, enc:int, schema:str,
oldpasswrd:str):void ", "SQLalter_user;", "Catalog operation
alter_user" ]
[ "sqlcatalog", "create_function", "pattern
sqlcatalog.create_function(sname:str, fname:str, fcn:ptr):void ",
"SQLcreate_function;", "Catalog operation create_function" ]
[ "sqlcatalog", "create_role", "pattern
sqlcatalog.create_role(sname:str, role:str, grator:int):void ",
"SQLcreate_role;", "Catalog operation create_role" ]
-[ "sqlcatalog", "create_schema", "pattern
sqlcatalog.create_schema(sname:str, auth:str, action:int):void ",
"SQLcreate_schema;", "Catalog operation create_schema" ]
+[ "sqlcatalog", "create_schema", "pattern
sqlcatalog.create_schema(sname:str, auth:str, ifnotexists:int, action:int):void
", "SQLcreate_schema;", "Catalog operation create_schema" ]
[ "sqlcatalog", "create_seq", "pattern
sqlcatalog.create_seq(sname:str, seqname:str, seq:ptr, action:int):void ",
"SQLcreate_seq;", "Catalog operation create_seq" ]
[ "sqlcatalog", "create_table", "pattern
sqlcatalog.create_table(sname:str, tname:str, tbl:ptr, temp:int):void ",
"SQLcreate_table;", "Catalog operation create_table" ]
[ "sqlcatalog", "create_trigger", "pattern
sqlcatalog.create_trigger(sname:str, tname:str, triggername:str, time:int,
orientation:int, event:int, old:str, new:str, cond:str, qry:str):void ",
"SQLcreate_trigger;", "Catalog operation create_trigger" ]
[ "sqlcatalog", "create_type", "pattern
sqlcatalog.create_type(sname:str, nme:str, impl:str):void ",
"SQLcreate_type;", "Catalog operation create_type" ]
[ "sqlcatalog", "create_user", "pattern
sqlcatalog.create_user(sname:str, passwrd:str, enc:int, schema:str,
fullname:str):void ", "SQLcreate_user;", "Catalog operation
create_user" ]
[ "sqlcatalog", "create_view", "pattern
sqlcatalog.create_view(sname:str, vname:str, tbl:ptr, temp:int):void ",
"SQLcreate_view;", "Catalog operation create_view" ]
-[ "sqlcatalog", "drop_constraint", "pattern
sqlcatalog.drop_constraint(sname:str, name:str, action:int):void ",
"SQLdrop_constraint;", "Catalog operation drop_constraint" ]
+[ "sqlcatalog", "drop_constraint", "pattern
sqlcatalog.drop_constraint(sname:str, name:str, action:int, ifexists:int):void
", "SQLdrop_constraint;", "Catalog operation drop_constraint" ]
[ "sqlcatalog", "drop_function", "pattern
sqlcatalog.drop_function(sname:str, fname:str, fid:int, type:int,
action:int):void ", "SQLdrop_function;", "Catalog operation drop_function"
]
[ "sqlcatalog", "drop_index", "pattern
sqlcatalog.drop_index(sname:str, iname:str, action:int):void ",
"SQLdrop_index;", "Catalog operation drop_index" ]
[ "sqlcatalog", "drop_role", "pattern sqlcatalog.drop_role(auth:str,
role:str, action:int):void ", "SQLdrop_role;", "Catalog operation
drop_role" ]
[ "sqlcatalog", "drop_role", "pattern sqlcatalog.drop_role(role:str,
action:int):void ", "SQLdrop_role;", "Catalog operation drop_role"
]
-[ "sqlcatalog", "drop_schema", "pattern
sqlcatalog.drop_schema(sname:str, s:str, action:int):void ",
"SQLdrop_schema;", "Catalog operation drop_schema" ]
-[ "sqlcatalog", "drop_schema", "pattern
sqlcatalog.drop_schema(sname:str, s:str, action:int, ifexists:int):void ",
"SQLdrop_schema;", "Catalog operation drop_schema" ]
+[ "sqlcatalog", "drop_schema", "pattern
sqlcatalog.drop_schema(sname:str, s:str, ifexists:int, action:int):void ",
"SQLdrop_schema;", "Catalog operation drop_schema" ]
[ "sqlcatalog", "drop_seq", "pattern sqlcatalog.drop_seq(sname:str,
nme:str, action:int):void ", "SQLdrop_seq;", "Catalog operation drop_seq"
]
-[ "sqlcatalog", "drop_table", "pattern
sqlcatalog.drop_table(sname:str, name:str, action:int):void ",
"SQLdrop_table;", "Catalog operation drop_table" ]
[ "sqlcatalog", "drop_table", "pattern
sqlcatalog.drop_table(sname:str, name:str, action:int, ifexists:int):void ",
"SQLdrop_table;", "Catalog operation drop_table" ]
[ "sqlcatalog", "drop_trigger", "pattern
sqlcatalog.drop_trigger(sname:str, nme:str):void ", "SQLdrop_trigger;",
"Catalog operation drop_trigger" ]
[ "sqlcatalog", "drop_type", "pattern
sqlcatalog.drop_type(sname:str, nme:str, action:int):void ", "SQLdrop_type;",
"Catalog operation drop_type" ]
[ "sqlcatalog", "drop_user", "pattern
sqlcatalog.drop_user(sname:str, action:int):void ", "SQLdrop_user;",
"Catalog operation drop_user" ]
[ "sqlcatalog", "drop_user", "pattern
sqlcatalog.drop_user(sname:str, auth:str, action:int):void ", "SQLdrop_user;",
"Catalog operation drop_user" ]
-[ "sqlcatalog", "drop_view", "pattern
sqlcatalog.drop_view(sname:str, name:str, action:int):void ", "SQLdrop_view;",
"Catalog operation drop_view" ]
[ "sqlcatalog", "drop_view", "pattern
sqlcatalog.drop_view(sname:str, name:str, action:int, ifexists:int):void ",
"SQLdrop_view;", "Catalog operation drop_view" ]
[ "sqlcatalog", "grant", "pattern sqlcatalog.grant(sname:str,
tbl:str, grantee:str, privs:int, cname:str, gr:int, grantor:int):void ",
"SQLgrant;", "Catalog operation grant" ]
[ "sqlcatalog", "grant_function", "pattern
sqlcatalog.grant_function(sname:str, fcnid:int, grantee:str, privs:int,
grant:int, grantor:int):void ", "SQLgrant_function;", "Catalog
operation grant_function" ]
@@ -11057,7 +11050,7 @@ Ready.
[ "wlc", "commit", "pattern wlc.commit():void ",
"WLCcommitCmd;", "Mark the end of the work unit" ]
[ "wlc", "create_function", "pattern wlc.create_function(sname:str,
fname:str):void ", "WLCgeneric;", "Catalog operation create_function"
]
[ "wlc", "create_role", "pattern wlc.create_role(sname:str, role:str,
grator:int):void ", "WLCgeneric;", "Catalog operation create_role" ]
-[ "wlc", "create_schema", "pattern wlc.create_schema(sname:str,
auth:str, action:int):void ", "WLCgeneric;", "Catalog operation
create_schema" ]
+[ "wlc", "create_schema", "pattern wlc.create_schema(sname:str,
auth:str, ifnotexists:int, action:int):void ", "WLCgeneric;", "Catalog
operation create_schema" ]
[ "wlc", "create_seq", "pattern wlc.create_seq(sname:str, seqname:str,
action:int):void ", "WLCgeneric;", "Catalog operation create_seq" ]
[ "wlc", "create_table", "pattern wlc.create_table(sname:str, tname:str,
temp:int):void ", "WLCgeneric;", "Catalog operation create_table"
]
[ "wlc", "create_trigger", "pattern wlc.create_trigger(sname:str,
tname:str, triggername:str, time:int, orientation:int, event:int, old:str,
new:str, cond:str, qry:str):void ", "WLCgeneric;", "Catalog operation
create_trigger" ]
@@ -11065,21 +11058,18 @@ Ready.
[ "wlc", "create_user", "pattern wlc.create_user(sname:str,
passwrd:str, enc:int, schema:str, fullname:str):void ", "WLCgeneric;",
"Catalog operation create_user" ]
[ "wlc", "create_view", "pattern wlc.create_view(sname:str, tname:str,
temp:int):void ", "WLCgeneric;", "Catalog operation create_view" ]
[ "wlc", "delete", "pattern wlc.delete(sname:str, tname:str,
b:any):int ", "WLCdelete;", "Keep the deletions in the
workload-capture-replay list" ]
-[ "wlc", "drop_constraint", "pattern wlc.drop_constraint(sname:str,
name:str, action:int):void ", "WLCgeneric;", "Catalog operation
drop_constraint" ]
+[ "wlc", "drop_constraint", "pattern wlc.drop_constraint(sname:str,
name:str, action:int, ifexists:int):void ", "WLCgeneric;", "Catalog
operation drop_constraint" ]
[ "wlc", "drop_function", "pattern wlc.drop_function(sname:str,
fname:str, fid:int, type:int, action:int):void ", "WLCgeneric;", "Catalog
operation drop_function" ]
[ "wlc", "drop_index", "pattern wlc.drop_index(sname:str, iname:str,
action:int):void ", "WLCgeneric;", "Catalog operation drop_index" ]
[ "wlc", "drop_role", "pattern wlc.drop_role(auth:str, role:str,
action:int):void ", "WLCgeneric;", "Catalog operation drop_role" ]
[ "wlc", "drop_role", "pattern wlc.drop_role(role:str,
action:int):void ", "WLCgeneric;", "Catalog operation drop_role" ]
-[ "wlc", "drop_schema", "pattern wlc.drop_schema(sname:str, s:str,
action:int):void ", "WLCgeneric;", "Catalog operation drop_schema" ]
-[ "wlc", "drop_schema", "pattern wlc.drop_schema(sname:str, s:str,
action:int, ifexists:int):void ", "WLCgeneric;", "Catalog operation
drop_schema" ]
+[ "wlc", "drop_schema", "pattern wlc.drop_schema(sname:str, s:str,
ifexists:int, action:int):void ", "WLCgeneric;", "Catalog operation
drop_schema" ]
[ "wlc", "drop_seq", "pattern wlc.drop_seq(sname:str, nme:str,
action:int):void ", "WLCgeneric;", "Catalog operation drop_seq" ]
-[ "wlc", "drop_table", "pattern wlc.drop_table(sname:str, name:str,
action:int):void ", "WLCgeneric;", "Catalog operation drop_table" ]
[ "wlc", "drop_table", "pattern wlc.drop_table(sname:str, name:str,
action:int, ifexists:int):void ", "WLCgeneric;", "Catalog operation
drop_table" ]
[ "wlc", "drop_trigger", "pattern wlc.drop_trigger(sname:str,
nme:str):void ", "WLCgeneric;", "Catalog operation drop_trigger" ]
[ "wlc", "drop_type", "pattern wlc.drop_type(sname:str, nme:str,
action:int):void ", "WLCgeneric;", "Catalog operation drop_type" ]
[ "wlc", "drop_user", "pattern wlc.drop_user(sname:str,
action:int):void ", "WLCgeneric;", "Catalog operation drop_user" ]
[ "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):void ", "WLCgeneric;", "Catalog operation drop_view" ]
[ "wlc", "drop_view", "pattern wlc.drop_view(sname:str, name:str,
action:int, ifexists:int):void ", "WLCgeneric;", "Catalog operation
drop_view" ]
[ "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" ]
@@ -11131,16 +11121,13 @@ Ready.
[ "wlr", "drop_index", "pattern wlr.drop_index(sname:str, iname:str,
action:int):void ", "WLRgeneric;", "Catalog operation drop_index" ]
[ "wlr", "drop_role", "pattern wlr.drop_role(auth:str, role:str,
action:int):void ", "WLRgeneric;", "Catalog operation drop_role" ]
[ "wlr", "drop_role", "pattern wlr.drop_role(role:str,
action:int):void ", "WLRgeneric;", "Catalog operation drop_role" ]
-[ "wlr", "drop_schema", "pattern wlr.drop_schema(sname:str, s:str,
action:int):void ", "WLRgeneric;", "Catalog operation drop_schema" ]
[ "wlr", "drop_schema", "pattern wlr.drop_schema(sname:str, s:str,
action:int, ifexists:int):void ", "WLRgeneric;", "Catalog operation
drop_schema" ]
[ "wlr", "drop_seq", "pattern wlr.drop_seq(sname:str, nme:str,
action:int):void ", "WLRgeneric;", "Catalog operation drop_seq" ]
-[ "wlr", "drop_table", "pattern wlr.drop_table(sname:str, name:str,
action:int):void ", "WLRgeneric;", "Catalog operation drop_table" ]
[ "wlr", "drop_table", "pattern wlr.drop_table(sname:str, name:str,
action:int, ifexists:int):void ", "WLRgeneric;", "Catalog operation
drop_table" ]
[ "wlr", "drop_trigger", "pattern wlr.drop_trigger(sname:str,
nme:str):void ", "WLRgeneric;", "Catalog operation drop_trigger" ]
[ "wlr", "drop_type", "pattern wlr.drop_type(sname:str, nme:str,
action:int):void ", "WLRgeneric;", "Catalog operation drop_type" ]
[ "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):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", "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." ]
diff --git a/monetdb5/modules/mal/wlc.mal b/monetdb5/modules/mal/wlc.mal
--- a/monetdb5/modules/mal/wlc.mal
+++ b/monetdb5/modules/mal/wlc.mal
@@ -83,11 +83,11 @@ address WLCcommitCmd
comment "Rollback the workload-capture-replay record";
# The wrapping of the catalog and transaction operations
-pattern create_seq( sname:str, seqname:str, action:int)
+pattern create_seq( sname:str, seqname:str, seq:ptr, action:int)
address WLCgeneric
comment "Catalog operation create_seq";
-pattern alter_seq( sname:str, seqname:str, val:lng)
+pattern alter_seq( sname:str, seqname:str, seq:ptr, val:lng)
address WLCgeneric
comment "Catalog operation alter_seq";
@@ -103,11 +103,11 @@ pattern drop_schema( sname:str, s:str, i
address WLCgeneric
comment "Catalog operation drop_schema";
-pattern create_table(sname:str, tname:str, temp:int)
+pattern create_table(sname:str, tname:str, tbl:ptr, temp:int)
address WLCgeneric
comment "Catalog operation create_table";
-pattern create_view(sname:str, tname:str, temp:int)
+pattern create_view(sname:str, vname:str, tbl:ptr, temp:int)
address WLCgeneric
comment "Catalog operation create_view";
@@ -123,7 +123,7 @@ pattern drop_constraint( sname:str, name
address WLCgeneric
comment "Catalog operation drop_constraint";
-pattern alter_table( sname:str, action:int)
+pattern alter_table( sname:str, tname:str, tbl:ptr, action:int)
address WLCgeneric
comment "Catalog operation alter_table";
diff --git a/sql/backends/monet5/wlr.mal b/sql/backends/monet5/wlr.mal
--- a/sql/backends/monet5/wlr.mal
+++ b/sql/backends/monet5/wlr.mal
@@ -87,11 +87,11 @@ pattern clear_table(sname:str, tname:str
address WLRclear_table
comment "Destroy the tuples in the table";
-pattern create_seq( sname:str, seqname:str, action:int)
+pattern create_seq( sname:str, seqname:str, seq:ptr, action:int)
address WLRgeneric
comment "Catalog operation create_seq";
-pattern alter_seq( sname:str, seqname:str, val:lng)
+pattern alter_seq( sname:str, seqname:str, seq:ptr, val:lng)
address WLRgeneric
comment "Catalog operation alter_seq";
@@ -99,23 +99,23 @@ pattern drop_seq( sname:str, nme:str, ac
address WLRgeneric
comment "Catalog operation drop_seq";
-pattern create_schema(sname:str, auth:str, action:int)
+pattern create_schema(sname:str, auth:str, ifnotexists:int, action:int)
address WLRgeneric
comment "Catalog operation create_schema";
-pattern drop_schema( sname:str, s:str, action:int, ifexists:int)
+pattern drop_schema( sname:str, s:str, ifexists:int, action:int)
address WLRgeneric
comment "Catalog operation drop_schema";
-pattern create_table(sname:str, tname:str, temp:int)
+pattern create_table(sname:str, tname:str, tbl:ptr, temp:int)
address WLRgeneric
comment "Catalog operation create_table";
-pattern create_view(sname:str, tname:str, temp:int)
+pattern create_view(sname:str, vname:str, tbl:ptr, temp:int)
address WLRgeneric
comment "Catalog operation create_view";
-pattern drop_table( sname:str, name:str, action:int , ifexists:int)
+pattern drop_table( sname:str, name:str, action:int, ifexists:int)
address WLRgeneric
comment "Catalog operation drop_table";
@@ -123,11 +123,11 @@ pattern drop_view( sname:str, name:str,
address WLRgeneric
comment "Catalog operation drop_view";
-pattern drop_constraint( sname:str, name:str, action:int)
+pattern drop_constraint( sname:str, name:str, action:int, ifexists:int)
address WLRgeneric
comment "Catalog operation drop_constraint";
-pattern alter_table( sname:str, action:int)
+pattern alter_table( sname:str, tname:str, tbl:ptr, action:int)
address WLRgeneric
comment "Catalog operation alter_table";
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
@@ -813,7 +813,7 @@ CREATE TABLE "sys"."netcdf_files" ("file
CREATE TABLE "sys"."netcdf_vardim" ("var_id" INTEGER, "dim_id" INTEGER,
"file_id" INTEGER, "dimpos" INTEGER);
CREATE TABLE "sys"."netcdf_vars" ("var_id" INTEGER, "file_id" INTEGER, "name"
VARCHAR(64), "vartype" VARCHAR(64), "ndim" INTEGER, "coord_dim_id" INTEGER);
CREATE TABLE "sys"."objects" ("id" INTEGER, "name" VARCHAR(1024), "nr"
INTEGER);
-CREATE TABLE "sys"."privilege_codes" ("privilege_code_id" INTEGER NOT NULL,
"privilege_code_name" VARCHAR(30) NOT NULL, CONSTRAINT
"privilege_codes_privilege_code_id_pkey" PRIMARY KEY ("privilege_code_id"),
CONSTRAINT "privilege_codes_privilege_code_name_unique" UNIQUE
("privilege_code_name"));
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
