Changeset: eeec21074587 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/eeec21074587 Modified Files: monetdb5/modules/atoms/str.c Branch: Dec2023 Log Message:
A little more cleanup.
diffs (155 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
@@ -3832,24 +3832,22 @@ int
str_contains(const char *h, const char *n, int nlen)
{
(void) nlen;
- return strstr(h, n) ? 0 : 1;
+ return strstr(h, n) == NULL;
}
int
str_icontains(const char *h, const char *n, int nlen)
{
(void) nlen;
- return utf8casestr(h, n) ? 0 : 1;
+ return utf8casestr(h, n) == NULL;
}
-#define STR_MAPARGS(STK, PCI, R, S1, S2, ICASE)
\
- do{
\
- R = getArgReference(STK, PCI, 0);
\
- S1 = *getArgReference_str(STK, PCI, 1);
\
- S2 = *getArgReference_str(STK, PCI, 2);
\
- icase = PCI->argc == 4 &&
\
- *getArgReference_bit(STK, PCI, 3) ? true : false;
\
-
\
+#define STR_MAPARGS(STK, PCI, R, S1, S2, ICASE)
\
+ do{
\
+ R = getArgReference(STK, PCI, 0);
\
+ S1 = *getArgReference_str(STK, PCI, 1);
\
+ S2 = *getArgReference_str(STK, PCI, 2);
\
+ icase = PCI->argc == 4 && *getArgReference_bit(STK, PCI, 3);
\
} while(0)
static str
@@ -3950,8 +3948,7 @@ STRstr_search(Client cntxt, MalBlkPtr mb
bit *res = getArgReference(stk, pci, 0);
const str *haystack = getArgReference(stk, pci, 1),
*needle = getArgReference(stk, pci, 2);
- bit icase = pci->argc == 4
- && *getArgReference_bit(stk, pci, 3) ? true : false;
+ bit icase = pci->argc == 4 && *getArgReference_bit(stk, pci, 3);
str s = *haystack, h = *needle, msg = MAL_SUCCEED;
if (strNil(s) || strNil(h)) {
*res = bit_nil;
@@ -4012,8 +4009,7 @@ STRrevstr_search(Client cntxt, MalBlkPtr
bit *res = getArgReference(stk, pci, 0);
const str *haystack = getArgReference(stk, pci, 1);
const str *needle = getArgReference(stk, pci, 2);
- bit icase = pci->argc == 4
- && *getArgReference_bit(stk, pci, 3) ? true : false;
+ bit icase = pci->argc == 4 && *getArgReference_bit(stk, pci, 3);
str s = *haystack, h = *needle, msg = MAL_SUCCEED;
if (strNil(s) || strNil(h)) {
*res = bit_nil;
@@ -5364,8 +5360,8 @@ STRselect(bat *r_id, const bat *b_id, co
B_ID = getArgReference(STK, PCI, 1);
\
CB_ID = getArgReference(STK, PCI, 2);
\
KEY = *getArgReference_str(STK, PCI, 3);
\
- ICASE = PCI->argc == 5 ? false : true;
\
- ANTI = PCI->argc == 5 ? *getArgReference_bit(STK, PCI, 4) :
\
+ ICASE = PCI->argc != 5;
\
+ ANTI = PCI->argc == 5 ? *getArgReference_bit(STK, PCI, 4) :
\
*getArgReference_bit(STK, PCI, 5);
\
} while (0)
@@ -5596,7 +5592,7 @@ STRcontainsselect(Client cntxt, MalBlkPt
}
\
} while (0)
-#define STARTSWITH_SORTED_LOOP(STR_CMP, STR_LEN, FNAME)
\
+#define STARTSWITH_SORTED_LOOP(STR_CMP, STR_LEN, FNAME)
\
do {
\
canditer_init(&rci, sorted_r, sorted_cr);
\
canditer_init(&lci, sorted_l, sorted_cl);
\
@@ -5618,10 +5614,10 @@ STRcontainsselect(Client cntxt, MalBlkPt
GDK_CHECK_TIMEOUT(timeoffset, counter,
GOTO_LABEL_TIMEOUT_HANDLER(exit)); \
ro = canditer_next(&rci);
\
vr = VALUE(r, ro - rbase);
\
- vr_len = STR_LEN;
\
+ vr_len = STR_LEN;
\
matches = 0;
\
for (canditer_setidx(&lci, lx), n = lx; n < lci.ncand;
n++) { \
- lo = canditer_next_dense(&lci);
\
+ lo = canditer_next_dense(&lci);
\
vl = VALUE(l, lo - lbase);
\
cmp = STR_CMP;
\
if (cmp < 0) {
\
@@ -5633,49 +5629,49 @@ STRcontainsselect(Client cntxt, MalBlkPt
if (BATcount(rl) == BATcapacity(rl)) {
\
newcap = BATgrows(rl);
\
BATsetcount(rl, BATcount(rl));
\
- if (rr)
\
+ if (rr)
\
BATsetcount(rr, BATcount(rr));
\
- if (BATextend(rl, newcap) !=
GDK_SUCCEED || \
+ if (BATextend(rl, newcap) !=
GDK_SUCCEED || \
(rr && BATextend(rr, newcap) !=
GDK_SUCCEED)) { \
msg = createException(MAL,
FNAME, SQLSTATE(HY013) MAL_MALLOC_FAIL); \
goto exit;
\
}
\
assert(!rr || BATcapacity(rl) ==
BATcapacity(rr)); \
}
\
- if (BATcount(rl) > 0) {
\
+ if (BATcount(rl) > 0) {
\
if (last_lo + 1 != lo)
\
- rl->tseqbase = oid_nil;
\
- if (matches == 0) {
\
- if (rr)
\
- rr->trevsorted = false;
\
- if (last_lo > lo) {
\
+ rl->tseqbase = oid_nil;
\
+ if (matches == 0) {
\
+ if (rr)
\
+ rr->trevsorted = false;
\
+ if (last_lo > lo) {
\
rl->tsorted = false;
\
rl->tkey = false;
\
} else if (last_lo < lo) {
\
- rl->trevsorted = false;
\
+ rl->trevsorted = false;
\
} else {
\
rl->tkey = false;
\
}
\
}
\
}
\
- APPEND(rl, lo);
\
- if (rr)
\
- APPEND(rr, ro);
\
+ APPEND(rl, lo);
\
+ if (rr)
\
+ APPEND(rr, ro);
\
last_lo = lo;
\
matches++;
\
}
\
if (rr) {
\
if (matches > 1) {
\
rr->tkey = false;
\
- rr->tseqbase = oid_nil;
\
- rl->trevsorted = false;
\
+ rr->tseqbase = oid_nil;
\
+ rl->trevsorted = false;
\
} else if (matches == 0) {
\
rskipped = BATcount(rr) > 0;
\
} else if (rskipped) {
\
- rr->tseqbase = oid_nil;
\
+ rr->tseqbase = oid_nil;
\
}
\
} else if (matches > 1) {
\
- rl->trevsorted = false;
\
+ rl->trevsorted = false;
\
}
\
}
\
} while (0)
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
