Changeset: fb01b69ba173 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/fb01b69ba173
Modified Files:
clients/Tests/MAL-signatures-hge.test
clients/Tests/MAL-signatures.test
monetdb5/modules/kernel/algebra.c
monetdb5/modules/mal/remote.c
Branch: default
Log Message:
Removed some duplicate MAL interfaces.
diffs (102 lines):
diff --git a/clients/Tests/MAL-signatures-hge.test
b/clients/Tests/MAL-signatures-hge.test
--- a/clients/Tests/MAL-signatures-hge.test
+++ b/clients/Tests/MAL-signatures-hge.test
@@ -3550,11 +3550,6 @@ ALGsemijoin;
Semi join with candidate lists
algebra
slice
-command algebra.slice(X_0:bat[:any_1], X_1:lng, X_2:lng):bat[:any_1]
-ALGslice;
-Return the slice with the BUNs at position x till y.
-algebra
-slice
command algebra.slice(X_0:bat[:any_1], X_1:int, X_2:int):bat[:any_1]
ALGslice_int;
Return the slice with the BUNs at position x till y.
@@ -48045,11 +48040,6 @@ RMTepilogue;
release the resources held by the remote module
remote
exec
-pattern remote.exec(X_0:str, X_1:str, X_2:str):str
-RMTexec;
-remotely executes <mod>.<func> and returns the handle to its result
-remote
-exec
pattern remote.exec(X_0:str, X_1:str, X_2:str):str...
RMTexec;
remotely executes <mod>.<func> and returns the handle to its result
@@ -48060,11 +48050,6 @@ RMTexec;
remotely executes <mod>.<func> using the argument list of remote objects and
applying function pointer rcb as callback to handle any results.
remote
exec
-pattern remote.exec(X_0:str, X_1:str, X_2:str, X_3:str...):str
-RMTexec;
-remotely executes <mod>.<func> using the argument list of remote objects and
returns the handle to its result
-remote
-exec
pattern remote.exec(X_0:str, X_1:str, X_2:str, X_3:str...):str...
RMTexec;
remotely executes <mod>.<func> using the argument list of remote objects and
returns the handle to its result
diff --git a/clients/Tests/MAL-signatures.test
b/clients/Tests/MAL-signatures.test
--- a/clients/Tests/MAL-signatures.test
+++ b/clients/Tests/MAL-signatures.test
@@ -2985,11 +2985,6 @@ ALGsemijoin;
Semi join with candidate lists
algebra
slice
-command algebra.slice(X_0:bat[:any_1], X_1:lng, X_2:lng):bat[:any_1]
-ALGslice;
-Return the slice with the BUNs at position x till y.
-algebra
-slice
command algebra.slice(X_0:bat[:any_1], X_1:int, X_2:int):bat[:any_1]
ALGslice_int;
Return the slice with the BUNs at position x till y.
@@ -36470,11 +36465,6 @@ RMTepilogue;
release the resources held by the remote module
remote
exec
-pattern remote.exec(X_0:str, X_1:str, X_2:str):str
-RMTexec;
-remotely executes <mod>.<func> and returns the handle to its result
-remote
-exec
pattern remote.exec(X_0:str, X_1:str, X_2:str):str...
RMTexec;
remotely executes <mod>.<func> and returns the handle to its result
@@ -36485,11 +36475,6 @@ RMTexec;
remotely executes <mod>.<func> using the argument list of remote objects and
applying function pointer rcb as callback to handle any results.
remote
exec
-pattern remote.exec(X_0:str, X_1:str, X_2:str, X_3:str...):str
-RMTexec;
-remotely executes <mod>.<func> using the argument list of remote objects and
returns the handle to its result
-remote
-exec
pattern remote.exec(X_0:str, X_1:str, X_2:str, X_3:str...):str...
RMTexec;
remotely executes <mod>.<func> using the argument list of remote objects and
returns the handle to its result
diff --git a/monetdb5/modules/kernel/algebra.c
b/monetdb5/modules/kernel/algebra.c
--- a/monetdb5/modules/kernel/algebra.c
+++ b/monetdb5/modules/kernel/algebra.c
@@ -1493,7 +1493,6 @@ mel_func algebra_init_funcs[] = {
pattern("algebra", "firstn", ALGfirstn, false, "Calculate first N values of B
with candidate list S", args(2,9,
batarg("",oid),batarg("",oid),batargany("b",0),batarg("s",oid),batarg("g",oid),arg("n",lng),arg("asc",bit),arg("nilslast",bit),arg("distinct",bit))),
command("algebra", "reuse", ALGreuse, false, "Reuse a temporary BAT if you
can. Otherwise,\nallocate enough storage to accept result of an\noperation (not
involving the heap)", args(1,2, batargany("",1),batargany("b",1))),
command("algebra", "slice", ALGslice_oid, false, "Return the slice based on
head oid x till y (exclusive).", args(1,4,
batargany("",1),batargany("b",1),arg("x",oid),arg("y",oid))),
- command("algebra", "slice", ALGslice, false, "Return the slice with the BUNs
at position x till y.", args(1,4,
batargany("",1),batargany("b",1),arg("x",lng),arg("y",lng))),
command("algebra", "slice", ALGslice_int, false, "Return the slice with the
BUNs at position x till y.", args(1,4,
batargany("",1),batargany("b",1),arg("x",int),arg("y",int))),
command("algebra", "slice", ALGslice_lng, false, "Return the slice with the
BUNs at position x till y.", args(1,4,
batargany("",1),batargany("b",1),arg("x",lng),arg("y",lng))),
command("algebra", "subslice", ALGsubslice_lng, false, "Return the oids of
the slice with the BUNs at position x till y.", args(1,4,
batarg("",oid),batargany("b",1),arg("x",lng),arg("y",lng))),
diff --git a/monetdb5/modules/mal/remote.c b/monetdb5/modules/mal/remote.c
--- a/monetdb5/modules/mal/remote.c
+++ b/monetdb5/modules/mal/remote.c
@@ -1691,9 +1691,7 @@ mel_func remote_init_funcs[] = {
pattern("remote", "get", RMTget, false, "retrieves a copy of remote object
ident", args(1,3, argany("",0),arg("conn",str),arg("ident",str))),
pattern("remote", "put", RMTput, false, "copies object to the remote site and
returns its identifier", args(1,3,
arg("",str),arg("conn",str),argany("object",0))),
pattern("remote", "register", RMTregister, false, "register <mod>.<fcn> at
the remote site", args(1,4,
arg("",str),arg("conn",str),arg("mod",str),arg("fcn",str))),
- pattern("remote", "exec", RMTexec, false, "remotely executes <mod>.<func> and
returns the handle to its result", args(1,4,
arg("",str),arg("conn",str),arg("mod",str),arg("func",str))),
pattern("remote", "exec", RMTexec, false, "remotely executes <mod>.<func> and
returns the handle to its result", args(1,4,
vararg("",str),arg("conn",str),arg("mod",str),arg("func",str))),
- pattern("remote", "exec", RMTexec, false, "remotely executes <mod>.<func>
using the argument list of remote objects and returns the handle to its
result", args(1,5,
arg("",str),arg("conn",str),arg("mod",str),arg("func",str),vararg("",str))),
pattern("remote", "exec", RMTexec, false, "remotely executes <mod>.<func>
using the argument list of remote objects and returns the handle to its
result", args(1,5,
vararg("",str),arg("conn",str),arg("mod",str),arg("func",str),vararg("",str))),
pattern("remote", "exec", RMTexec, false, "remotely executes <mod>.<func>
using the argument list of remote objects and applying function pointer rcb as
callback to handle any results.", args(0,5,
arg("conn",str),arg("mod",str),arg("func",str),arg("rcb",ptr), vararg("",str))),
pattern("remote", "exec", RMTexec, false, "remotely executes <mod>.<func>
using the argument list of remote objects and ignoring results.", args(0,4,
arg("conn",str),arg("mod",str),arg("func",str), vararg("",str))),
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
