Changeset: a9574fa5b4ff for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a9574fa5b4ff
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
monetdb5/modules/atoms/str.c
monetdb5/modules/atoms/str.h
monetdb5/modules/atoms/str.mal
Branch: Jul2015
Log Message:
Backing out changeset 11d8a0b64ff2: no ABI changes.
diffs (78 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
@@ -41124,7 +41124,7 @@ address STRPrefix;
comment Prefix check.
command str.stringlength(s:str):int
-address STRSQLLength;
+address STRstringLength;
comment Return the length of a right trimed string (SQL semantics).
command str.string(s:str,offset:int,count:int):str
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
@@ -52067,7 +52067,7 @@ address STRPrefix;
comment Prefix check.
command str.stringlength(s:str):int
-address STRSQLLength;
+address STRstringLength;
comment Return the length of a right trimed string (SQL semantics).
command str.string(s:str,offset:int,count:int):str
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
@@ -1937,6 +1937,7 @@ str STRreplace(str *ret, const str *s1,
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 STRstringLength(int *res, const str *s);
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);
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
@@ -2537,3 +2537,15 @@ STRspace(str *ret, const int *l){
char buf[]= " ", *s= buf;
return STRrepeat(ret,&s,l);
}
+
+str
+STRstringLength(int *res, const str *s)
+{
+ str r = NULL;
+ STRRtrim(&r, s);
+ STRLength(res, &r);
+ GDKfree(r);
+ return MAL_SUCCEED;
+}
+
+
diff --git a/monetdb5/modules/atoms/str.h b/monetdb5/modules/atoms/str.h
--- a/monetdb5/modules/atoms/str.h
+++ b/monetdb5/modules/atoms/str.h
@@ -28,6 +28,8 @@ str_export str strEpilogue(void *ret);
str_export str STRtostr(str *res, const str *src);
str_export str STRConcat(str *res, const str *val1, const str *val2);
str_export str STRLength(int *res, const str *arg1);
+/* length of rtrimed string, needed for sql */
+str_export str STRstringLength(int *res, const str *s);
str_export str STRBytes(int *res, const str *arg1);
str_export str STRTail(str *res, const str *arg1, const int *offset);
str_export str STRSubString(str *res, const str *arg1, const int *offset,
const int *length);
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
@@ -25,7 +25,7 @@ address STRLength
comment "Return the length of a string.";
command stringlength( s:str ) :int
-address STRSQLLength
+address STRstringLength
comment "Return the length of a right trimed string (SQL semantics).";
command nbytes( s:str ) :int
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
