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

diff --git a/servers/slapd/back-bdb/key.c b/servers/slapd/back-bdb/key.c
index 95109daa08..37fe1219e0 100644
--- a/servers/slapd/back-bdb/key.c
+++ b/servers/slapd/back-bdb/key.c
@@ -1,8 +1,17 @@
 /* index.c - routines for dealing with attribute indexes */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 2000-2006 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -14,92 +23,82 @@
 
 #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,
+	DBC **saved_cursor,
+	int get_flag
 )
 {
-	Datum		key;
-	ID_BLOCK		*idl;
+	int rc;
+	DBT key;
 
-#ifdef NEW_LOGGING
-	LDAP_LOG(( "index", LDAP_LEVEL_ENTRY,
-		   "key_read: enter\n" ));
-#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, saved_cursor, get_flag );
 
-#ifdef NEW_LOGGING
-	LDAP_LOG(( "index", LDAP_LEVEL_ENTRY,
-		   "key_read: %ld candidates\n",
-		   idl ? ID_BLOCK_NIDS(idl) : 0 ));
-#else
-	Debug( LDAP_DEBUG_TRACE, "<= index_read %ld candidates\n",
-	       idl ? ID_BLOCK_NIDS(idl) : 0, 0, 0 );
-#endif
+	if( rc != LDAP_SUCCESS ) {
+		Debug( LDAP_DEBUG_TRACE, "<= bdb_index_read: failed (%d)\n",
+			rc, 0, 0 );
+	} else {
+		Debug( LDAP_DEBUG_TRACE, "<= bdb_index_read %ld candidates\n",
+			(long) BDB_IDL_N(ids), 0, 0 );
+	}
 
-	*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 ));
-#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 */
 
+#ifdef BDB_TOOL_IDL_CACHING
+		if ( slapMode & SLAP_TOOL_QUICK )
+			rc = bdb_tool_idl_add( be, db, txn, &key, id );
+		else
+#endif
+			rc = bdb_idl_insert_key( be, db, txn, &key, id );
+		if ( rc == DB_KEYEXIST ) rc = 0;
 	} 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 );
+		if ( rc == DB_NOTFOUND ) rc = 0;
 	}
 
-#ifdef NEW_LOGGING
-	LDAP_LOG(( "index", LDAP_LEVEL_ENTRY,
-		"key_change: return %d\n", rc ));
-#else
 	Debug( LDAP_DEBUG_TRACE, "<= key_change %d\n", rc, 0, 0 );
-#endif
 
 	return rc;
 }
-#endif