Changeset: 23f676d97916 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/23f676d97916
Modified Files:
monetdb5/modules/atoms/str.c
Branch: sw_ew_c_sorting
Log Message:
make code somewhat more inline with expected output of str_cmp (strcmp).
diffs (27 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
@@ -5559,9 +5559,9 @@ STRcontainsselect(Client cntxt, MalBlkPt
for (BUN lidx = 0; lidx < lci.ncand; lidx++) {
\
lo = canditer_next(&lci);
\
vl = VALUE(l, lo - lbase);
\
- if (strNil(vl))
\
+ if (strNil(vl))
\
continue;
\
- if (STR_CMP)
\
+ if (!(STR_CMP))
\
continue;
\
if (BATcount(rl) == BATcapacity(rl)) {
\
newcap = BATgrows(rl);
\
@@ -5878,9 +5878,9 @@ str_join_nested(BAT *rl, BAT *rr, BAT *l
size_t counter = 0;
if (anti)
- STR_JOIN_NESTED_LOOP((str_cmp(vl, vr, vr_len) == 0),
str_strlen(vr), fname);
+ STR_JOIN_NESTED_LOOP((str_cmp(vl, vr, vr_len) != 0),
str_strlen(vr), fname);
else
- STR_JOIN_NESTED_LOOP((str_cmp(vl, vr, vr_len) != 0),
str_strlen(vr), fname);
+ STR_JOIN_NESTED_LOOP((str_cmp(vl, vr, vr_len) == 0),
str_strlen(vr), fname);
assert(!rr || BATcount(rl) == BATcount(rr));
BATsetcount(rl, BATcount(rl));
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
