Changeset: b4ba45927b84 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/b4ba45927b84 Modified Files: monetdb5/modules/atoms/str.c Branch: sw_ew_c_sorting Log Message:
Fix STARTSWITH_JOIN macro. Use args
diffs (29 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
@@ -5623,14 +5623,14 @@ STRcontainsselect(Client cntxt, MalBlkPt
vr = VALUE(r, ro - rbase);
\
if (strNil(vr))
\
continue;
\
- vr_len = str_strlen(vr);
\
+ vr_len = STR_LEN;
\
matches = 0;
\
for (canditer_setidx(&lci, lidx), n = lidx; n <
lci.ncand; n++) { \
lo = canditer_next(&lci);
\
vl = VALUE(l, lo - lbase);
\
if (strNil(vl))
\
continue;
\
- cmp = str_cmp(vl, vr, vr_len);
\
+ cmp = STR_CMP;
\
if (cmp < 0) {
\
lidx++;
\
continue;
\
@@ -5644,7 +5644,7 @@ STRcontainsselect(Client cntxt, MalBlkPt
BATsetcount(rr, BATcount(rr));
\
if (BATextend(rl, newcap) !=
GDK_SUCCEED || \
(rr && BATextend(rr, newcap) !=
GDK_SUCCEED)) { \
- msg = createException(MAL,
fname, SQLSTATE(HY013) MAL_MALLOC_FAIL); \
+ msg = createException(MAL,
FNAME, SQLSTATE(HY013) MAL_MALLOC_FAIL); \
goto exit;
\
}
\
assert(!rr || BATcapacity(rl) ==
BATcapacity(rr)); \
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
