upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-22 15:49:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Integer indexing - cleanup

Browse source
This commit is contained in:
Hallvard Furuseth 2007-12-02 19:25:33 +00:00
parent 304520c113
commit 3b6122cb73
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
servers/slapd/schema_init.c
View file

@ -2114,13 +2114,15 @@ integerMatch(
return LDAP_SUCCESS; return LDAP_SUCCESS;
} }
/* 10**INDEX_INTLEN_CHOP < 256**INDEX_INTLEN_CHOPBYTES */
#define INDEX_INTLEN_CHOP 7 #define INDEX_INTLEN_CHOP 7
#define INDEX_INTLEN_CHOPBYTES 3
static int static int
integerVal2Key( integerVal2Key(
struct berval val, struct berval *in,
struct berval *key, struct berval *key,
struct berval itmp, struct berval *tmp,
void *ctx void *ctx
) )
{ {
@ -2134,6 +2136,7 @@ integerVal2Key(
ber_slen_t k = index_intlen_strlen, chop = 0; ber_slen_t k = index_intlen_strlen, chop = 0;
unsigned char neg = 0xff, signmask = 0x80; unsigned char neg = 0xff, signmask = 0x80;
unsigned char lenbuf[sizeof(k) + 2], *lenp; unsigned char lenbuf[sizeof(k) + 2], *lenp;
struct berval val = *in, itmp = *tmp;
if ( val.bv_val[0] != '-' ) { if ( val.bv_val[0] != '-' ) {
neg = 0; neg = 0;
@ -2142,9 +2145,9 @@ integerVal2Key(
/* Chop least significant digits, increase length instead */ /* Chop least significant digits, increase length instead */
if ( val.bv_len > k ) { if ( val.bv_len > k ) {
chop = (val.bv_len - k + 2) / 7; /* 2 fewer digits */ chop = (val.bv_len-k+2)/INDEX_INTLEN_CHOP; /* 2 fewer digits */
val.bv_len -= chop * INDEX_INTLEN_CHOP; /* #digits chopped */ val.bv_len -= chop * INDEX_INTLEN_CHOP; /* #digits chopped */
chop *= 3; /* >#key bytes chopped: 256**3 > 10**7 */ chop *= INDEX_INTLEN_CHOPBYTES; /* #bytes added */
if ( chop > 0x7fffffff ) { if ( chop > 0x7fffffff ) {
memset( key->bv_val, neg ^ 0xff, index_intlen ); memset( key->bv_val, neg ^ 0xff, index_intlen );
return 0; return 0;
@ -2239,7 +2242,7 @@ integerIndexer(
else if ( itmp.bv_len > maxstrlen ) else if ( itmp.bv_len > maxstrlen )
itmp.bv_len = maxstrlen; itmp.bv_len = maxstrlen;
} }
rc = integerVal2Key( values[i], &keys[i], itmp, ctx ); rc = integerVal2Key( &values[i], &keys[i], &itmp, ctx );
if ( rc ) if ( rc )
goto leave; goto leave;
} }
@ -2285,7 +2288,7 @@ integerFilter(
iv.bv_len = sizeof(ibuf); iv.bv_len = sizeof(ibuf);
} }
rc = integerVal2Key( *value, keys, iv, ctx ); rc = integerVal2Key( value, keys, &iv, ctx );
if ( rc == 0 ) if ( rc == 0 )
*keysp = keys; *keysp = keys;