/* idl.c - ldap id list handling routines */
+/* $OpenLDAP$ */
/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
#include <ac/string.h>
#include <ac/socket.h>
-#include "ldap_defaults.h"
#include "slap.h"
#include "back-ldbm.h"
static ID_BLOCK* idl_dup( ID_BLOCK *idl );
+static void cont_alloc( Datum *cont, Datum *key )
+{
+ ldbm_datum_init( *cont );
+ cont->dsize = 1 + sizeof(ID) + key->dsize;
+ cont->dptr = ch_malloc( cont->dsize );
+
+ * (unsigned char *) cont->dptr = SLAP_INDEX_CONT_PREFIX;
+
+ AC_MEMCPY( &((unsigned char *)cont->dptr)[1 + sizeof(ID)],
+ key->dptr, key->dsize );
+}
+
+static void cont_id( Datum *cont, ID id )
+{
+ int i;
+
+ for( i=1; i <= sizeof(id); i++) {
+ ((unsigned char *)cont->dptr)[i] = (unsigned char)(id & 0xFF);
+ id >>= 8;
+ }
+
+}
+
+static void cont_free( Datum *cont )
+{
+ ch_free( cont->dptr );
+}
+
+#ifdef LDBM_DEBUG_IDL
+static void idl_check(ID_BLOCK *idl)
+{
+ int i;
+ ID_BLOCK last;
+
+ if( ID_BLOCK_INDIRECT(idl) || ID_BLOCK_ALLIDS(idl)
+ || ID_BLOCK_NIDS(idl) <= 1 )
+ {
+ return;
+ }
+
+ for( last = ID_BLOCK_ID(idl, 0), i = 1;
+ i < ID_BLOCK_NIDS(idl);
+ last = ID_BLOCK_ID(idl, i), i++ )
+ {
+ assert (last < ID_BLOCK_ID(idl, i) );
+ }
+}
+#endif
+
/* Allocate an ID_BLOCK with room for nids ids */
ID_BLOCK *
idl_alloc( unsigned int nids )
idl_allids( Backend *be )
{
ID_BLOCK *idl;
+ ID id;
idl = idl_alloc( 0 );
ID_BLOCK_NMAX(idl) = ID_BLOCK_ALLIDS_VALUE;
- ID_BLOCK_NIDS(idl) = next_id_get( be );
+ if ( next_id_get( be, &id ) ) {
+ return NULL;
+ }
+ ID_BLOCK_NIDS(idl) = id;
return( idl );
}
-
/* Free an ID_BLOCK */
void
idl_free( ID_BLOCK *idl )
{
if ( idl == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "cache", LDAP_LEVEL_INFO,
+ "idl_free: called with NULL pointer\n" ));
+#else
Debug( LDAP_DEBUG_TRACE,
"idl_free: called with NULL pointer\n",
0, 0, 0 );
+#endif
+
return;
}
Datum data;
ID_BLOCK *idl;
- ldbm_datum_init( data );
-
/* Debug( LDAP_DEBUG_TRACE, "=> idl_fetch_one\n", 0, 0, 0 ); */
data = ldbm_cache_fetch( db, key );
return NULL;
}
- idl = idl_dup( (ID_BLOCK *) data.dptr);
+ idl = idl_dup((ID_BLOCK *) data.dptr);
+
ldbm_datum_free( db->dbc_db, data );
- return( idl );
+ return idl;
}
/* Fetch a set of ID_BLOCKs from the cache
* if not INDIRECT
- * if block return is an ALLIDS block,
+ * if block return is an ALLIDS block,
* return an new ALLIDS block
- * otherwise
+ * otherwise
* return block
* construct super block from all blocks referenced by INDIRECT block
* return super block
Datum data;
ID_BLOCK *idl;
ID_BLOCK **tmp;
- char *kstr;
int i, nids;
idl = idl_fetch_one( be, db, key );
* a big id list containing all the ids, which we will return.
*/
+#ifndef USE_INDIRECT_NIDS
/* count the number of blocks & allocate space for pointers to them */
for ( i = 0; !ID_BLOCK_NOID(idl, i); i++ )
; /* NULL */
+#else
+ i = ID_BLOCK_NIDS(idl);
+#endif
tmp = (ID_BLOCK **) ch_malloc( (i + 1) * sizeof(ID_BLOCK *) );
/* read in all the blocks */
- kstr = (char *) ch_malloc( key.dsize + 20 );
+ cont_alloc( &data, &key );
nids = 0;
+#ifndef USE_INDIRECT_NIDS
for ( i = 0; !ID_BLOCK_NOID(idl, i); i++ ) {
- ldbm_datum_init( data );
-
- sprintf( kstr, "%c%s%ld", CONT_PREFIX, key.dptr, ID_BLOCK_ID(idl, i) );
- data.dptr = kstr;
- data.dsize = strlen( kstr ) + 1;
+#else
+ for ( i = 0; i < ID_BLOCK_NIDS(idl); i++ ) {
+#endif
+ cont_id( &data, ID_BLOCK_ID(idl, i) );
if ( (tmp[i] = idl_fetch_one( be, db, data )) == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "cache", LDAP_LEVEL_INFO,
+ "idl_fetch: idl_fetch_one returned NULL\n" ));
+#else
Debug( LDAP_DEBUG_ANY,
- "idl_fetch of (%s) returns NULL\n", data.dptr, 0, 0 );
+ "idl_fetch: one returned NULL\n", 0, 0, 0 );
+#endif
+
continue;
}
nids += ID_BLOCK_NIDS(tmp[i]);
}
tmp[i] = NULL;
- free( kstr );
+ cont_free( &data );
idl_free( idl );
/* allocate space for the big block */
continue;
}
- SAFEMEMCPY(
+ AC_MEMCPY(
(char *) &ID_BLOCK_ID(idl, nids),
(char *) &ID_BLOCK_ID(tmp[i], 0),
ID_BLOCK_NIDS(tmp[i]) * sizeof(ID) );
}
free( (char *) tmp );
+#ifdef LDBM_DEBUG_IDL
+ idl_check(idl);
+#endif
+
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "cache", LDAP_LEVEL_ENTRY,
+ "idl_fetch: %ld ids (%ld max)\n",
+ ID_BLOCK_NIDS(idl), ID_BLOCK_NMAXN(idl) ));
+#else
Debug( LDAP_DEBUG_TRACE, "<= idl_fetch %ld ids (%ld max)\n",
- ID_BLOCK_NIDS(idl), ID_BLOCK_NMAX(idl), 0 );
+ ID_BLOCK_NIDS(idl), ID_BLOCK_NMAXN(idl), 0 );
+#endif
+
return( idl );
}
{
int rc, flags;
Datum data;
- struct ldbminfo *li = (struct ldbminfo *) be->be_private;
+
+#ifdef LDBM_DEBUG_IDL
+ idl_check(idl);
+#endif
ldbm_datum_init( data );
/* Debug( LDAP_DEBUG_TRACE, "=> idl_store\n", 0, 0, 0 ); */
data.dptr = (char *) idl;
- data.dsize = (ID_BLOCK_IDS_OFFSET + ID_BLOCK_NMAX(idl)) * sizeof(ID);
+ data.dsize = (ID_BLOCK_IDS_OFFSET + ID_BLOCK_NMAXN(idl)) * sizeof(ID);
+ flags = LDBM_REPLACE;
+ rc = ldbm_cache_store( db, key, data, flags );
+
#ifdef LDBM_DEBUG
Statslog( LDAP_DEBUG_STATS, "<= idl_store(): rc=%d\n",
rc, 0, 0, 0, 0 );
#endif
- flags = LDBM_REPLACE;
- if( li->li_dbcachewsync ) flags |= LDBM_SYNC;
- rc = ldbm_cache_store( db, key, data, flags );
-
/* Debug( LDAP_DEBUG_TRACE, "<= idl_store %d\n", rc, 0, 0 ); */
return( rc );
}
+/* Binary search for id in block, return index
+ * an index is always returned, even with no match. If no
+ * match, the returned index is the insertion point.
+ */
+static unsigned int
+idl_find(
+ ID_BLOCK *b,
+ ID id
+)
+{
+ int lo=0, hi=ID_BLOCK_NIDS(b)-1, nr=0;
+
+ for (;lo<=hi;)
+ {
+ nr = ( lo + hi ) / 2;
+ if (ID_BLOCK_ID(b, nr) == id)
+ break;
+ if (ID_BLOCK_ID(b, nr) > id)
+ hi = nr - 1;
+ else
+ lo = nr + 1;
+ }
+ return nr;
+}
+
/* split the block at id
* locate ID greater than or equal to id.
*/
{
unsigned int nr, nl;
- /* find where to split the block *//* XXX linear search XXX */
- for ( nr = 0; nr < ID_BLOCK_NIDS(b) && id > ID_BLOCK_ID(b, nr); nr++ )
- ; /* NULL */
+ /* find where to split the block */
+ nr = idl_find(b, id);
+ if ( ID_BLOCK_ID(b,nr) < id )
+ nr++;
nl = ID_BLOCK_NIDS(b) - nr;
ID_BLOCK_NIDS(*right) = 1;
ID_BLOCK_ID(*right, 0) = id;
} else {
- SAFEMEMCPY(
+ AC_MEMCPY(
(char *) &ID_BLOCK_ID(*right, 0),
(char *) &ID_BLOCK_ID(b, 0),
nr * sizeof(ID) );
}
/* the id being inserted & everything after in the second block */
- SAFEMEMCPY(
+ AC_MEMCPY(
(char *) &ID_BLOCK_ID(*left, (nr == 0 ? 0 : 1)),
(char *) &ID_BLOCK_ID(b, nr),
nl * sizeof(ID) );
ID_BLOCK_NIDS(*left) = nl + (nr == 0 ? 0 : 1);
+
+#ifdef LDBM_DEBUG_IDL
+ idl_check(*right);
+ idl_check(*left);
+#endif
}
Backend *be,
DBCache *db,
Datum hkey, /* header block key */
- ID_BLOCK *h, /* header block */
+ ID_BLOCK *h, /* header block */
int pos, /* pos in h to update */
Datum bkey, /* data block key */
- ID_BLOCK *b /* data block */
+ ID_BLOCK *b /* data block */
)
{
int rc;
/* delete old key block */
if ( (rc = ldbm_cache_delete( db, bkey )) != 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "cache", LDAP_LEVEL_INFO,
+ "idl_change_first: ldbm_cache_delete returned %d\n", rc ));
+#else
Debug( LDAP_DEBUG_ANY,
- "ldbm_delete of (%s) returns %d\n", bkey.dptr, rc,
- 0 );
+ "idl_change_first: ldbm_cache_delete returned %d\n",
+ rc, 0, 0 );
+#endif
+
return( rc );
}
/* write block with new key */
- sprintf( bkey.dptr, "%c%s%ld", CONT_PREFIX, hkey.dptr, ID_BLOCK_ID(b, 0) );
- bkey.dsize = strlen( bkey.dptr ) + 1;
+ cont_id( &bkey, ID_BLOCK_ID(b, 0) );
+
if ( (rc = idl_store( be, db, bkey, b )) != 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "cache", LDAP_LEVEL_INFO,
+ "idl_change_first: idl_store returned %d\n", rc ));
+#else
Debug( LDAP_DEBUG_ANY,
- "idl_store of (%s) returns %d\n", bkey.dptr, rc, 0 );
+ "idl_change_first: idl_store returned %d\n", rc, 0, 0 );
+#endif
+
return( rc );
}
/* update + write indirect header block */
ID_BLOCK_ID(h, pos) = ID_BLOCK_ID(b, 0);
if ( (rc = idl_store( be, db, hkey, h )) != 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "cache", LDAP_LEVEL_INFO,
+ "idl_change_first: idl_store returned %s\n", rc ));
+#else
Debug( LDAP_DEBUG_ANY,
- "idl_store of (%s) returns %d\n", hkey.dptr, rc, 0 );
+ "idl_change_first: idl_store returned %d\n", rc, 0, 0 );
+#endif
+
return( rc );
}
ID id
)
{
- int i, j, first, rc;
+ int i, j, first, rc = 0;
ID_BLOCK *idl, *tmp, *tmp2, *tmp3;
- char *kstr;
Datum k2;
- ldbm_datum_init( k2 );
-
if ( (idl = idl_fetch_one( be, db, key )) == NULL ) {
-#ifdef LDBM_DEBUG
- Statslog( LDAP_DEBUG_STATS, "=> idl_insert_key(): no key yet\n",
- 0, 0, 0, 0, 0 );
-#endif
-
idl = idl_alloc( 1 );
ID_BLOCK_ID(idl, ID_BLOCK_NIDS(idl)++) = id;
rc = idl_store( be, db, key, idl );
/* create the header indirect block */
idl = idl_alloc( 3 );
+#ifndef USE_INDIRECT_NIDS
ID_BLOCK_NMAX(idl) = 3;
ID_BLOCK_NIDS(idl) = ID_BLOCK_INDIRECT_VALUE;
ID_BLOCK_ID(idl, 0) = ID_BLOCK_ID(tmp, 0);
ID_BLOCK_ID(idl, 1) = ID_BLOCK_ID(tmp2, 0);
ID_BLOCK_ID(idl, 2) = NOID;
+#else
+ ID_BLOCK_NMAX(idl) = 2 | ID_BLOCK_INDIRECT_VALUE;
+ ID_BLOCK_NIDS(idl) = 2;
+ ID_BLOCK_ID(idl, 0) = ID_BLOCK_ID(tmp, 0);
+ ID_BLOCK_ID(idl, 1) = ID_BLOCK_ID(tmp2, 0);
+#endif
/* store it */
rc = idl_store( be, db, key, idl );
- /* store the first id block */
- kstr = (char *) ch_malloc( key.dsize + 20 );
- sprintf( kstr, "%c%s%ld", CONT_PREFIX, key.dptr,
- ID_BLOCK_ID(tmp, 0) );
- k2.dptr = kstr;
- k2.dsize = strlen( kstr ) + 1;
+ cont_alloc( &k2, &key );
+ cont_id( &k2, ID_BLOCK_ID(tmp, 0) );
+
rc = idl_store( be, db, k2, tmp );
- /* store the second id block */
- sprintf( kstr, "%c%s%ld", CONT_PREFIX, key.dptr,
- ID_BLOCK_ID(tmp2, 0) );
- k2.dptr = kstr;
- k2.dsize = strlen( kstr ) + 1;
+ cont_id( &k2, ID_BLOCK_ID(tmp2, 0) );
rc = idl_store( be, db, k2, tmp2 );
- free( kstr );
+ cont_free( &k2 );
+
idl_free( tmp );
idl_free( tmp2 );
break;
* need to write a new "header" block.
*/
+#ifndef USE_INDIRECT_NIDS
/* select the block to try inserting into *//* XXX linear search XXX */
for ( i = 0; !ID_BLOCK_NOID(idl, i) && id > ID_BLOCK_ID(idl, i); i++ )
; /* NULL */
+#else
+ i = idl_find(idl, id);
+ if (ID_BLOCK_ID(idl, i) < id)
+ i++;
+#endif
+
if ( i != 0 ) {
i--;
first = 0;
}
/* get the block */
- kstr = (char *) ch_malloc( key.dsize + 20 );
- sprintf( kstr, "%c%s%ld", CONT_PREFIX, key.dptr, ID_BLOCK_ID(idl, i) );
- k2.dptr = kstr;
- k2.dsize = strlen( kstr ) + 1;
+ cont_alloc( &k2, &key );
+ cont_id( &k2, ID_BLOCK_ID(idl, i) );
+
if ( (tmp = idl_fetch_one( be, db, k2 )) == NULL ) {
- Debug( LDAP_DEBUG_ANY, "nonexistent continuation block (%s)\n",
- k2.dptr, 0, 0 );
- free( kstr );
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "cache", LDAP_LEVEL_ERR,
+ "idl_insert_key: nonexistent continuation block\n" ));
+#else
+ Debug( LDAP_DEBUG_ANY, "idl_insert_key: nonexistent continuation block\n",
+ 0, 0, 0 );
+#endif
+
+ cont_free( &k2 );
idl_free( idl );
return( -1 );
}
switch ( idl_insert( &tmp, id, db->dbc_maxids ) ) {
case 0: /* id inserted ok */
if ( (rc = idl_store( be, db, k2, tmp )) != 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "cache", LDAP_LEVEL_ERR,
+ "ids_insert_key: idl_store returned %d\n", rc ));
+#else
Debug( LDAP_DEBUG_ANY,
- "idl_store of (%s) returns %d\n", k2.dptr, rc, 0 );
+ "idl_insert_key: idl_store returned %d\n", rc, 0, 0 );
+#endif
+
}
break;
rc = idl_change_first( be, db, key, idl, i, k2, tmp );
break;
- case 2: /* id not inserted - already there */
+ case 2: /* id not inserted - already there, do nothing */
+ rc = 0;
break;
case 3: /* id not inserted - block is full */
* into the beginning of the first block.
*/
+#ifndef USE_INDIRECT_NIDS
/* is there a next block? */
if ( !first && !ID_BLOCK_NOID(idl, i + 1) ) {
+#else
+ if ( !first && (i + 1) < ID_BLOCK_NIDS(idl) ) {
+#endif
/* read it in */
- sprintf( kstr, "%c%s%ld", CONT_PREFIX, key.dptr,
- ID_BLOCK_ID(idl, i + 1) );
- k2.dptr = kstr;
- k2.dsize = strlen( kstr ) + 1;
+ cont_alloc( &k2, &key );
+ cont_id( &k2, ID_BLOCK_ID(idl, i) );
if ( (tmp2 = idl_fetch_one( be, db, k2 )) == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "cache", LDAP_LEVEL_ERR,
+ "idl_insert_key: idl_fetch_one returned NULL\n"));
+#else
Debug( LDAP_DEBUG_ANY,
- "idl_fetch_one (%s) returns NULL\n",
- k2.dptr, 0, 0 );
- break;
+ "idl_insert_key: idl_fetch_one returned NULL\n",
+ 0, 0, 0 );
+#endif
+
+ /* split the original block */
+ cont_free( &k2 );
+ goto split;
+ }
+
+ /* If the new id is less than the last id in the
+ * current block, it must not be put into the next
+ * block. Push the last id of the current block
+ * into the next block instead.
+ */
+ if (id < ID_BLOCK_ID(tmp, ID_BLOCK_NIDS(tmp) - 1)) {
+ ID id2 = ID_BLOCK_ID(tmp, ID_BLOCK_NIDS(tmp) - 1);
+ Datum k3;
+
+ ldbm_datum_init( k3 );
+
+ --ID_BLOCK_NIDS(tmp);
+ /* This must succeed since we just popped one
+ * ID off the end of it.
+ */
+ rc = idl_insert( &tmp, id, db->dbc_maxids );
+
+ k3.dptr = ch_malloc(k2.dsize);
+ k3.dsize = k2.dsize;
+ AC_MEMCPY(k3.dptr, k2.dptr, k3.dsize);
+ if ( (rc = idl_store( be, db, k3, tmp )) != 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "cache", LDAP_LEVEL_ERR,
+ "idl_insert_key: idl_store returned %d\n", rc ));
+#else
+ Debug( LDAP_DEBUG_ANY,
+ "idl_insert_key: idl_store returned %d\n", rc, 0, 0 );
+#endif
+
+ }
+
+ free( k3.dptr );
+
+ id = id2;
+ /* This new id will necessarily be inserted
+ * as the first id of the next block by the
+ * following switch() statement.
+ */
}
switch ( (rc = idl_insert( &tmp2, id,
/* FALL */
case 2: /* id already there - how? */
- case 0: /* id inserted */
+ case 0: /* id inserted: this can never be
+ * the result of idl_insert, because
+ * we guaranteed that idl_change_first
+ * will always be called.
+ */
if ( rc == 2 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "cache", LDAP_LEVEL_INFO,
+ "idl_insert_key: id %ld is already in next block\n",
+ id ));
+#else
Debug( LDAP_DEBUG_ANY,
- "id %ld already in next block\n",
+ "idl_insert_key: id %ld already in next block\n",
id, 0, 0 );
+#endif
+
}
- free( kstr );
+
idl_free( tmp );
idl_free( tmp2 );
idl_free( idl );
case 3: /* split the original block */
break;
}
+
idl_free( tmp2 );
}
+split:
/*
* must split the block, write both new blocks + update
* and write the indirect header block.
*/
+ rc = 0; /* optimistic */
+
+
+#ifndef USE_INDIRECT_NIDS
/* count how many indirect blocks *//* XXX linear count XXX */
for ( j = 0; !ID_BLOCK_NOID(idl, j); j++ )
; /* NULL */
+#else
+ j = ID_BLOCK_NIDS(idl);
+#endif
/* check it against all-id thresholed */
if ( j + 1 > db->dbc_maxindirect ) {
/*
* we've passed the all-id threshold, meaning
* that this set of blocks should be replaced
- * by a single "all-id" block. our job: delete
+ * by a single "all-id" block. our job: delete
* all the indirect blocks, and replace the header
* block by an all-id block.
*/
/* delete all indirect blocks */
+#ifndef USE_INDIRECT_NIDS
for ( j = 0; !ID_BLOCK_NOID(idl, j); j++ ) {
- sprintf( kstr, "%c%s%ld", CONT_PREFIX, key.dptr,
- ID_BLOCK_ID(idl, j) );
- k2.dptr = kstr;
- k2.dsize = strlen( kstr ) + 1;
+#else
+ for ( j = 0; j < ID_BLOCK_NIDS(idl); j++ ) {
+#endif
+ cont_id( &k2, ID_BLOCK_ID(idl, j) );
rc = ldbm_cache_delete( db, k2 );
}
idl = idl_allids( be );
rc = idl_store( be, db, key, idl );
- free( kstr );
+ cont_free( &k2 );
idl_free( idl );
idl_free( tmp );
return( rc );
idl_free( tmp );
/* create a new updated indirect header block */
- tmp = idl_alloc( ID_BLOCK_NMAX(idl) + 1 );
+ tmp = idl_alloc( ID_BLOCK_NMAXN(idl) + 1 );
+#ifndef USE_INDIRECT_NIDS
ID_BLOCK_NIDS(tmp) = ID_BLOCK_INDIRECT_VALUE;
+#else
+ ID_BLOCK_NMAX(tmp) |= ID_BLOCK_INDIRECT_VALUE;
+#endif
/* everything up to the split block */
- SAFEMEMCPY(
+ AC_MEMCPY(
(char *) &ID_BLOCK_ID(tmp, 0),
(char *) &ID_BLOCK_ID(idl, 0),
i * sizeof(ID) );
ID_BLOCK_ID(tmp, i) = ID_BLOCK_ID(tmp2, 0);
ID_BLOCK_ID(tmp, i + 1) = ID_BLOCK_ID(tmp3, 0);
/* everything after the split block */
- SAFEMEMCPY(
+#ifndef USE_INDIRECT_NIDS
+ AC_MEMCPY(
+ (char *) &ID_BLOCK_ID(tmp, i + 2),
+ (char *) &ID_BLOCK_ID(idl, i + 1),
+ (ID_BLOCK_NMAXN(idl) - i - 1) * sizeof(ID) );
+#else
+ AC_MEMCPY(
(char *) &ID_BLOCK_ID(tmp, i + 2),
(char *) &ID_BLOCK_ID(idl, i + 1),
- (ID_BLOCK_NMAX(idl) - i - 1) * sizeof(ID) );
+ (ID_BLOCK_NIDS(idl) - i - 1) * sizeof(ID) );
+ ID_BLOCK_NIDS(idl)++;
+#endif
/* store the header block */
rc = idl_store( be, db, key, tmp );
/* store the first id block */
- sprintf( kstr, "%c%s%ld", CONT_PREFIX, key.dptr,
- ID_BLOCK_ID(tmp2, 0) );
- k2.dptr = kstr;
- k2.dsize = strlen( kstr ) + 1;
+ cont_id( &k2, ID_BLOCK_ID(tmp2, 0) );
rc = idl_store( be, db, k2, tmp2 );
/* store the second id block */
- sprintf( kstr, "%c%s%ld", CONT_PREFIX, key.dptr,
- ID_BLOCK_ID(tmp3, 0) );
- k2.dptr = kstr;
- k2.dsize = strlen( kstr ) + 1;
+ cont_id( &k2, ID_BLOCK_ID(tmp3, 0) );
rc = idl_store( be, db, k2, tmp3 );
idl_free( tmp2 );
break;
}
- free( kstr );
+ cont_free( &k2 );
idl_free( tmp );
idl_free( idl );
return( rc );
* idl_insert - insert an id into an id list.
*
* returns
- * 0 id inserted
+ * 0 id inserted
* 1 id inserted, first id in block has changed
* 2 id not inserted, already there
* 3 id not inserted, block must be split
int
idl_insert( ID_BLOCK **idl, ID id, unsigned int maxids )
{
- unsigned int i, j;
+ unsigned int i;
if ( ID_BLOCK_ALLIDS( *idl ) ) {
return( 2 ); /* already there */
}
- /* is it already there? *//* XXX linear search XXX */
- for ( i = 0; i < ID_BLOCK_NIDS(*idl) && id > ID_BLOCK_ID(*idl, i); i++ ) {
- ; /* NULL */
- }
- if ( i < ID_BLOCK_NIDS(*idl) && ID_BLOCK_ID(*idl, i) == id ) {
+ /* is it already there? */
+ i = idl_find(*idl, id);
+ if ( ID_BLOCK_ID(*idl, i) == id ) {
return( 2 ); /* already there */
}
+ if ( ID_BLOCK_NIDS(*idl) && ID_BLOCK_ID(*idl, i) < id )
+ i++;
/* do we need to make room for it? */
- if ( ID_BLOCK_NIDS(*idl) == ID_BLOCK_NMAX(*idl) ) {
+ if ( ID_BLOCK_NIDS(*idl) == ID_BLOCK_NMAXN(*idl) ) {
/* make room or indicate block needs splitting */
- if ( ID_BLOCK_NMAX(*idl) >= maxids ) {
+ if ( ID_BLOCK_NMAXN(*idl) >= maxids ) {
return( 3 ); /* block needs splitting */
}
ID_BLOCK_NMAX(*idl) *= 2;
- if ( ID_BLOCK_NMAX(*idl) > maxids ) {
+ if ( ID_BLOCK_NMAXN(*idl) > maxids ) {
ID_BLOCK_NMAX(*idl) = maxids;
}
*idl = (ID_BLOCK *) ch_realloc( (char *) *idl,
- (ID_BLOCK_NMAX(*idl) + ID_BLOCK_IDS_OFFSET) * sizeof(ID) );
+ (ID_BLOCK_NMAXN(*idl) + ID_BLOCK_IDS_OFFSET) * sizeof(ID) );
}
/* make a slot for the new id */
- SAFEMEMCPY( &ID_BLOCK_ID(*idl, i), &ID_BLOCK_ID(*idl, i+1),
- ID_BLOCK_NIDS(*idl) - i );
+ AC_MEMCPY( &ID_BLOCK_ID(*idl, i+1), &ID_BLOCK_ID(*idl, i),
+ (ID_BLOCK_NIDS(*idl) - i) * sizeof(ID) );
ID_BLOCK_ID(*idl, i) = id;
ID_BLOCK_NIDS(*idl)++;
(void) memset(
(char *) &ID_BLOCK_ID((*idl), ID_BLOCK_NIDS(*idl)),
'\0',
- (ID_BLOCK_NMAX(*idl) - ID_BLOCK_NIDS(*idl)) * sizeof(ID) );
+ (ID_BLOCK_NMAXN(*idl) - ID_BLOCK_NIDS(*idl)) * sizeof(ID) );
+
+#ifdef LDBM_DEBUG_IDL
+ idl_check(*idl);
+#endif
return( i == 0 ? 1 : 0 ); /* inserted - first id changed or not */
}
int
idl_delete_key (
- Backend *be,
- DBCache *db,
- Datum key,
- ID id
+ Backend *be,
+ DBCache *db,
+ Datum key,
+ ID id
)
{
Datum data;
- ID_BLOCK *idl, *tmp;
+ ID_BLOCK *idl;
unsigned i;
int j, nids;
- char *kstr;
if ( (idl = idl_fetch_one( be, db, key ) ) == NULL )
{
}
if ( ! ID_BLOCK_INDIRECT( idl ) ) {
- for ( i=0; i < ID_BLOCK_NIDS(idl); i++ ) {
- if ( ID_BLOCK_ID(idl, i) == id ) {
- if( --ID_BLOCK_NIDS(idl) == 0 ) {
- ldbm_cache_delete( db, key );
+ i = idl_find(idl, id);
+ if ( ID_BLOCK_ID(idl, i) == id ) {
+ if( --ID_BLOCK_NIDS(idl) == 0 ) {
+ ldbm_cache_delete( db, key );
- } else {
- SAFEMEMCPY (
- &ID_BLOCK_ID(idl, i),
- &ID_BLOCK_ID(idl, i+1),
- (ID_BLOCK_NIDS(idl)-i) * sizeof(ID) );
+ } else {
+ AC_MEMCPY(
+ &ID_BLOCK_ID(idl, i),
+ &ID_BLOCK_ID(idl, i+1),
+ (ID_BLOCK_NIDS(idl)-i) * sizeof(ID) );
- ID_BLOCK_ID(idl, ID_BLOCK_NIDS(idl)) = NOID;
+ ID_BLOCK_ID(idl, ID_BLOCK_NIDS(idl)) = NOID;
- idl_store( be, db, key, idl );
- }
-
- idl_free( idl );
- return 0;
+ idl_store( be, db, key, idl );
}
- /* We didn't find the ID. Hmmm... */
+
+ idl_free( idl );
+ return 0;
}
+ /* We didn't find the ID. Hmmm... */
idl_free( idl );
return -1;
}
/* We have to go through an indirect block and find the ID
in the list of IDL's
*/
+#ifndef USE_INDIRECT_NIDS
for ( nids = 0; !ID_BLOCK_NOID(idl, nids); nids++ )
; /* NULL */
- kstr = (char *) ch_malloc( key.dsize + 20 );
- for ( j = 0; !ID_BLOCK_NOID(idl, j); j++ )
+ cont_alloc( &data, &key );
+
+ for ( j = 0; j<nids; j++ )
+#else
+ nids = ID_BLOCK_NIDS(idl);
+ for ( j = idl_find(idl, id); j >= 0; j = -1) /* execute once */
+#endif
{
- ldbm_datum_init( data );
- sprintf( kstr, "%c%s%ld", CONT_PREFIX, key.dptr, ID_BLOCK_ID(idl, j) );
- data.dptr = kstr;
- data.dsize = strlen( kstr ) + 1;
+ ID_BLOCK *tmp;
+ cont_id( &data, ID_BLOCK_ID(idl, j) );
if ( (tmp = idl_fetch_one( be, db, data )) == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "cache", LDAP_LEVEL_INFO,
+ "idl_delete_key: idl_fetch_one returned NULL\n" ));
+#else
Debug( LDAP_DEBUG_ANY,
- "idl_fetch of (%s) returns NULL\n", data.dptr, 0, 0 );
+ "idl_delete_key: idl_fetch of returned NULL\n", 0, 0, 0 );
+#endif
+
continue;
}
/*
Now try to find the ID in tmp
*/
- for ( i=0; i < ID_BLOCK_NIDS(tmp); i++ )
+
+ i = idl_find(tmp, id);
+ if ( ID_BLOCK_ID(tmp, i) == id )
{
- if ( ID_BLOCK_ID(tmp, i) == id )
- {
- SAFEMEMCPY(
- &ID_BLOCK_ID(tmp, i),
- &ID_BLOCK_ID(tmp, i+1),
- (ID_BLOCK_NIDS(tmp)-(i+1)) * sizeof(ID));
- ID_BLOCK_ID(tmp, ID_BLOCK_NIDS(tmp)-1 ) = NOID;
- ID_BLOCK_NIDS(tmp)--;
-
- if ( ID_BLOCK_NIDS(tmp) ) {
- idl_store ( be, db, data, tmp );
-
- } else {
- ldbm_cache_delete( db, data );
- SAFEMEMCPY(
- &ID_BLOCK_ID(idl, j),
- &ID_BLOCK_ID(idl, j+1),
- (nids-(j+1)) * sizeof(ID));
- ID_BLOCK_ID(idl, nids-1) = NOID;
- nids--;
- if ( ! nids )
- ldbm_cache_delete( db, key );
- else
- idl_store( be, db, key, idl );
- }
- idl_free( tmp );
- free( kstr );
- idl_free( idl );
- return 0;
+ AC_MEMCPY(
+ &ID_BLOCK_ID(tmp, i),
+ &ID_BLOCK_ID(tmp, i+1),
+ (ID_BLOCK_NIDS(tmp)-(i+1)) * sizeof(ID));
+ ID_BLOCK_ID(tmp, ID_BLOCK_NIDS(tmp)-1 ) = NOID;
+ ID_BLOCK_NIDS(tmp)--;
+
+ if ( ID_BLOCK_NIDS(tmp) ) {
+ idl_store ( be, db, data, tmp );
+
+ } else {
+ ldbm_cache_delete( db, data );
+ AC_MEMCPY(
+ &ID_BLOCK_ID(idl, j),
+ &ID_BLOCK_ID(idl, j+1),
+ (nids-(j+1)) * sizeof(ID));
+ ID_BLOCK_ID(idl, nids-1) = NOID;
+ nids--;
+#ifdef USE_INDIRECT_NIDS
+ ID_BLOCK_NIDS(idl)--;
+#endif
+ if ( ! nids )
+ ldbm_cache_delete( db, key );
+ else
+ idl_store( be, db, key, idl );
}
+ idl_free( tmp );
+ cont_free( &data );
+ idl_free( idl );
+ return 0;
}
idl_free( tmp );
}
- free( kstr );
+
+ cont_free( &data );
idl_free( idl );
return -1;
}
return( NULL );
}
- new = idl_alloc( ID_BLOCK_NMAX(idl) );
+ new = idl_alloc( ID_BLOCK_NMAXN(idl) );
- SAFEMEMCPY(
+ AC_MEMCPY(
(char *) new,
(char *) idl,
- (ID_BLOCK_NMAX(idl) + ID_BLOCK_IDS_OFFSET) * sizeof(ID) );
+ (ID_BLOCK_NMAXN(idl) + ID_BLOCK_IDS_OFFSET) * sizeof(ID) );
+
+#ifdef LDBM_DEBUG_IDL
+ idl_check(new);
+#endif
return( new );
}
n = idl_dup( idl_min( a, b ) );
+#ifdef LDBM_DEBUG_IDL
+ idl_check(a);
+ idl_check(b);
+#endif
+
for ( ni = 0, ai = 0, bi = 0; ai < ID_BLOCK_NIDS(a); ai++ ) {
for ( ;
bi < ID_BLOCK_NIDS(b) && ID_BLOCK_ID(b, bi) < ID_BLOCK_ID(a, ai);
}
ID_BLOCK_NIDS(n) = ni;
+#ifdef LDBM_DEBUG_IDL
+ idl_check(n);
+#endif
+
return( n );
}
return( idl_allids( be ) );
}
+#ifdef LDBM_DEBUG_IDL
+ idl_check(a);
+ idl_check(b);
+#endif
+
if ( ID_BLOCK_NIDS(b) < ID_BLOCK_NIDS(a) ) {
n = a;
a = b;
}
ID_BLOCK_NIDS(n) = ni;
+#ifdef LDBM_DEBUG_IDL
+ idl_check(n);
+#endif
+
return( n );
}
ID_BLOCK *
idl_notin(
Backend *be,
- ID_BLOCK *a,
- ID_BLOCK *b
+ ID_BLOCK *a,
+ ID_BLOCK *b
)
{
unsigned int ni, ai, bi;
ni = 0;
for ( ai = 1, bi = 0;
- ai < ID_BLOCK_NIDS(a) && ni < ID_BLOCK_NMAX(n) && bi < ID_BLOCK_NMAX(b);
+ ai < ID_BLOCK_NIDS(a) && ni < ID_BLOCK_NMAXN(n) && bi < ID_BLOCK_NMAXN(b);
ai++ )
{
if ( ID_BLOCK_ID(b, bi) == ai ) {
}
}
- for ( ; ai < ID_BLOCK_NIDS(a) && ni < ID_BLOCK_NMAX(n); ai++ ) {
+ for ( ; ai < ID_BLOCK_NIDS(a) && ni < ID_BLOCK_NMAXN(n); ai++ ) {
ID_BLOCK_ID(n, ni++) = ai;
}
- if ( ni == ID_BLOCK_NMAX(n) ) {
+ if ( ni == ID_BLOCK_NMAXN(n) ) {
idl_free( n );
return( idl_allids( be ) );
} else {
}
ID_BLOCK_NIDS(n) = ni;
+#ifdef LDBM_DEBUG_IDL
+ idl_check(n);
+#endif
+
return( n );
}
* otherwise return first ID
*
* cursor is set to 1
- */
+ */
ID
idl_firstid( ID_BLOCK *idl, ID *cursor )
{
projects / openldap / blobdiff