X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fkey.c;h=46371dc519125a00ceb0e0b604787f1bda7c1662;hb=c5b6a86502dc0c16027cd87e3d9544e9078083db;hp=95109daa085ed0cfbff0cc89a12d95864e60f190;hpb=5160da05e533ead252525894414dfead55300ff8;p=openldap

diff --git a/servers/slapd/back-bdb/key.c b/servers/slapd/back-bdb/key.c
index 95109daa08..46371dc519 100644
--- a/servers/slapd/back-bdb/key.c
+++ b/servers/slapd/back-bdb/key.c
@@ -1,7 +1,7 @@
 /* index.c - routines for dealing with attribute indexes */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -14,92 +14,95 @@
 
 #include "slap.h"
 #include "back-bdb.h"
+#include "idl.h"
 
-#ifdef BDB_FILTER_INDICES
 /* read a key */
 int
 bdb_key_read(
-    Backend	*be,
+	Backend	*be,
 	DB *db,
 	DB_TXN *txn,
-    struct berval *k,
-	ID **idout
+	struct berval *k,
+	ID *ids
 )
 {
-	Datum		key;
-	ID_BLOCK		*idl;
+	int rc;
+	DBT key;
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "index", LDAP_LEVEL_ENTRY,
-		   "key_read: enter\n" ));
+	LDAP_LOG( INDEX, ENTRY, "key_read: enter\n", 0, 0, 0 );
 #else
 	Debug( LDAP_DEBUG_TRACE, "=> key_read\n", 0, 0, 0 );
 #endif
 
-	ldbm_datum_init( key );
-	key.dptr = k->bv_val;
-	key.dsize = k->bv_len;
+	DBTzero( &key );
+	bv2DBT(k,&key);
+	key.ulen = key.size;
+	key.flags = DB_DBT_USERMEM;
 
-	rc = bdb_idl_fetch_key( be, db, key, idl );
+	rc = bdb_idl_fetch_key( be, db, txn, &key, ids );
 
+	if( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG( INDEX, ERR, "bdb_key_read: failed (%d)\n", rc, 0, 0 );
+#else
+		Debug( LDAP_DEBUG_TRACE, "<= bdb_index_read: failed (%d)\n",
+			rc, 0, 0 );
+#endif
+	} else {
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "index", LDAP_LEVEL_ENTRY,
-		   "key_read: %ld candidates\n",
-		   idl ? ID_BLOCK_NIDS(idl) : 0 ));
+		LDAP_LOG( INDEX, DETAIL1, 
+			"bdb_key_read: %ld candidates\n", (long)BDB_IDL_N(ids), 0, 0);
 #else
-	Debug( LDAP_DEBUG_TRACE, "<= index_read %ld candidates\n",
-	       idl ? ID_BLOCK_NIDS(idl) : 0, 0, 0 );
+		Debug( LDAP_DEBUG_TRACE, "<= bdb_index_read %ld candidates\n",
+			(long) BDB_IDL_N(ids), 0, 0 );
 #endif
+	}
 
-	*idout = idl;
-	return LDAP_SUCCESS;
+	return rc;
 }
-#endif
 
-#ifdef BDB_INDEX
 /* Add or remove stuff from index files */
 int
 bdb_key_change(
-    Backend *be,
-    DB *db,
+	Backend *be,
+	DB *db,
 	DB_TXN *txn,
-    struct berval *k,
-    ID id,
-    int op
+	struct berval *k,
+	ID id,
+	int op
 )
 {
 	int	rc;
 	DBT	key;
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "index", LDAP_LEVEL_ENTRY,
-		"key_change: %s ID %lx\n",
-		op == SLAP_INDEX_ADD_OP ? "Add" : "Delete", (long)id ));
+	LDAP_LOG( INDEX, ENTRY, "key_change: %s ID %lx\n",
+		op == SLAP_INDEX_ADD_OP ? "Add" : "Delete", (long) id, 0 );
 #else
 	Debug( LDAP_DEBUG_TRACE, "=> key_change(%s,%lx)\n",
 		op == SLAP_INDEX_ADD_OP ? "ADD":"DELETE", (long) id, 0 );
 #endif
 
 	DBTzero( &key );
-	key.data = k->bv_val;
-	key.size = k->bv_len;
+	bv2DBT(k,&key);
+	key.ulen = key.size;
+	key.flags = DB_DBT_USERMEM;
 
 	if (op == SLAP_INDEX_ADD_OP) {
-	    /* Add values */
-	    rc = bdb_idl_insert_key( be, db, txn, &key, id );
+		/* Add values */
+		rc = bdb_idl_insert_key( be, db, txn, &key, id );
 
 	} else {
-	    /* Delete values */
-	    rc = bdb_idl_delete_key( be, db, txn, &key, id );
+		/* Delete values */
+		rc = bdb_idl_delete_key( be, db, txn, &key, id );
 	}
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "index", LDAP_LEVEL_ENTRY,
-		"key_change: return %d\n", rc ));
+	LDAP_LOG( INDEX, RESULTS, "key_change: return %d\n", rc, 0, 0 );
 #else
 	Debug( LDAP_DEBUG_TRACE, "<= key_change %d\n", rc, 0, 0 );
 #endif
 
 	return rc;
 }
-#endif