Changeset: abfee225c0c1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=abfee225c0c1
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
monetdb5/modules/mal/remote.c
Branch: monetdbe-proxy
Log Message:
Fix MAL signatures.
diffs (69 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
@@ -9105,13 +9105,14 @@ stdout of test 'MAL-signatures` in direc
[ "remote", "batbincopy", "pattern remote.batbincopy(X_1:bat[:any]):void
", "RMTbincopyto;", "" ]
[ "remote", "batload", "pattern remote.batload(X_1:any_1,
X_2:int):bat[:any_1] ", "RMTbatload;", "" ]
[ "remote", "bintype", "pattern remote.bintype():void ",
"RMTbintype;", "" ]
-[ "remote", "connect", "command remote.connect(X_1:str, X_2:str,
X_3:str):str ", "RMTconnect;", "" ]
-[ "remote", "connect", "command remote.connect(X_1:str, X_2:str,
X_3:str, X_4:str):str ", "RMTconnectScen;", "" ]
+[ "remote", "connect", "command remote.connect(X_1:str, X_2:str,
X_3:str, X_4:str):str ", "RMTconnect;", "" ]
+[ "remote", "connect", "command remote.connect(X_1:str, X_2:str,
X_3:str, X_4:str, X_5:bit):str ", "RMTconnectScen;", "" ]
[ "remote", "connect", "pattern remote.connect(X_1:str, X_2:str):str
", "RMTconnectTable;", "" ]
[ "remote", "disconnect", "command remote.disconnect(X_1:str):void ",
"RMTdisconnect;", "" ]
[ "remote", "epilogue", "command remote.epilogue():void ",
"RMTepilogue;", "" ]
[ "remote", "exec", "pattern remote.exec(X_1:str, X_2:str, X_3:str):str ",
"RMTexec;", "" ]
[ "remote", "exec", "pattern remote.exec(X_1:str, X_2:str, X_3:str):str...
", "RMTexec;", "" ]
+[ "remote", "exec", "pattern remote.exec(X_1:str, X_2:str, X_3:str,
X_4:ptr, X_5:str...):void ", "RMTexec;", "" ]
[ "remote", "exec", "pattern remote.exec(X_1:str, X_2:str, X_3:str,
X_4:str...):str ", "RMTexec;", "" ]
[ "remote", "exec", "pattern remote.exec(X_1:str, X_2:str, X_3:str,
X_4:str...):str... ", "RMTexec;", "" ]
[ "remote", "get", "pattern remote.get(X_1:str, X_2:str):any ",
"RMTget;", "" ]
@@ -9299,6 +9300,7 @@ stdout of test 'MAL-signatures` in direc
[ "sql", "rt_credentials", "pattern sql.rt_credentials(X_3:str)
(X_0:bat[:str], X_1:bat[:str], X_2:bat[:str]) ", "sql_rt_credentials_wrap;",
"" ]
[ "sql", "sessions", "pattern sql.sessions() (X_0:bat[:int],
X_1:bat[:str], X_2:bat[:timestamp], X_3:bat[:timestamp], X_4:bat[:str],
X_5:bat[:int], X_6:bat[:int], X_7:bat[:int], X_8:bat[:int]) ",
"sql_sessions_wrap;", "" ]
[ "sql", "setVariable", "unsafe pattern sql.setVariable(X_1:int,
X_2:str, X_3:str, X_4:any_1):int ", "setVariable;", "" ]
+[ "sql", "set_protocol", "unsafe pattern sql.set_protocol(X_1:int):int
", "SQLset_protocol;", "" ]
[ "sql", "setmemorylimit", "unsafe pattern
sql.setmemorylimit(X_1:int):void ", "SQLsetmemorylimit;", "" ]
[ "sql", "setmemorylimit", "unsafe pattern
sql.setmemorylimit(X_1:sht, X_2:int):void ", "SQLsetmemorylimit;", ""
]
[ "sql", "setoptimizer", "unsafe pattern sql.setoptimizer(X_1:int,
X_2:str):void ", "SQLsetoptimizer;", "" ]
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
@@ -12446,13 +12446,14 @@ stdout of test 'MAL-signatures` in direc
[ "remote", "batbincopy", "pattern remote.batbincopy(X_1:bat[:any]):void
", "RMTbincopyto;", "" ]
[ "remote", "batload", "pattern remote.batload(X_1:any_1,
X_2:int):bat[:any_1] ", "RMTbatload;", "" ]
[ "remote", "bintype", "pattern remote.bintype():void ",
"RMTbintype;", "" ]
-[ "remote", "connect", "command remote.connect(X_1:str, X_2:str,
X_3:str):str ", "RMTconnect;", "" ]
-[ "remote", "connect", "command remote.connect(X_1:str, X_2:str,
X_3:str, X_4:str):str ", "RMTconnectScen;", "" ]
+[ "remote", "connect", "command remote.connect(X_1:str, X_2:str,
X_3:str, X_4:str):str ", "RMTconnect;", "" ]
+[ "remote", "connect", "command remote.connect(X_1:str, X_2:str,
X_3:str, X_4:str, X_5:bit):str ", "RMTconnectScen;", "" ]
[ "remote", "connect", "pattern remote.connect(X_1:str, X_2:str):str
", "RMTconnectTable;", "" ]
[ "remote", "disconnect", "command remote.disconnect(X_1:str):void ",
"RMTdisconnect;", "" ]
[ "remote", "epilogue", "command remote.epilogue():void ",
"RMTepilogue;", "" ]
[ "remote", "exec", "pattern remote.exec(X_1:str, X_2:str, X_3:str):str ",
"RMTexec;", "" ]
[ "remote", "exec", "pattern remote.exec(X_1:str, X_2:str, X_3:str):str...
", "RMTexec;", "" ]
+[ "remote", "exec", "pattern remote.exec(X_1:str, X_2:str, X_3:str,
X_4:ptr, X_5:str...):void ", "RMTexec;", "" ]
[ "remote", "exec", "pattern remote.exec(X_1:str, X_2:str, X_3:str,
X_4:str...):str ", "RMTexec;", "" ]
[ "remote", "exec", "pattern remote.exec(X_1:str, X_2:str, X_3:str,
X_4:str...):str... ", "RMTexec;", "" ]
[ "remote", "get", "pattern remote.get(X_1:str, X_2:str):any ",
"RMTget;", "" ]
@@ -12652,6 +12653,7 @@ stdout of test 'MAL-signatures` in direc
[ "sql", "rt_credentials", "pattern sql.rt_credentials(X_3:str)
(X_0:bat[:str], X_1:bat[:str], X_2:bat[:str]) ", "sql_rt_credentials_wrap;",
"" ]
[ "sql", "sessions", "pattern sql.sessions() (X_0:bat[:int],
X_1:bat[:str], X_2:bat[:timestamp], X_3:bat[:timestamp], X_4:bat[:str],
X_5:bat[:int], X_6:bat[:int], X_7:bat[:int], X_8:bat[:int]) ",
"sql_sessions_wrap;", "" ]
[ "sql", "setVariable", "unsafe pattern sql.setVariable(X_1:int,
X_2:str, X_3:str, X_4:any_1):int ", "setVariable;", "" ]
+[ "sql", "set_protocol", "unsafe pattern sql.set_protocol(X_1:int):int
", "SQLset_protocol;", "" ]
[ "sql", "setmemorylimit", "unsafe pattern
sql.setmemorylimit(X_1:int):void ", "SQLsetmemorylimit;", "" ]
[ "sql", "setmemorylimit", "unsafe pattern
sql.setmemorylimit(X_1:sht, X_2:int):void ", "SQLsetmemorylimit;", ""
]
[ "sql", "setoptimizer", "unsafe pattern sql.setoptimizer(X_1:int,
X_2:str):void ", "SQLsetoptimizer;", "" ]
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
@@ -1620,8 +1620,7 @@ mel_func remote_init_funcs[] = {
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 using and applying function pointer
rcb as result handling callback.", args(1,6,
vararg("",str),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 using and applying function pointer
rcb as result handling callback.", 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 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))),
command("remote", "isalive", RMTisalive, false, "check if conn is still valid
and connected", args(1,2, arg("",int),arg("conn",str))),
pattern("remote", "batload", RMTbatload, false, "create a BAT of the given
type and size, and load values from the input stream", args(1,3,
batargany("",1),argany("tt",1),arg("size",int))),
pattern("remote", "batbincopy", RMTbincopyto, false, "dump BAT b in binary
form to the stream", args(1,2, arg("",void),batargany("b",0))),
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
