Skip to content

P
Postgres FD Implementation
Commit 32ba2b51 authored by Robert Haas's avatar Robert Haas
Browse files
Options

Use memcmp() rather than strncmp() when shorter string length is known. 

It appears that this will be faster for all but the shortest strings;
at least one some platforms, memcmp() can use word-at-a-time comparisons.

Noah Misch, somewhat pared down.
parent c5160b7e
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 33 deletions
contrib/hstore/hstore_io.c
View file @ 32ba2b51
...@@ -280,9 +280,9 @@ comparePairs(const void *a, const void *b) ...@@ -280,9 +280,9 @@ comparePairs(const void *a, const void *b)
{ {
if (((Pairs *) a)->keylen == ((Pairs *) b)->keylen) if (((Pairs *) a)->keylen == ((Pairs *) b)->keylen)
{ {
int res = strncmp(((Pairs *) a)->key, int res = memcmp(((Pairs *) a)->key,
((Pairs *) b)->key, ((Pairs *) b)->key,
((Pairs *) a)->keylen); ((Pairs *) a)->keylen);
if (res) if (res)
return res; return res;
...@@ -324,7 +324,7 @@ hstoreUniquePairs(Pairs *a, int4 l, int4 *buflen) ...@@ -324,7 +324,7 @@ hstoreUniquePairs(Pairs *a, int4 l, int4 *buflen)
while (ptr - a < l) while (ptr - a < l)
{ {
if (ptr->keylen == res->keylen && if (ptr->keylen == res->keylen &&
strncmp(ptr->key, res->key, res->keylen) == 0) memcmp(ptr->key, res->key, res->keylen) == 0)
{ {
if (ptr->needfree) if (ptr->needfree)
{ {
......
contrib/hstore/hstore_op.c
View file @ 32ba2b51
...@@ -49,7 +49,7 @@ hstoreFindKey(HStore *hs, int *lowbound, char *key, int keylen) ...@@ -49,7 +49,7 @@ hstoreFindKey(HStore *hs, int *lowbound, char *key, int keylen)
stopMiddle = stopLow + (stopHigh - stopLow) / 2; stopMiddle = stopLow + (stopHigh - stopLow) / 2;
if (HS_KEYLEN(entries, stopMiddle) == keylen) if (HS_KEYLEN(entries, stopMiddle) == keylen)
difference = strncmp(HS_KEY(entries, base, stopMiddle), key, keylen); difference = memcmp(HS_KEY(entries, base, stopMiddle), key, keylen);
else else
difference = (HS_KEYLEN(entries, stopMiddle) > keylen) ? 1 : -1; difference = (HS_KEYLEN(entries, stopMiddle) > keylen) ? 1 : -1;
...@@ -263,7 +263,7 @@ hstore_delete(PG_FUNCTION_ARGS) ...@@ -263,7 +263,7 @@ hstore_delete(PG_FUNCTION_ARGS)
int len = HS_KEYLEN(es, i); int len = HS_KEYLEN(es, i);
char *ptrs = HS_KEY(es, bufs, i); char *ptrs = HS_KEY(es, bufs, i);
if (!(len == keylen && strncmp(ptrs, keyptr, keylen) == 0)) if (!(len == keylen && memcmp(ptrs, keyptr, keylen) == 0))
{ {
int vallen = HS_VALLEN(es, i); int vallen = HS_VALLEN(es, i);
...@@ -331,9 +331,9 @@ hstore_delete_array(PG_FUNCTION_ARGS) ...@@ -331,9 +331,9 @@ hstore_delete_array(PG_FUNCTION_ARGS)
int skeylen = HS_KEYLEN(es, i); int skeylen = HS_KEYLEN(es, i);
if (skeylen == key_pairs[j].keylen) if (skeylen == key_pairs[j].keylen)
difference = strncmp(HS_KEY(es, ps, i), difference = memcmp(HS_KEY(es, ps, i),
key_pairs[j].key, key_pairs[j].key,
key_pairs[j].keylen); key_pairs[j].keylen);
else else
difference = (skeylen > key_pairs[j].keylen) ? 1 : -1; difference = (skeylen > key_pairs[j].keylen) ? 1 : -1;
} }
...@@ -416,9 +416,9 @@ hstore_delete_hstore(PG_FUNCTION_ARGS) ...@@ -416,9 +416,9 @@ hstore_delete_hstore(PG_FUNCTION_ARGS)
int s2keylen = HS_KEYLEN(es2, j); int s2keylen = HS_KEYLEN(es2, j);
if (skeylen == s2keylen) if (skeylen == s2keylen)
difference = strncmp(HS_KEY(es, ps, i), difference = memcmp(HS_KEY(es, ps, i),
HS_KEY(es2, ps2, j), HS_KEY(es2, ps2, j),
skeylen); skeylen);
else else
difference = (skeylen > s2keylen) ? 1 : -1; difference = (skeylen > s2keylen) ? 1 : -1;
} }
...@@ -433,7 +433,7 @@ hstore_delete_hstore(PG_FUNCTION_ARGS) ...@@ -433,7 +433,7 @@ hstore_delete_hstore(PG_FUNCTION_ARGS)
if (snullval != HS_VALISNULL(es2, j) if (snullval != HS_VALISNULL(es2, j)
|| (!snullval || (!snullval
&& (svallen != HS_VALLEN(es2, j) && (svallen != HS_VALLEN(es2, j)
|| strncmp(HS_VAL(es, ps, i), HS_VAL(es2, ps2, j), svallen) != 0))) || memcmp(HS_VAL(es, ps, i), HS_VAL(es2, ps2, j), svallen) != 0)))
{ {
HS_COPYITEM(ed, bufd, pd, HS_COPYITEM(ed, bufd, pd,
HS_KEY(es, ps, i), HS_KEYLEN(es, i), HS_KEY(es, ps, i), HS_KEYLEN(es, i),
...@@ -526,9 +526,9 @@ hstore_concat(PG_FUNCTION_ARGS) ...@@ -526,9 +526,9 @@ hstore_concat(PG_FUNCTION_ARGS)
int s2keylen = HS_KEYLEN(es2, s2idx); int s2keylen = HS_KEYLEN(es2, s2idx);
if (s1keylen == s2keylen) if (s1keylen == s2keylen)
difference = strncmp(HS_KEY(es1, ps1, s1idx), difference = memcmp(HS_KEY(es1, ps1, s1idx),
HS_KEY(es2, ps2, s2idx), HS_KEY(es2, ps2, s2idx),
s1keylen); s1keylen);
else else
difference = (s1keylen > s2keylen) ? 1 : -1; difference = (s1keylen > s2keylen) ? 1 : -1;
} }
...@@ -996,7 +996,7 @@ hstore_contains(PG_FUNCTION_ARGS) ...@@ -996,7 +996,7 @@ hstore_contains(PG_FUNCTION_ARGS)
if (nullval != HS_VALISNULL(ve, idx) if (nullval != HS_VALISNULL(ve, idx)
|| (!nullval || (!nullval
&& (vallen != HS_VALLEN(ve, idx) && (vallen != HS_VALLEN(ve, idx)
|| strncmp(HS_VAL(te, tstr, i), HS_VAL(ve, vstr, idx), vallen)))) || memcmp(HS_VAL(te, tstr, i), HS_VAL(ve, vstr, idx), vallen))))
res = false; res = false;
} }
else else
......
contrib/ltree/ltree_gist.c
View file @ 32ba2b51
...@@ -546,7 +546,7 @@ gist_tqcmp(ltree *t, lquery *q) ...@@ -546,7 +546,7 @@ gist_tqcmp(ltree *t, lquery *q)
while (an > 0 && bn > 0) while (an > 0 && bn > 0)
{ {
bl = LQL_FIRST(ql); bl = LQL_FIRST(ql);
if ((res = strncmp(al->name, bl->name, Min(al->len, bl->len))) == 0) if ((res = memcmp(al->name, bl->name, Min(al->len, bl->len))) == 0)
{ {
if (al->len != bl->len) if (al->len != bl->len)
return al->len - bl->len; return al->len - bl->len;
......
contrib/ltree/ltree_op.c
View file @ 32ba2b51
...@@ -68,7 +68,7 @@ ltree_compare(const ltree *a, const ltree *b) ...@@ -68,7 +68,7 @@ ltree_compare(const ltree *a, const ltree *b)
while (an > 0 && bn > 0) while (an > 0 && bn > 0)
{ {
if ((res = strncmp(al->name, bl->name, Min(al->len, bl->len))) == 0) if ((res = memcmp(al->name, bl->name, Min(al->len, bl->len))) == 0)
{ {
if (al->len != bl->len) if (al->len != bl->len)
return (al->len - bl->len) * 10 * (an + 1); return (al->len - bl->len) * 10 * (an + 1);
...@@ -165,7 +165,7 @@ inner_isparent(const ltree *c, const ltree *p) ...@@ -165,7 +165,7 @@ inner_isparent(const ltree *c, const ltree *p)
{ {
if (cl->len != pl->len) if (cl->len != pl->len)
return false; return false;
if (strncmp(cl->name, pl->name, cl->len)) if (memcmp(cl->name, pl->name, cl->len))
return false; return false;
pn--; pn--;
...@@ -373,7 +373,7 @@ ltree_index(PG_FUNCTION_ARGS) ...@@ -373,7 +373,7 @@ ltree_index(PG_FUNCTION_ARGS)
bptr = LTREE_FIRST(b); bptr = LTREE_FIRST(b);
for (j = 0; j < b->numlevel; j++) for (j = 0; j < b->numlevel; j++)
{ {
if (!(aptr->len == bptr->len && strncmp(aptr->name, bptr->name, aptr->len) == 0)) if (!(aptr->len == bptr->len && memcmp(aptr->name, bptr->name, aptr->len) == 0))
break; break;
aptr = LEVEL_NEXT(aptr); aptr = LEVEL_NEXT(aptr);
bptr = LEVEL_NEXT(bptr); bptr = LEVEL_NEXT(bptr);
...@@ -451,7 +451,7 @@ lca_inner(ltree **a, int len) ...@@ -451,7 +451,7 @@ lca_inner(ltree **a, int len)
num = 0; num = 0;
for (i = 0; i < Min(tmp, (*ptr)->numlevel - 1); i++) for (i = 0; i < Min(tmp, (*ptr)->numlevel - 1); i++)
{ {
if (l1->len == l2->len && strncmp(l1->name, l2->name, l1->len) == 0) if (l1->len == l2->len && memcmp(l1->name, l2->name, l1->len) == 0)
num = i + 1; num = i + 1;
else else
break; break;
......
src/backend/nodes/readfuncs.c
View file @ 32ba2b51
...@@ -1196,7 +1196,7 @@ parseNodeString(void) ...@@ -1196,7 +1196,7 @@ parseNodeString(void)
token = pg_strtok(&length); token = pg_strtok(&length);
#define MATCH(tokname, namelen) \ #define MATCH(tokname, namelen) \
(length == namelen && strncmp(token, tokname, namelen) == 0) (length == namelen && memcmp(token, tokname, namelen) == 0)
if (MATCH("QUERY", 5)) if (MATCH("QUERY", 5))
return_value = _readQuery(); return_value = _readQuery();
......
src/backend/utils/adt/varchar.c
View file @ 32ba2b51
...@@ -690,7 +690,7 @@ bpchareq(PG_FUNCTION_ARGS) ...@@ -690,7 +690,7 @@ bpchareq(PG_FUNCTION_ARGS)
if (len1 != len2) if (len1 != len2)
result = false; result = false;
else else
result = (strncmp(VARDATA_ANY(arg1), VARDATA_ANY(arg2), len1) == 0); result = (memcmp(VARDATA_ANY(arg1), VARDATA_ANY(arg2), len1) == 0);
PG_FREE_IF_COPY(arg1, 0); PG_FREE_IF_COPY(arg1, 0);
PG_FREE_IF_COPY(arg2, 1); PG_FREE_IF_COPY(arg2, 1);
...@@ -717,7 +717,7 @@ bpcharne(PG_FUNCTION_ARGS) ...@@ -717,7 +717,7 @@ bpcharne(PG_FUNCTION_ARGS)
if (len1 != len2) if (len1 != len2)
result = true; result = true;
else else
result = (strncmp(VARDATA_ANY(arg1), VARDATA_ANY(arg2), len1) != 0); result = (memcmp(VARDATA_ANY(arg1), VARDATA_ANY(arg2), len1) != 0);
PG_FREE_IF_COPY(arg1, 0); PG_FREE_IF_COPY(arg1, 0);
PG_FREE_IF_COPY(arg2, 1); PG_FREE_IF_COPY(arg2, 1);
...@@ -905,7 +905,7 @@ internal_bpchar_pattern_compare(BpChar *arg1, BpChar *arg2) ...@@ -905,7 +905,7 @@ internal_bpchar_pattern_compare(BpChar *arg1, BpChar *arg2)
len1 = bcTruelen(arg1); len1 = bcTruelen(arg1);
len2 = bcTruelen(arg2); len2 = bcTruelen(arg2);
result = strncmp(VARDATA_ANY(arg1), VARDATA_ANY(arg2), Min(len1, len2)); result = memcmp(VARDATA_ANY(arg1), VARDATA_ANY(arg2), Min(len1, len2));
if (result != 0) if (result != 0)
return result; return result;
else if (len1 < len2) else if (len1 < len2)
......
src/backend/utils/adt/varlena.c
View file @ 32ba2b51
...@@ -1286,7 +1286,7 @@ varstr_cmp(char *arg1, int len1, char *arg2, int len2) ...@@ -1286,7 +1286,7 @@ varstr_cmp(char *arg1, int len1, char *arg2, int len2)
*/ */
if (lc_collate_is_c()) if (lc_collate_is_c())
{ {
result = strncmp(arg1, arg2, Min(len1, len2)); result = memcmp(arg1, arg2, Min(len1, len2));
if ((result == 0) && (len1 != len2)) if ((result == 0) && (len1 != len2))
result = (len1 < len2) ? -1 : 1; result = (len1 < len2) ? -1 : 1;
} }
...@@ -1370,7 +1370,7 @@ varstr_cmp(char *arg1, int len1, char *arg2, int len2) ...@@ -1370,7 +1370,7 @@ varstr_cmp(char *arg1, int len1, char *arg2, int len2)
*/ */
if (result == 0) if (result == 0)
{ {
result = strncmp(arg1, arg2, Min(len1, len2)); result = memcmp(arg1, arg2, Min(len1, len2));
if ((result == 0) && (len1 != len2)) if ((result == 0) && (len1 != len2))
result = (len1 < len2) ? -1 : 1; result = (len1 < len2) ? -1 : 1;
} }
...@@ -1462,8 +1462,8 @@ texteq(PG_FUNCTION_ARGS) ...@@ -1462,8 +1462,8 @@ texteq(PG_FUNCTION_ARGS)
if (VARSIZE_ANY_EXHDR(arg1) != VARSIZE_ANY_EXHDR(arg2)) if (VARSIZE_ANY_EXHDR(arg1) != VARSIZE_ANY_EXHDR(arg2))
result = false; result = false;
else else
result = (strncmp(VARDATA_ANY(arg1), VARDATA_ANY(arg2), result = (memcmp(VARDATA_ANY(arg1), VARDATA_ANY(arg2),
VARSIZE_ANY_EXHDR(arg1)) == 0); VARSIZE_ANY_EXHDR(arg1)) == 0);
PG_FREE_IF_COPY(arg1, 0); PG_FREE_IF_COPY(arg1, 0);
PG_FREE_IF_COPY(arg2, 1); PG_FREE_IF_COPY(arg2, 1);
...@@ -1485,8 +1485,8 @@ textne(PG_FUNCTION_ARGS) ...@@ -1485,8 +1485,8 @@ textne(PG_FUNCTION_ARGS)
if (VARSIZE_ANY_EXHDR(arg1) != VARSIZE_ANY_EXHDR(arg2)) if (VARSIZE_ANY_EXHDR(arg1) != VARSIZE_ANY_EXHDR(arg2))
result = true; result = true;
else else
result = (strncmp(VARDATA_ANY(arg1), VARDATA_ANY(arg2), result = (memcmp(VARDATA_ANY(arg1), VARDATA_ANY(arg2),
VARSIZE_ANY_EXHDR(arg1)) != 0); VARSIZE_ANY_EXHDR(arg1)) != 0);
PG_FREE_IF_COPY(arg1, 0); PG_FREE_IF_COPY(arg1, 0);
PG_FREE_IF_COPY(arg2, 1); PG_FREE_IF_COPY(arg2, 1);
...@@ -1612,7 +1612,7 @@ internal_text_pattern_compare(text *arg1, text *arg2) ...@@ -1612,7 +1612,7 @@ internal_text_pattern_compare(text *arg1, text *arg2)
len1 = VARSIZE_ANY_EXHDR(arg1); len1 = VARSIZE_ANY_EXHDR(arg1);
len2 = VARSIZE_ANY_EXHDR(arg2); len2 = VARSIZE_ANY_EXHDR(arg2);
result = strncmp(VARDATA_ANY(arg1), VARDATA_ANY(arg2), Min(len1, len2)); result = memcmp(VARDATA_ANY(arg1), VARDATA_ANY(arg2), Min(len1, len2));
if (result != 0) if (result != 0)
return result; return result;
else if (len1 < len2) else if (len1 < len2)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment