Changeset: 6e29a4febd35 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6e29a4febd35
Modified Files:
monetdb5/modules/atoms/str.c
monetdb5/modules/atoms/str.h
sql/backends/monet5/sql.c
Branch: alloc-less-str
Log Message:
Export less and removed unused calls
diffs (46 lines):
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
@@ -3478,7 +3478,7 @@ str_Sub_String(str *buf, int *buflen, co
return MAL_SUCCEED;
}
-str
+static str
STRSubString(str *res, const str *arg1, const int *offset, const int *length)
{
int buflen = INITIAL_STR_BUFFER_LENGTH;
@@ -4228,7 +4228,7 @@ str_substring_tail(str *buf, int *buflen
return str_tail(buf, buflen, s, start);
}
-str
+static str
STRsubstringTail(str *res, const str *s, const int *start)
{
int buflen = INITIAL_STR_BUFFER_LENGTH;
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
@@ -39,9 +39,6 @@ extern str str_strip(str *buf, int *bufl
extern str str_ltrim(str *buf, int *buflen, const char *s);
extern str str_rtrim(str *buf, int *buflen, const char *s);
-mal_export str STRSubString(str *res, const str *arg1, const int *offset,
const int *length);
-mal_export str STRsubstringTail(str *ret, const str *s, const int *start);
-
mal_export str STRstrSearch(int *res, const str *arg1, const str *arg2);
mal_export str STRReverseStrSearch(int *res, const str *arg1, const str *arg2);
mal_export str STRsplitpart(str *res, str *haystack, str *needle, int *field);
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -5694,8 +5694,6 @@ static mel_func sql_init_funcs[] = {
pattern("calc", "str", SQLstr_cast, false, "cast to string and check for
overflow", args(1,7,
arg("",str),arg("eclass",int),arg("d1",int),arg("s1",int),arg("has_tz",int),argany("v",1),arg("digits",int))),
pattern("batcalc", "str", SQLbatstr_cast, false, "cast to string and check
for overflow", args(1,7,
batarg("",str),arg("eclass",int),arg("d1",int),arg("s1",int),arg("has_tz",int),batargany("v",1),arg("digits",int))),
pattern("batcalc", "str", SQLbatstr_cast, false, "cast to string and check
for overflow", args(1,8,
batarg("",str),arg("eclass",int),arg("d1",int),arg("s1",int),arg("has_tz",int),batargany("v",1),batarg("s",oid),arg("digits",int))),
- command("calc", "substring", STRsubstringTail, false, "", args(1,3,
arg("",str),arg("s",str),arg("offset",int))),
- command("calc", "substring", STRsubstring, false, "", args(1,4,
arg("",str),arg("s",str),arg("offset",int),arg("count",int))),
pattern("calc", "month_interval", month_interval_str, false, "cast str to a
month_interval and check for overflow", args(1,4,
arg("",int),arg("v",str),arg("ek",int),arg("sk",int))),
pattern("batcalc", "month_interval", month_interval_str, false, "cast str to
a month_interval and check for overflow", args(1,4,
batarg("",int),batarg("v",str),arg("ek",int),arg("sk",int))),
pattern("batcalc", "month_interval", month_interval_str, false, "cast str to
a month_interval and check for overflow", args(1,5,
batarg("",int),batarg("v",str),batarg("s",oid),arg("ek",int),arg("sk",int))),
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list