Changeset: 9bd9f8a868a0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9bd9f8a868a0
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
monetdb5/modules/atoms/str.c
tools/monetdbe/monetdbe.c
Branch: default
Log Message:
Merged with Oct2020
diffs (129 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
@@ -9442,9 +9442,9 @@ stdout of test 'MAL-signatures` in direc
[ "status", "vm_cursize", "command status.vm_cursize():lng ",
"SYSgetvm_cursize;", "" ]
[ "status", "vm_maxsize", "command status.vm_maxsize():lng ",
"SYSgetvm_maxsize;", "" ]
[ "status", "vm_maxsize", "command status.vm_maxsize(X_1:lng):void ",
"SYSsetvm_maxsize;", "" ]
-[ "str", "STRepilogue", "command str.STRepilogue():void ",
"strEpilogue;", "" ]
[ "str", "ascii", "command str.ascii(X_1:str):int ",
"STRascii;", "" ]
[ "str", "endsWith", "command str.endsWith(X_1:str, X_2:str):bit ",
"STRSuffix;", "" ]
+[ "str", "epilogue", "command str.epilogue():void ", "STRepilogue;",
"" ]
[ "str", "insert", "command str.insert(X_1:str, X_2:int, X_3:int,
X_4:str):str ", "STRinsert;", "" ]
[ "str", "length", "command str.length(X_1:str):int ",
"STRLength;", "" ]
[ "str", "like", "command str.like(X_1:str, X_2:str):bit ",
"STRlikewrap2;", "" ]
@@ -9457,7 +9457,7 @@ stdout of test 'MAL-signatures` in direc
[ "str", "ltrim", "command str.ltrim(X_1:str):str ",
"STRLtrim;", "" ]
[ "str", "nbytes", "command str.nbytes(X_1:str):int ",
"STRBytes;", "" ]
[ "str", "prefix", "command str.prefix(X_1:str, X_2:int):str ",
"STRprefix;", "" ]
-[ "str", "prelude", "command str.prelude():void ", "strPrelude;",
"" ]
+[ "str", "prelude", "command str.prelude():void ", "STRprelude;",
"" ]
[ "str", "r_search", "command str.r_search(X_1:str, X_2:str):int ",
"STRReverseStrSearch;", "" ]
[ "str", "repeat", "command str.repeat(X_1:str, X_2:int):str ",
"STRrepeat;", "" ]
[ "str", "replace", "command str.replace(X_1:str, X_2:str, X_3:str,
X_4:str):str ", "PCREreplace_wrap;", "" ]
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
@@ -12806,9 +12806,9 @@ stdout of test 'MAL-signatures` in direc
[ "status", "vm_cursize", "command status.vm_cursize():lng ",
"SYSgetvm_cursize;", "" ]
[ "status", "vm_maxsize", "command status.vm_maxsize():lng ",
"SYSgetvm_maxsize;", "" ]
[ "status", "vm_maxsize", "command status.vm_maxsize(X_1:lng):void ",
"SYSsetvm_maxsize;", "" ]
-[ "str", "STRepilogue", "command str.STRepilogue():void ",
"strEpilogue;", "" ]
[ "str", "ascii", "command str.ascii(X_1:str):int ",
"STRascii;", "" ]
[ "str", "endsWith", "command str.endsWith(X_1:str, X_2:str):bit ",
"STRSuffix;", "" ]
+[ "str", "epilogue", "command str.epilogue():void ", "STRepilogue;",
"" ]
[ "str", "insert", "command str.insert(X_1:str, X_2:int, X_3:int,
X_4:str):str ", "STRinsert;", "" ]
[ "str", "length", "command str.length(X_1:str):int ",
"STRLength;", "" ]
[ "str", "like", "command str.like(X_1:str, X_2:str):bit ",
"STRlikewrap2;", "" ]
@@ -12821,7 +12821,7 @@ stdout of test 'MAL-signatures` in direc
[ "str", "ltrim", "command str.ltrim(X_1:str):str ",
"STRLtrim;", "" ]
[ "str", "nbytes", "command str.nbytes(X_1:str):int ",
"STRBytes;", "" ]
[ "str", "prefix", "command str.prefix(X_1:str, X_2:int):str ",
"STRprefix;", "" ]
-[ "str", "prelude", "command str.prelude():void ", "strPrelude;",
"" ]
+[ "str", "prelude", "command str.prelude():void ", "STRprelude;",
"" ]
[ "str", "r_search", "command str.r_search(X_1:str, X_2:str):int ",
"STRReverseStrSearch;", "" ]
[ "str", "repeat", "command str.repeat(X_1:str, X_2:int):str ",
"STRrepeat;", "" ]
[ "str", "replace", "command str.replace(X_1:str, X_2:str, X_3:str,
X_4:str):str ", "PCREreplace_wrap;", "" ]
diff --git a/clients/odbc/driver/CMakeLists.txt
b/clients/odbc/driver/CMakeLists.txt
--- a/clients/odbc/driver/CMakeLists.txt
+++ b/clients/odbc/driver/CMakeLists.txt
@@ -120,7 +120,8 @@ target_link_libraries(MonetODBC
PRIVATE
monetdb_config_header
mutils
- mapi)
+ mapi
+ ODBC::ODBC)
install(TARGETS
MonetODBC
diff --git a/monetdb5/modules/atoms/str.c b/monetdb5/modules/atoms/str.c
--- a/monetdb5/modules/atoms/str.c
+++ b/monetdb5/modules/atoms/str.c
@@ -2936,7 +2936,7 @@ UTF8_assert(const char *s)
#endif
static str
-strPrelude(void *ret)
+STRprelude(void *ret)
{
(void) ret;
if (UTF8_toUpperFrom == NULL) {
@@ -2985,7 +2985,7 @@ strPrelude(void *ret)
}
static str
-strEpilogue(void *ret)
+STRepilogue(void *ret)
{
(void) ret;
if (UTF8_toUpperFrom)
@@ -4270,8 +4270,8 @@ mel_func str_init_funcs[] = {
command("str", "replace", STRreplace, false, "Insert a string into another",
args(1,4, arg("",str),arg("s",str),arg("pat",str),arg("s2",str))),
command("str", "repeat", STRrepeat, false, "", args(1,3,
arg("",str),arg("s2",str),arg("c",int))),
command("str", "space", STRspace, false, "", args(1,2,
arg("",str),arg("l",int))),
- command("str", "prelude", strPrelude, false, "", args(1,1, arg("",void))),
- command("str", "STRepilogue", strEpilogue, false, "", args(1,1,
arg("",void))),
+ command("str", "prelude", STRprelude, false, "", args(1,1, arg("",void))),
+ command("str", "epilogue", STRepilogue, false, "", args(1,1, arg("",void))),
{ .imp=NULL }
};
#include "mal_import.h"
diff --git a/monetdb5/modules/atoms/str.mal b/monetdb5/modules/atoms/str.mal
--- a/monetdb5/modules/atoms/str.mal
+++ b/monetdb5/modules/atoms/str.mal
@@ -162,7 +162,7 @@ command space(l:int):str
address STRspace;
command prelude() :void
-address strPrelude;
+address STRprelude;
-command STRepilogue() :void
-address strEpilogue;
+command epilogue() :void
+address STRepilogue;
diff --git a/tools/monetdbe/monetdbe.c b/tools/monetdbe/monetdbe.c
--- a/tools/monetdbe/monetdbe.c
+++ b/tools/monetdbe/monetdbe.c
@@ -517,7 +517,7 @@ monetdbe_startup(monetdbe_database_inter
workers = GDKnr_threads = opts->nr_threads;
}
if (opts && opts->memorylimit) {
- if( opts->nr_threads < 0){
+ if( opts->memorylimit < 0){
mdbe->msg = createException(MAL,
"monetdbe.monetdbe_startup", "Memorylimit should be positive");
goto cleanup;
}
diff --git a/tools/monetdbe/monetdbe.h b/tools/monetdbe/monetdbe.h
--- a/tools/monetdbe/monetdbe.h
+++ b/tools/monetdbe/monetdbe.h
@@ -93,7 +93,7 @@ typedef struct {
int memorylimit; // top off the amount of RAM to be used, in MB
int querytimeout; // graceful terminate query after a few seconds
int sessiontimeout; // graceful terminate the session after a few
seconds
- int nr_threads; // maximum number of worker
treads, limits level of parallalism
+ int nr_threads; // maximum number of worker treads, limits level of
parallelism
} monetdbe_options;
#define DEFAULT_STRUCT_DEFINITION(ctype, typename) \
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
