#include <ac/string.h>
#include <ac/socket.h>
-#include "slap.h"
#include "ldapconfig.h"
+#include "slap.h"
#include "back-ldbm.h"
-extern Datum ldbm_cache_fetch();
-
IDList *
idl_alloc( int nids )
{
Datum data;
IDList *idl;
-#ifdef HAVE_BERKELEY_DB2
- Datum k2;
- memset( &k2, 0, sizeof( k2 ) );
- memset( &data, 0, sizeof( data ) );
-#endif
+ ldbm_datum_init( data );
/* Debug( LDAP_DEBUG_TRACE, "=> idl_fetch_one\n", 0, 0, 0 ); */
char *kstr;
int i, nids;
-#ifdef HAVE_BERKELEY_DB2
- memset( &k2, 0, sizeof( k2 ) );
- memset( &data, 0, sizeof( data ) );
-#endif
+ ldbm_datum_init( k2 );
+ ldbm_datum_init( data );
/* Debug( LDAP_DEBUG_TRACE, "=> idl_fetch\n", 0, 0, 0 ); */
}
free( (char *) tmp );
- Debug( LDAP_DEBUG_TRACE, "<= idl_fetch %d ids (%d max)\n", idl->b_nids,
- idl->b_nmax, 0 );
+ Debug( LDAP_DEBUG_TRACE, "<= idl_fetch %lu ids (%lu max)\n",
+ idl->b_nids, idl->b_nmax, 0 );
return( idl );
}
Datum data;
struct ldbminfo *li = (struct ldbminfo *) be->be_private;
-#ifdef HAVE_BERKELEY_DB2
- memset( &data, 0, sizeof( data ) );
-#endif
+ ldbm_datum_init( data );
/* Debug( LDAP_DEBUG_TRACE, "=> idl_store\n", 0, 0, 0 ); */
#endif
flags = LDBM_REPLACE;
- if( li->li_flush_wrt ) flags |= LDBM_SYNC;
+ 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 ); */
char *kstr;
Datum k2;
-#ifdef HAVE_BERKELEY_DB2
- memset( &k2, 0, sizeof( k2 ) );
-#endif
+ ldbm_datum_init( k2 );
if ( (idl = idl_fetch_one( be, db, key )) == NULL ) {
#ifdef LDBM_DEBUG
case 0: /* id inserted */
if ( rc == 2 ) {
Debug( LDAP_DEBUG_ANY,
- "id %d already in next block\n",
+ "id %lu already in next block\n",
id, 0, 0 );
}
free( kstr );
return( i == 0 ? 1 : 0 ); /* inserted - first id changed or not */
}
+int
+idl_delete_key (
+ Backend *be,
+ struct dbcache *db,
+ Datum key,
+ ID id
+)
+{
+ Datum k2;
+ IDList *idl, *tmp;
+ unsigned i;
+ int j, nids;
+ char *kstr;
+
+ if ( (idl = idl_fetch_one( be, db, key ) ) == NULL )
+ {
+ /* It wasn't found. Hmm... */
+ return -1;
+ }
+
+ if ( ! INDIRECT_BLOCK( idl ) )
+ {
+ for ( i=0; i < idl->b_nids; i++ )
+ {
+ if ( idl->b_ids[i] == id )
+ {
+ memcpy ( &idl->b_ids[i], &idl->b_ids[i+1], sizeof(ID)*(idl->b_nids-(i+1)));
+ idl->b_ids[idl->b_nids-1] = NOID;
+ idl->b_nids--;
+ if ( idl->b_nids )
+ idl_store( be, db, key, idl );
+ else
+ ldbm_cache_delete( db, key );
+ return 0;
+ }
+ /* We didn't find the ID. Hmmm... */
+ }
+ return -1;
+ }
+
+ /* We have to go through an indirect block and find the ID
+ in the list of IDL's
+ */
+ for ( nids = 0; idl->b_ids[nids] != NOID; nids++ )
+ ; /* NULL */
+ kstr = (char *) ch_malloc( key.dsize + 20 );
+ for ( j = 0; idl->b_ids[j] != NOID; j++ )
+ {
+ ldbm_datum_init( k2 );
+ sprintf( kstr, "%c%s%ld", CONT_PREFIX, key.dptr, idl->b_ids[j] );
+ k2.dptr = kstr;
+ k2.dsize = strlen( kstr ) + 1;
+
+ if ( (tmp = idl_fetch_one( be, db, k2 )) == NULL ) {
+ Debug( LDAP_DEBUG_ANY,
+ "idl_fetch of (%s) returns NULL\n", k2.dptr, 0, 0 );
+ continue;
+ }
+ /*
+ Now try to find the ID in tmp
+ */
+ for ( i=0; i < tmp->b_nids; i++ )
+ {
+ if ( tmp->b_ids[i] == id )
+ {
+ memcpy ( &tmp->b_ids[i], &tmp->b_ids[i+1], sizeof(ID)*(tmp->b_nids-(i+1)));
+ tmp->b_ids[tmp->b_nids-1] = NOID;
+ tmp->b_nids--;
+ if ( tmp->b_nids )
+ idl_store ( be, db, k2, tmp );
+ else
+ {
+ ldbm_cache_delete( db, k2 );
+ memcpy ( &idl->b_ids[j], &idl->b_ids[j+1], sizeof(ID)*(nids-(j+1)));
+ idl->b_ids[nids-1] = NOID;
+ nids--;
+ if ( ! nids )
+ ldbm_cache_delete( db, key );
+ else
+ idl_store( be, db, key, idl );
+ }
+ return 0;
+ }
+ }
+ }
+ return -1;
+}
+
static IDList *
idl_dup( IDList *idl )
{