Changeset: 470f73264227 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=470f73264227 Modified Files: clients/Tests/MAL-signatures_gsl.stable.out clients/Tests/exports.stable.out Branch: default Log Message:
Approved some stable.out because of the new string functions diffs (208 lines): diff --git a/clients/Tests/MAL-signatures_gsl.stable.out b/clients/Tests/MAL-signatures_gsl.stable.out --- a/clients/Tests/MAL-signatures_gsl.stable.out +++ b/clients/Tests/MAL-signatures_gsl.stable.out @@ -3029,6 +3029,38 @@ command batstr.like(s:bat[:oid,:str],pat address BATPCRElike2; command batstr.like(s:bat[:oid,:str],pat:str,esc:str):bat[:oid,:bit] address BATPCRElike; +command batstr.lpad(s:bat[:oid,:str],n:bat[:oid,:int],s2:bat[:oid,:str]):bat[:oid,:str] +address STRbatLpad2_bat_bat; +comment Prepend the second strings to the first strings to reach the given lengths. Truncate the first strings on the right if their lengths is larger than the given lengths. + +command batstr.lpad(s:bat[:oid,:str],n:int,s2:bat[:oid,:str]):bat[:oid,:str] +address STRbatLpad2_const_bat; +comment Prepend the second strings to the first strings to reach the given length. Truncate the first strings on the right if their lengths is larger than the given length. + +command batstr.lpad(s:bat[:oid,:str],n:bat[:oid,:int],s2:str):bat[:oid,:str] +address STRbatLpad2_bat_const; +comment Prepend the second string to the first strings to reach the given lengths. Truncate the first strings on the right if their lengths is larger than the given lengths. + +command batstr.lpad(s:bat[:oid,:str],n:int,s2:str):bat[:oid,:str] +address STRbatLpad2_const_const; +comment Prepend the second string to the first strings to reach the given length. Truncate the first strings on the right if their lengths is larger than the given length. + +command batstr.lpad(s:bat[:oid,:str],n:bat[:oid,:int]):bat[:oid,:str] +address STRbatLpad_bat; +comment Prepend whitespaces to the strings to reach the given lengths. Truncate the strings on the right if their lengths is larger than the given lengths. + +command batstr.lpad(s:bat[:oid,:str],n:int):bat[:oid,:str] +address STRbatLpad_const; +comment Prepend whitespaces to the strings to reach the given length. Truncate the strings on the right if their lengths is larger than the given length. + +command batstr.ltrim(s:bat[:oid,:str],s2:bat[:oid,:str]):bat[:oid,:str] +address STRbatLtrim2_bat; +comment Strip characters in the second strings from start of the first strings. + +command batstr.ltrim(s:bat[:oid,:str],s2:str):bat[:oid,:str] +address STRbatLtrim2_const; +comment Strip characters in the second string from start of the first strings. + command batstr.ltrim(s:bat[:oid,:str]):bat[:oid,:str] address STRbatLtrim; comment Strip whitespaces from start of a string. @@ -3057,6 +3089,38 @@ command batstr.r_search(s:bat[:oid,:str] address STRbatRstrSearch; comment Reverse search for a substring. Returns position, -1 if not found. +command batstr.rpad(s:bat[:oid,:str],n:bat[:oid,:int],s2:bat[:oid,:str]):bat[:oid,:str] +address STRbatRpad2_bat_bat; +comment Append the second strings to the first strings to reach the given lengths. Truncate the first strings on the right if their lengths is larger than the given lengths. + +command batstr.rpad(s:bat[:oid,:str],n:int,s2:bat[:oid,:str]):bat[:oid,:str] +address STRbatRpad2_const_bat; +comment Append the second strings to the first strings to reach the given length. Truncate the first strings on the right if their lengths is larger than the given length. + +command batstr.rpad(s:bat[:oid,:str],n:bat[:oid,:int],s2:str):bat[:oid,:str] +address STRbatRpad2_bat_const; +comment Append the second string to the first strings to reach the given lengths. Truncate the first strings on the right if their lengths is larger than the given lengths. + +command batstr.rpad(s:bat[:oid,:str],n:int,s2:str):bat[:oid,:str] +address STRbatRpad2_const_const; +comment Append the second string to the first strings to reach the given length. Truncate the first strings on the right if their lengths is larger than the given length. + +command batstr.rpad(s:bat[:oid,:str],n:bat[:oid,:int]):bat[:oid,:str] +address STRbatRpad_bat; +comment Append whitespaces to the strings to reach the given lengths. Truncate the strings on the right if their lengths is larger than the given lengths. + +command batstr.rpad(s:bat[:oid,:str],n:int):bat[:oid,:str] +address STRbatRpad_const; +comment Append whitespaces to the strings to reach the given length. Truncate the strings on the right if their lengths is larger than the given length. + +command batstr.rtrim(s:bat[:oid,:str],s2:bat[:oid,:str]):bat[:oid,:str] +address STRbatRtrim2_bat; +comment Strip characters in the second strings from end of the first strings. + +command batstr.rtrim(s:bat[:oid,:str],s2:str):bat[:oid,:str] +address STRbatRtrim2_const; +comment Strip characters in the second string from end of the first strings. + command batstr.rtrim(s:bat[:oid,:str]):bat[:oid,:str] address STRbatRtrim; comment Strip whitespaces from end of a string. @@ -3101,6 +3165,14 @@ command batstr.stringlength(s:bat[:oid,: address STRbatstringLength; comment Return the length of a right trimed string. +command batstr.trim(s:bat[:oid,:str],s2:bat[:oid,:str]):bat[:oid,:str] +address STRbatStrip2_bat; +comment Strip characters in the second strings around the first strings. + +command batstr.trim(s:bat[:oid,:str],s2:str):bat[:oid,:str] +address STRbatStrip2_const; +comment Strip characters in the second string around the first strings. + command batstr.trim(s:bat[:oid,:str]):bat[:oid,:str] address STRbatStrip; comment Strip whitespaces around a string. @@ -42131,6 +42203,18 @@ command str.like(s:str,pat:str):bit address STRlikewrap2; comment SQL pattern match function +command str.lpad(s:str,len:int,s2:str):str +address STRLpad2; +comment Fill up the first string to the given length prepending characters of the second string. + +command str.lpad(s:str,len:int):str +address STRLpad; +comment Fill up a string to the given length prepending the whitespace character. + +command str.ltrim(s:str,s2:str):str +address STRLtrim2; +comment Remove the longest string containing only characters from the second string from the start of the first string. + command str.ltrim(s:str):str address STRLtrim; comment Strip whitespaces from start of a string. @@ -42163,6 +42247,18 @@ command str.replace(s:str,pat:str,s2:str address STRreplace; comment Insert a string into another +command str.rpad(s:str,len:int,s2:str):str +address STRRpad2; +comment Fill up the first string to the given length appending characters of the second string. + +command str.rpad(s:str,len:int):str +address STRRpad; +comment Fill up a string to the given length appending the whitespace character. + +command str.rtrim(s:str,s2:str):str +address STRRtrim2; +comment Remove the longest string containing only characters from the second string from the end of the first string. + command str.rtrim(s:str):str address STRRtrim; comment Strip whitespaces from end of a string. @@ -42217,6 +42313,10 @@ command str.str(s:str):str address STRtostr; comment Noop routine. +command str.trim(s:str,s2:str):str +address STRStrip2; +comment Remove the longest string containing only characters from the second string around the first string. + command str.trim(s:str):str address STRStrip; comment Strip whitespaces around a string. 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 @@ -279,6 +279,7 @@ void *GDKrealloc(void *pold, size_t size void GDKsetenv(str name, str value); ssize_t GDKstrFromStr(unsigned char *dst, const unsigned char *src, ssize_t len); str GDKstrdup(const char *s); +str GDKstrndup(const char *s, size_t n); int GDKsyserror(_In_z_ _Printf_format_string_ const char *format, ...) __attribute__((__format__(__printf__, 1, 2))); ThreadRec GDKthreads[THREADS]; int GDKupgradevarheap(COLrec *c, var_t v, int copyall, int mayshare); @@ -2051,12 +2052,19 @@ str STRFromWChr(str *res, int *at); str STRIconv(str *res, str *o, str *fp, str *tp); str STRLength(int *res, str *arg1); str STRLower(str *res, str *arg1); +str STRLpad(str *res, str *arg1, size_t *len); +str STRLpad2(str *res, str *arg1, size_t *len, str *arg2); str STRLtrim(str *res, str *arg1); +str STRLtrim2(str *res, str *arg1, str *arg2); str STRPrefix(bit *res, str *arg1, str *arg2); str STRReverseStrSearch(int *res, str *arg1, str *arg2); +str STRRpad(str *res, str *arg1, size_t *len); +str STRRpad2(str *res, str *arg1, size_t *len, str *arg2); str STRRtrim(str *res, str *arg1); +str STRRtrim2(str *res, str *arg1, str *arg2); str STRSQLLength(int *res, str *s); str STRStrip(str *res, str *arg1); +str STRStrip2(str *res, str *arg1, str *arg2); str STRSubString(str *res, str *arg1, int *offset, int *length); str STRSubstitute(str *res, str *arg1, str *arg2, str *arg3, bit *g); str STRSuffix(bit *res, str *arg1, str *arg2); @@ -2067,13 +2075,31 @@ str STRascii(int *ret, str *s); str STRbatBytes(bat *ret, bat *l); str STRbatLength(bat *ret, bat *l); str STRbatLower(bat *ret, bat *l); +str STRbatLpad2_bat_bat(bat *ret, bat *l, bat *n, bat *l2); +str STRbatLpad2_bat_const(bat *ret, bat *l, bat *n, str *s2); +str STRbatLpad2_const_bat(bat *ret, bat *l, size_t *n, bat *l2); +str STRbatLpad2_const_const(bat *ret, bat *l, size_t *n, str *s2); +str STRbatLpad_bat(bat *ret, bat *l, bat *n); +str STRbatLpad_const(bat *ret, bat *l, size_t *n); str STRbatLtrim(bat *ret, bat *l); +str STRbatLtrim2_bat(bat *ret, bat *l, bat *l2); +str STRbatLtrim2_const(bat *ret, bat *l, str *s2); str STRbatPrefix(bat *ret, bat *l, bat *r); str STRbatPrefixcst(bat *ret, bat *l, str *cst); +str STRbatRpad2_bat_bat(bat *ret, bat *l, bat *n, bat *l2); +str STRbatRpad2_bat_const(bat *ret, bat *l, bat *n, str *s2); +str STRbatRpad2_const_bat(bat *ret, bat *l, size_t *n, bat *l2); +str STRbatRpad2_const_const(bat *ret, bat *l, size_t *n, str *s2); +str STRbatRpad_bat(bat *ret, bat *l, bat *n); +str STRbatRpad_const(bat *ret, bat *l, size_t *n); str STRbatRstrSearch(bat *ret, bat *l, bat *r); str STRbatRstrSearchcst(bat *ret, bat *l, str *cst); str STRbatRtrim(bat *ret, bat *l); +str STRbatRtrim2_bat(bat *ret, bat *l, bat *l2); +str STRbatRtrim2_const(bat *ret, bat *l, str *s2); str STRbatStrip(bat *ret, bat *l); +str STRbatStrip2_bat(bat *ret, bat *l, bat *l2); +str STRbatStrip2_const(bat *ret, bat *l, str *s2); str STRbatSubstitutecst(bat *ret, bat *l, str *arg2, str *arg3, bit *rep); str STRbatSuffix(bat *ret, bat *l, bat *r); str STRbatSuffixcst(bat *ret, bat *l, str *cst); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
