#include <ac/string.h>
#include <ac/socket.h>
-#include "ldapconfig.h"
+#include "ldap_defaults.h"
#include "slap.h"
#include "back-ldbm.h"
+static ID_BLOCK* idl_dup( ID_BLOCK *idl );
+
+/* Allocate an ID_BLOCK with room for nids ids */
ID_BLOCK *
-idl_alloc( int nids )
+idl_alloc( unsigned int nids )
{
ID_BLOCK *new;
return( new );
}
+
+/* Allocate an empty ALLIDS ID_BLOCK */
ID_BLOCK *
idl_allids( Backend *be )
{
return( idl );
}
+
+/* Free an ID_BLOCK */
void
idl_free( ID_BLOCK *idl )
{
if ( idl == NULL ) {
+ Debug( LDAP_DEBUG_TRACE,
+ "idl_free: called with NULL pointer\n",
+ 0, 0, 0 );
return;
}
free( (char *) idl );
}
+
+/* Fetch an single ID_BLOCK from the cache */
static ID_BLOCK *
idl_fetch_one(
Backend *be,
- struct dbcache *db,
+ DBCache *db,
Datum key
)
{
data = ldbm_cache_fetch( db, key );
- idl = (ID_BLOCK *) data.dptr;
+ if( data.dptr == NULL ) {
+ return NULL;
+ }
+
+ idl = idl_dup( (ID_BLOCK *) data.dptr);
+ ldbm_datum_free( db->dbc_db, data );
return( idl );
}
+
+/* Fetch a set of ID_BLOCKs from the cache
+ * if not INDIRECT
+ * if block return is an ALLIDS block,
+ * return an new ALLIDS block
+ * otherwise
+ * return block
+ * construct super block from all blocks referenced by INDIRECT block
+ * return super block
+ */
ID_BLOCK *
idl_fetch(
Backend *be,
- struct dbcache *db,
+ DBCache *db,
Datum key
)
{
- Datum data, k2;
+ Datum data;
ID_BLOCK *idl;
ID_BLOCK **tmp;
char *kstr;
int i, nids;
- ldbm_datum_init( k2 );
- ldbm_datum_init( data );
+ idl = idl_fetch_one( be, db, key );
- /* Debug( LDAP_DEBUG_TRACE, "=> idl_fetch\n", 0, 0, 0 ); */
+ if ( idl == NULL ) {
+ return NULL;
+ }
- data = ldbm_cache_fetch( db, key );
+ if ( ID_BLOCK_ALLIDS(idl) ) {
+ /* all ids block */
+ /* make sure we have the current value of highest id */
+ idl_free( idl );
+ idl = idl_allids( be );
- if ( (idl = (ID_BLOCK *) data.dptr) == NULL ) {
- return( NULL );
+ return( idl );
}
- /* regular block */
if ( ! ID_BLOCK_INDIRECT( idl ) ) {
- /*
- Debug( LDAP_DEBUG_TRACE, "<= idl_fetch %d ids (%d max)\n",
- ID_BLOCK_NIDS(idl), ID_BLOCK_NMAX(idl), 0 );
- */
-
- /* make sure we have the current value of highest id */
- if ( ID_BLOCK_ALLIDS(idl) ) {
- idl_free( idl );
- idl = idl_allids( be );
- }
+ /* regular block */
return( idl );
}
kstr = (char *) ch_malloc( key.dsize + 20 );
nids = 0;
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) );
- k2.dptr = kstr;
- k2.dsize = strlen( kstr ) + 1;
+ data.dptr = kstr;
+ data.dsize = strlen( kstr ) + 1;
- if ( (tmp[i] = idl_fetch_one( be, db, k2 )) == NULL ) {
+ if ( (tmp[i] = idl_fetch_one( be, db, data )) == NULL ) {
Debug( LDAP_DEBUG_ANY,
- "idl_fetch of (%s) returns NULL\n", k2.dptr, 0, 0 );
+ "idl_fetch of (%s) returns NULL\n", data.dptr, 0, 0 );
continue;
}
nids += ID_BLOCK_NIDS(tmp[i]);
}
tmp[i] = NULL;
+ free( kstr );
idl_free( idl );
/* allocate space for the big block */
}
free( (char *) tmp );
- Debug( LDAP_DEBUG_TRACE, "<= idl_fetch %lu ids (%lu max)\n",
+ Debug( LDAP_DEBUG_TRACE, "<= idl_fetch %ld ids (%ld max)\n",
ID_BLOCK_NIDS(idl), ID_BLOCK_NMAX(idl), 0 );
return( idl );
}
+
+/* store a single block */
static int
idl_store(
Backend *be,
- struct dbcache *db,
+ DBCache *db,
Datum key,
ID_BLOCK *idl
)
return( rc );
}
+
+/* split the block at id
+ * locate ID greater than or equal to id.
+ */
static void
idl_split_block(
ID_BLOCK *b,
ID id,
- ID_BLOCK **n1,
- ID_BLOCK **n2
+ ID_BLOCK **right,
+ ID_BLOCK **left
)
{
- unsigned int i;
+ unsigned int nr, nl;
- /* find where to split the block */
- for ( i = 0; i < ID_BLOCK_NIDS(b) && id > ID_BLOCK_ID(b, i); i++ )
+ /* 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 */
- *n1 = idl_alloc( i == 0 ? 1 : i );
- *n2 = idl_alloc( ID_BLOCK_NIDS(b) - i + (i == 0 ? 0 : 1));
+ nl = ID_BLOCK_NIDS(b) - nr;
+
+ *right = idl_alloc( nr == 0 ? 1 : nr );
+ *left = idl_alloc( nl + (nr == 0 ? 0 : 1));
/*
* everything before the id being inserted in the first block
* unless there is nothing, in which case the id being inserted
* goes there.
*/
- SAFEMEMCPY(
- (char *) &ID_BLOCK_ID(*n1, 0),
- (char *) &ID_BLOCK_ID(b, 0),
- i * sizeof(ID) );
- ID_BLOCK_NIDS(*n1) = (i == 0 ? 1 : i);
-
- if ( i == 0 ) {
- ID_BLOCK_ID(*n1, 0) = id;
+ if ( nr == 0 ) {
+ ID_BLOCK_NIDS(*right) = 1;
+ ID_BLOCK_ID(*right, 0) = id;
} else {
- ID_BLOCK_ID(*n2, 0) = id;
+ SAFEMEMCPY(
+ (char *) &ID_BLOCK_ID(*right, 0),
+ (char *) &ID_BLOCK_ID(b, 0),
+ nr * sizeof(ID) );
+ ID_BLOCK_NIDS(*right) = nr;
+ ID_BLOCK_ID(*left, 0) = id;
}
/* the id being inserted & everything after in the second block */
SAFEMEMCPY(
- (char *) &ID_BLOCK_ID(*n2, (i == 0 ? 0 : 1)),
- (char *) &ID_BLOCK_ID(b, i),
- (ID_BLOCK_NIDS(b) - i) * sizeof(ID) );
- ID_BLOCK_NIDS(*n2) = ID_BLOCK_NIDS(b) - i + (i == 0 ? 0 : 1);
+ (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);
}
+
/*
* idl_change_first - called when an indirect block's first key has
* changed, meaning it needs to be stored under a new key, and the
* header block pointing to it needs updating.
*/
-
static int
idl_change_first(
Backend *be,
- struct dbcache *db,
+ DBCache *db,
Datum hkey, /* header block key */
ID_BLOCK *h, /* header block */
int pos, /* pos in h to update */
return( 0 );
}
+
int
idl_insert_key(
Backend *be,
- struct dbcache *db,
+ DBCache *db,
Datum key,
ID id
)
return( rc );
}
- /* regular block */
+ if ( ID_BLOCK_ALLIDS( idl ) ) {
+ /* ALLIDS */
+ idl_free( idl );
+ return 0;
+ }
+
if ( ! ID_BLOCK_INDIRECT( idl ) ) {
+ /* regular block */
switch ( idl_insert( &idl, id, db->dbc_maxids ) ) {
case 0: /* id inserted - store the updated block */
case 1:
idl_free( idl );
idl = idl_allids( be );
rc = idl_store( be, db, key, idl );
- idl_free( idl );
-
- return( rc );
+ break;
}
idl_split_block( idl, id, &tmp, &tmp2 );
* need to write a new "header" block.
*/
- /* select the block to try inserting into */
+ /* 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 */
if ( i != 0 ) {
if ( (tmp = idl_fetch_one( be, db, k2 )) == NULL ) {
Debug( LDAP_DEBUG_ANY, "nonexistent continuation block (%s)\n",
k2.dptr, 0, 0 );
+ free( kstr );
+ idl_free( idl );
return( -1 );
}
case 0: /* id inserted */
if ( rc == 2 ) {
Debug( LDAP_DEBUG_ANY,
- "id %lu already in next block\n",
+ "id %ld already in next block\n",
id, 0, 0 );
}
free( kstr );
return( 0 );
case 3: /* split the original block */
- idl_free( tmp2 );
break;
}
-
+ idl_free( tmp2 );
}
/*
* and write the indirect header block.
*/
- /* count how many indirect blocks */
+ /* count how many indirect blocks *//* XXX linear count XXX */
for ( j = 0; !ID_BLOCK_NOID(idl, j); j++ )
; /* NULL */
return( rc );
}
+
/*
* idl_insert - insert an id into an id list.
- * returns 0 id inserted
+ *
+ * returns
+ * 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, int maxids )
+idl_insert( ID_BLOCK **idl, ID id, unsigned int maxids )
{
unsigned int i, j;
return( 2 ); /* already there */
}
- /* is it already there? XXX bin search XXX */
+ /* is it already there? *//* XXX linear search XXX */
for ( i = 0; i < ID_BLOCK_NIDS(*idl) && id > ID_BLOCK_ID(*idl, i); i++ ) {
; /* NULL */
}
(ID_BLOCK_NMAX(*idl) + ID_BLOCK_IDS_OFFSET) * sizeof(ID) );
}
- /* make a slot for the new id */
+ /* make a slot for the new id *//* XXX bubble move XXX */
for ( j = ID_BLOCK_NIDS(*idl); j != i; j-- ) {
ID_BLOCK_ID(*idl, j) = ID_BLOCK_ID(*idl, j-1);
}
return( i == 0 ? 1 : 0 ); /* inserted - first id changed or not */
}
+
int
idl_delete_key (
Backend *be,
- struct dbcache *db,
+ DBCache *db,
Datum key,
ID id
)
{
- Datum k2;
+ Datum data;
ID_BLOCK *idl, *tmp;
unsigned i;
int j, nids;
return -1;
}
- if ( ! ID_BLOCK_INDIRECT( idl ) )
- {
- for ( i=0; i < ID_BLOCK_NIDS(idl); i++ )
- {
- if ( ID_BLOCK_ID(idl, i) == id )
- {
- SAFEMEMCPY (
- &ID_BLOCK_ID(idl, i),
- &ID_BLOCK_ID(idl, i+1),
- (ID_BLOCK_NIDS(idl)-(i+1)) * sizeof(ID) );
+ if ( ID_BLOCK_ALLIDS( idl ) ) {
+ idl_free( idl );
+ return 0;
+ }
+
+ 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 );
+
+ } else {
+ SAFEMEMCPY (
+ &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)-1) = NOID;
- ID_BLOCK_NIDS(idl)--;
+ ID_BLOCK_ID(idl, ID_BLOCK_NIDS(idl)) = NOID;
- if ( ID_BLOCK_NIDS(idl) )
idl_store( be, db, key, idl );
- else
- ldbm_cache_delete( db, key );
+ }
+
+ idl_free( idl );
return 0;
}
/* We didn't find the ID. Hmmm... */
}
+ idl_free( idl );
return -1;
}
for ( j = 0; !ID_BLOCK_NOID(idl, j); j++ )
{
- ldbm_datum_init( k2 );
+ ldbm_datum_init( data );
sprintf( kstr, "%c%s%ld", CONT_PREFIX, key.dptr, ID_BLOCK_ID(idl, j) );
- k2.dptr = kstr;
- k2.dsize = strlen( kstr ) + 1;
+ data.dptr = kstr;
+ data.dsize = strlen( kstr ) + 1;
- if ( (tmp = idl_fetch_one( be, db, k2 )) == NULL ) {
+ if ( (tmp = idl_fetch_one( be, db, data )) == NULL ) {
Debug( LDAP_DEBUG_ANY,
- "idl_fetch of (%s) returns NULL\n", k2.dptr, 0, 0 );
+ "idl_fetch of (%s) returns NULL\n", data.dptr, 0, 0 );
continue;
}
/*
(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, k2, tmp );
- else
- {
- ldbm_cache_delete( db, k2 );
+
+ 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),
else
idl_store( be, db, key, idl );
}
+ idl_free( tmp );
+ free( kstr );
+ idl_free( idl );
return 0;
}
}
+ idl_free( tmp );
}
+ free( kstr );
+ idl_free( idl );
return -1;
}
+
+/* return a duplicate of a single ID_BLOCK */
static ID_BLOCK *
idl_dup( ID_BLOCK *idl )
{
return( new );
}
+
+/* return the smaller ID_BLOCK */
static ID_BLOCK *
idl_min( ID_BLOCK *a, ID_BLOCK *b )
{
return( ID_BLOCK_NIDS(a) > ID_BLOCK_NIDS(b) ? b : a );
}
+
/*
* idl_intersection - return a intersection b
*/
-
ID_BLOCK *
idl_intersection(
Backend *be,
n = idl_dup( idl_min( a, b ) );
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); bi++ )
+ for ( ;
+ bi < ID_BLOCK_NIDS(b) && ID_BLOCK_ID(b, bi) < ID_BLOCK_ID(a, ai);
+ bi++ )
+ {
; /* NULL */
+ }
if ( bi == ID_BLOCK_NIDS(b) ) {
break;
return( n );
}
+
/*
* idl_union - return a union b
*/
-
ID_BLOCK *
idl_union(
Backend *be,
n = idl_alloc( ID_BLOCK_NIDS(a) + ID_BLOCK_NIDS(b) );
- for ( ni = 0, ai = 0, bi = 0; ai < ID_BLOCK_NIDS(a) && bi < ID_BLOCK_NIDS(b); ) {
+ for ( ni = 0, ai = 0, bi = 0;
+ ai < ID_BLOCK_NIDS(a) && bi < ID_BLOCK_NIDS(b);
+ )
+ {
if ( ID_BLOCK_ID(a, ai) < ID_BLOCK_ID(b, bi) ) {
ID_BLOCK_ID(n, ni++) = ID_BLOCK_ID(a, ai++);
return( n );
}
+
/*
* idl_notin - return a intersection ~b (or a minus b)
*/
-
ID_BLOCK *
idl_notin(
Backend *be,
return( n );
}
+/* return the first ID in the block
+ * if ALLIDS block
+ * NIDS > 1 return 1
+ * otherwise return NOID
+ * otherwise return first ID
+ */
ID
idl_firstid( ID_BLOCK *idl )
{
return( ID_BLOCK_ID(idl, 0) );
}
+/* return next ID after id
+ * if ALLIDS block, increment id.
+ * if id < NIDS return id
+ * otherwise NOID.
+ * otherwise SEARCH for next id (ugh!)
+ */
ID
idl_nextid( ID_BLOCK *idl, ID id )
{
projects / openldap / blobdiff