Changeset: 6e820766e6d0 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6e820766e6d0 Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out Branch: alloc-less-str Log Message:
Approved output diffs (152 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 @@ -6462,6 +6462,7 @@ stdout of test 'MAL-signatures` in direc [ "batstr", "locate", "command batstr.locate(X_1:bat[:str], X_2:bat[:str], X_3:bat[:int]):bat[:int] ", "STRbatstrLocate2;", "" ] [ "batstr", "locate", "command batstr.locate(X_1:bat[:str], X_2:str, X_3:int):bat[:int] ", "STRbatstrLocate2cst;", "" ] [ "batstr", "locate", "command batstr.locate(X_1:bat[:str], X_2:bat[:str]):bat[:int] ", "STRbatstrLocate;", "" ] +[ "batstr", "locate", "command batstr.locate(X_1:str, X_2:bat[:str]):bat[:int] ", "STRbatstrLocate_strcst;", "" ] [ "batstr", "locate", "command batstr.locate(X_1:bat[:str], X_2:str):bat[:int] ", "STRbatstrLocatecst;", "" ] [ "batstr", "lpad", "command batstr.lpad(X_1:bat[:str], X_2:bat[:int], X_3:bat[:str]):bat[:str] ", "STRbatLpad2_bat_bat;", "" ] [ "batstr", "lpad", "command batstr.lpad(X_1:bat[:str], X_2:bat[:int], X_3:str):bat[:str] ", "STRbatLpad2_bat_const;", "" ] @@ -6476,6 +6477,7 @@ stdout of test 'MAL-signatures` in direc [ "batstr", "r_search", "command batstr.r_search(X_1:bat[:str], X_2:bat[:str]):bat[:int] ", "STRbatRstrSearch;", "" ] [ "batstr", "r_search", "command batstr.r_search(X_1:bat[:str], X_2:str):bat[:int] ", "STRbatRstrSearchcst;", "" ] [ "batstr", "repeat", "command batstr.repeat(X_1:bat[:str], X_2:bat[:int]):bat[:str] ", "STRbatrepeat;", "" ] +[ "batstr", "repeat", "command batstr.repeat(X_1:str, X_2:bat[:int]):bat[:str] ", "STRbatrepeat_strcst;", "" ] [ "batstr", "repeat", "command batstr.repeat(X_1:bat[:str], X_2:int):bat[:str] ", "STRbatrepeatcst;", "" ] [ "batstr", "replace", "command batstr.replace(X_1:bat[:str], X_2:bat[:str], X_3:bat[:str]):bat[:str] ", "STRbatReplace;", "" ] [ "batstr", "replace", "command batstr.replace(X_1:bat[:str], X_2:str, X_3:str):bat[:str] ", "STRbatReplacecst;", "" ] @@ -6496,17 +6498,23 @@ stdout of test 'MAL-signatures` in direc [ "batstr", "startsWith", "command batstr.startsWith(X_1:bat[:str], X_2:bat[:str]):bat[:bit] ", "STRbatPrefix;", "" ] [ "batstr", "startsWith", "command batstr.startsWith(X_1:bat[:str], X_2:str):bat[:bit] ", "STRbatPrefixcst;", "" ] [ "batstr", "string", "command batstr.string(X_1:bat[:str], X_2:bat[:int]):bat[:str] ", "STRbatTail;", "" ] +[ "batstr", "string", "command batstr.string(X_1:str, X_2:bat[:int]):bat[:str] ", "STRbatTail_strcst;", "" ] [ "batstr", "string", "command batstr.string(X_1:bat[:str], X_2:int):bat[:str] ", "STRbatTailcst;", "" ] [ "batstr", "stringleft", "command batstr.stringleft(X_1:bat[:str], X_2:bat[:int]):bat[:str] ", "STRbatprefix;", "" ] +[ "batstr", "stringleft", "command batstr.stringleft(X_1:str, X_2:bat[:int]):bat[:str] ", "STRbatprefix_strcst;", "" ] [ "batstr", "stringleft", "command batstr.stringleft(X_1:bat[:str], X_2:int):bat[:str] ", "STRbatprefixcst;", "" ] [ "batstr", "stringright", "command batstr.stringright(X_1:bat[:str], X_2:bat[:int]):bat[:str] ", "STRbatsuffix;", "" ] +[ "batstr", "stringright", "command batstr.stringright(X_1:str, X_2:bat[:int]):bat[:str] ", "STRbatsuffix_strcst;", "" ] [ "batstr", "stringright", "command batstr.stringright(X_1:bat[:str], X_2:int):bat[:str] ", "STRbatsuffixcst;", "" ] [ "batstr", "substitute", "command batstr.substitute(X_1:bat[:str], X_2:bat[:str], X_3:bat[:str], X_4:bat[:bit]):bat[:str] ", "STRbatSubstitute;", "" ] [ "batstr", "substitute", "command batstr.substitute(X_1:bat[:str], X_2:str, X_3:str, X_4:bit):bat[:str] ", "STRbatSubstitutecst;", "" ] [ "batstr", "substring", "command batstr.substring(X_1:bat[:str], X_2:bat[:int], X_3:bat[:int]):bat[:str] ", "STRbatsubstring;", "" ] [ "batstr", "substring", "command batstr.substring(X_1:bat[:str], X_2:bat[:int]):bat[:str] ", "STRbatsubstringTail;", "" ] +[ "batstr", "substring", "command batstr.substring(X_1:str, X_2:bat[:int]):bat[:str] ", "STRbatsubstringTail_strcst;", "" ] [ "batstr", "substring", "command batstr.substring(X_1:bat[:str], X_2:int):bat[:str] ", "STRbatsubstringTailcst;", "" ] [ "batstr", "substring", "command batstr.substring(X_1:bat[:str], X_2:int, X_3:int):bat[:str] ", "STRbatsubstringcst;", "" ] +[ "batstr", "substring", "command batstr.substring(X_1:bat[:str], X_2:bat[:int], X_3:int):bat[:str] ", "STRbatsubstringcst_indexcst;", "" ] +[ "batstr", "substring", "command batstr.substring(X_1:bat[:str], X_2:int, X_3:bat[:int]):bat[:str] ", "STRbatsubstringcst_startcst;", "" ] [ "batstr", "toLower", "command batstr.toLower(X_1:bat[:str]):bat[:str] ", "STRbatLower;", "" ] [ "batstr", "toUpper", "command batstr.toUpper(X_1:bat[:str]):bat[:str] ", "STRbatUpper;", "" ] [ "batstr", "trim", "command batstr.trim(X_1:bat[:str], X_2:bat[:str]):bat[:str] ", "STRbatStrip2_bat;", "" ] @@ -8234,8 +8242,6 @@ stdout of test 'MAL-signatures` in direc [ "calc", "sub_noerror", "pattern calc.sub_noerror(X_1:sht, X_2:int):int ", "CMDvarSUB;", "" ] [ "calc", "sub_noerror", "pattern calc.sub_noerror(X_1:sht, X_2:lng):lng ", "CMDvarSUB;", "" ] [ "calc", "sub_noerror", "pattern calc.sub_noerror(X_1:sht, X_2:sht):sht ", "CMDvarSUB;", "" ] -[ "calc", "substring", "command calc.substring(X_1:str, X_2:int, X_3:int):str ", "STRsubstring;", "" ] -[ "calc", "substring", "command calc.substring(X_1:str, X_2:int):str ", "STRsubstringTail;", "" ] [ "calc", "timestamp", "command calc.timestamp(X_1:date):timestamp ", "MTIMEtimestamp_fromdate;", "" ] [ "calc", "timestamp", "command calc.timestamp(X_1:lng):timestamp ", "MTIMEtimestamp_frommsec;", "" ] [ "calc", "timestamp", "command calc.timestamp(X_1:int):timestamp ", "MTIMEtimestamp_fromsecond;", "" ] 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 @@ -9062,6 +9062,7 @@ stdout of test 'MAL-signatures` in direc [ "batstr", "locate", "command batstr.locate(X_1:bat[:str], X_2:bat[:str], X_3:bat[:int]):bat[:int] ", "STRbatstrLocate2;", "" ] [ "batstr", "locate", "command batstr.locate(X_1:bat[:str], X_2:str, X_3:int):bat[:int] ", "STRbatstrLocate2cst;", "" ] [ "batstr", "locate", "command batstr.locate(X_1:bat[:str], X_2:bat[:str]):bat[:int] ", "STRbatstrLocate;", "" ] +[ "batstr", "locate", "command batstr.locate(X_1:str, X_2:bat[:str]):bat[:int] ", "STRbatstrLocate_strcst;", "" ] [ "batstr", "locate", "command batstr.locate(X_1:bat[:str], X_2:str):bat[:int] ", "STRbatstrLocatecst;", "" ] [ "batstr", "lpad", "command batstr.lpad(X_1:bat[:str], X_2:bat[:int], X_3:bat[:str]):bat[:str] ", "STRbatLpad2_bat_bat;", "" ] [ "batstr", "lpad", "command batstr.lpad(X_1:bat[:str], X_2:bat[:int], X_3:str):bat[:str] ", "STRbatLpad2_bat_const;", "" ] @@ -9076,6 +9077,7 @@ stdout of test 'MAL-signatures` in direc [ "batstr", "r_search", "command batstr.r_search(X_1:bat[:str], X_2:bat[:str]):bat[:int] ", "STRbatRstrSearch;", "" ] [ "batstr", "r_search", "command batstr.r_search(X_1:bat[:str], X_2:str):bat[:int] ", "STRbatRstrSearchcst;", "" ] [ "batstr", "repeat", "command batstr.repeat(X_1:bat[:str], X_2:bat[:int]):bat[:str] ", "STRbatrepeat;", "" ] +[ "batstr", "repeat", "command batstr.repeat(X_1:str, X_2:bat[:int]):bat[:str] ", "STRbatrepeat_strcst;", "" ] [ "batstr", "repeat", "command batstr.repeat(X_1:bat[:str], X_2:int):bat[:str] ", "STRbatrepeatcst;", "" ] [ "batstr", "replace", "command batstr.replace(X_1:bat[:str], X_2:bat[:str], X_3:bat[:str]):bat[:str] ", "STRbatReplace;", "" ] [ "batstr", "replace", "command batstr.replace(X_1:bat[:str], X_2:str, X_3:str):bat[:str] ", "STRbatReplacecst;", "" ] @@ -9096,17 +9098,23 @@ stdout of test 'MAL-signatures` in direc [ "batstr", "startsWith", "command batstr.startsWith(X_1:bat[:str], X_2:bat[:str]):bat[:bit] ", "STRbatPrefix;", "" ] [ "batstr", "startsWith", "command batstr.startsWith(X_1:bat[:str], X_2:str):bat[:bit] ", "STRbatPrefixcst;", "" ] [ "batstr", "string", "command batstr.string(X_1:bat[:str], X_2:bat[:int]):bat[:str] ", "STRbatTail;", "" ] +[ "batstr", "string", "command batstr.string(X_1:str, X_2:bat[:int]):bat[:str] ", "STRbatTail_strcst;", "" ] [ "batstr", "string", "command batstr.string(X_1:bat[:str], X_2:int):bat[:str] ", "STRbatTailcst;", "" ] [ "batstr", "stringleft", "command batstr.stringleft(X_1:bat[:str], X_2:bat[:int]):bat[:str] ", "STRbatprefix;", "" ] +[ "batstr", "stringleft", "command batstr.stringleft(X_1:str, X_2:bat[:int]):bat[:str] ", "STRbatprefix_strcst;", "" ] [ "batstr", "stringleft", "command batstr.stringleft(X_1:bat[:str], X_2:int):bat[:str] ", "STRbatprefixcst;", "" ] [ "batstr", "stringright", "command batstr.stringright(X_1:bat[:str], X_2:bat[:int]):bat[:str] ", "STRbatsuffix;", "" ] +[ "batstr", "stringright", "command batstr.stringright(X_1:str, X_2:bat[:int]):bat[:str] ", "STRbatsuffix_strcst;", "" ] [ "batstr", "stringright", "command batstr.stringright(X_1:bat[:str], X_2:int):bat[:str] ", "STRbatsuffixcst;", "" ] [ "batstr", "substitute", "command batstr.substitute(X_1:bat[:str], X_2:bat[:str], X_3:bat[:str], X_4:bat[:bit]):bat[:str] ", "STRbatSubstitute;", "" ] [ "batstr", "substitute", "command batstr.substitute(X_1:bat[:str], X_2:str, X_3:str, X_4:bit):bat[:str] ", "STRbatSubstitutecst;", "" ] [ "batstr", "substring", "command batstr.substring(X_1:bat[:str], X_2:bat[:int], X_3:bat[:int]):bat[:str] ", "STRbatsubstring;", "" ] [ "batstr", "substring", "command batstr.substring(X_1:bat[:str], X_2:bat[:int]):bat[:str] ", "STRbatsubstringTail;", "" ] +[ "batstr", "substring", "command batstr.substring(X_1:str, X_2:bat[:int]):bat[:str] ", "STRbatsubstringTail_strcst;", "" ] [ "batstr", "substring", "command batstr.substring(X_1:bat[:str], X_2:int):bat[:str] ", "STRbatsubstringTailcst;", "" ] [ "batstr", "substring", "command batstr.substring(X_1:bat[:str], X_2:int, X_3:int):bat[:str] ", "STRbatsubstringcst;", "" ] +[ "batstr", "substring", "command batstr.substring(X_1:bat[:str], X_2:bat[:int], X_3:int):bat[:str] ", "STRbatsubstringcst_indexcst;", "" ] +[ "batstr", "substring", "command batstr.substring(X_1:bat[:str], X_2:int, X_3:bat[:int]):bat[:str] ", "STRbatsubstringcst_startcst;", "" ] [ "batstr", "toLower", "command batstr.toLower(X_1:bat[:str]):bat[:str] ", "STRbatLower;", "" ] [ "batstr", "toUpper", "command batstr.toUpper(X_1:bat[:str]):bat[:str] ", "STRbatUpper;", "" ] [ "batstr", "trim", "command batstr.trim(X_1:bat[:str], X_2:bat[:str]):bat[:str] ", "STRbatStrip2_bat;", "" ] @@ -11557,8 +11565,6 @@ stdout of test 'MAL-signatures` in direc [ "calc", "sub_noerror", "pattern calc.sub_noerror(X_1:sht, X_2:int):int ", "CMDvarSUB;", "" ] [ "calc", "sub_noerror", "pattern calc.sub_noerror(X_1:sht, X_2:lng):lng ", "CMDvarSUB;", "" ] [ "calc", "sub_noerror", "pattern calc.sub_noerror(X_1:sht, X_2:sht):sht ", "CMDvarSUB;", "" ] -[ "calc", "substring", "command calc.substring(X_1:str, X_2:int, X_3:int):str ", "STRsubstring;", "" ] -[ "calc", "substring", "command calc.substring(X_1:str, X_2:int):str ", "STRsubstringTail;", "" ] [ "calc", "timestamp", "command calc.timestamp(X_1:date):timestamp ", "MTIMEtimestamp_fromdate;", "" ] [ "calc", "timestamp", "command calc.timestamp(X_1:lng):timestamp ", "MTIMEtimestamp_frommsec;", "" ] [ "calc", "timestamp", "command calc.timestamp(X_1:int):timestamp ", "MTIMEtimestamp_fromsecond;", "" ] diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out --- a/clients/Tests/exports.stable.out +++ b/clients/Tests/exports.stable.out @@ -1000,44 +1000,6 @@ str SERVERstop(void *ret); str SERVERsuspend(void *ret); str SERVERtrace(void *ret, int *mid, int *flag); BUN SQLload_file(Client cntxt, Tablet *as, bstream *b, stream *out, const char *csep, const char *rsep, char quote, lng skip, lng maxrow, int best, bool from_stdin, const char *tabnam, bool escape); -str STRBytes(int *res, const str *arg1); -str STRFromWChr(str *res, const int *at); -str STRLength(int *res, const str *arg1); -str STRLower(str *res, const str *arg1); -str STRLpad(str *res, const str *arg1, const int *len); -str STRLpad2(str *res, const str *arg1, const int *len, const str *arg2); -str STRLtrim(str *res, const str *arg1); -str STRLtrim2(str *res, const str *arg1, const str *arg2); -str STRPrefix(bit *res, const str *arg1, const str *arg2); -str STRReverseStrSearch(int *res, const str *arg1, const str *arg2); -str STRRpad(str *res, const str *arg1, const int *len); -str STRRpad2(str *res, const str *arg1, const int *len, const str *arg2); -str STRRtrim(str *res, const str *arg1); -str STRRtrim2(str *res, const str *arg1, const str *arg2); -str STRStrip(str *res, const str *arg1); -str STRStrip2(str *res, const str *arg1, const str *arg2); -str STRSubString(str *res, const str *arg1, const int *offset, const int *length); -str STRSubstitute(str *res, const str *arg1, const str *arg2, const str *arg3, const bit *g); -str STRSuffix(bit *res, const str *arg1, const str *arg2); -str STRTail(str *res, const str *arg1, const int *offset); -str STRUpper(str *res, const str *arg1); -str STRWChrAt(int *res, const str *arg1, const int *at); -str STRascii(int *ret, const str *s); -str STRinsert(str *ret, const str *s, const int *start, const int *l, const str *s2); -str STRlikewrap(bit *ret, const str *s, const str *pat, const str *esc); -str STRlikewrap2(bit *ret, const str *s, const str *pat); -str STRlocate(int *ret, const str *s1, const str *s2); -str STRlocate2(int *ret, const str *s1, const str *s2, const int *start); -str STRprefix(str *ret, const str *s, const int *l); -str STRrepeat(str *ret, const str *s, const int *c); -str STRreplace(str *ret, const str *s1, const str *s2, const str *s3); -str STRspace(str *ret, const int *l); -str STRsplitpart(str *res, str *haystack, str *needle, int *field); -str STRstrSearch(int *res, const str *arg1, const str *arg2); -str STRsubstring(str *ret, const str *s, const int *start, const int *l); -str STRsubstringTail(str *ret, const str *s, const int *start); -str STRsuffix(str *ret, const str *s, const int *l); -str STRtostr(str *res, const str *src); str SYScpuStatistics(bat *ret, bat *ret2); str SYSgdkEnv(bat *ret, bat *ret2); str SYSgdkThread(bat *ret, bat *ret2); _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
