Initial step of index files fix, more tomorrow.

[openldap] / servers / slapd / back-ldbm / dn2id.c

diff --git a/servers/slapd/back-ldbm/dn2id.c b/servers/slapd/back-ldbm/dn2id.c
index c4116086b00d5aab3d143a14f045956a3737c51d..683d30a2e56c4019e6c484bb812c0d6d140790ab 100644 (file)
--- a/servers/slapd/back-ldbm/dn2id.c
+++ b/servers/slapd/back-ldbm/dn2id.c
@@ -1,17 +1,15 @@
 /* dn2id.c - routines to deal with the dn2id index */
 
+#include "portable.h"
+
 #include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/socket.h>
+
+#include <ac/string.h>
+#include <ac/socket.h>
+
 #include "slap.h"
 #include "back-ldbm.h"
-
-extern struct dbcache  *ldbm_cache_open();
-extern Entry           *cache_find_entry_dn();
-extern Entry           *id2entry();
-extern char            *dn_parent();
-extern Datum           ldbm_cache_fetch();
+#include "proto-back-ldbm.h"
 
 int
 dn2id_add(
@@ -20,9 +18,13 @@ dn2id_add(
     ID         id
 )
 {
-       int             rc;
+       int             rc, flags;
        struct dbcache  *db;
        Datum           key, data;
+       struct ldbminfo *li = (struct ldbminfo *) be->be_private;
+
+       ldbm_datum_init( key );
+       ldbm_datum_init( data );
 
        Debug( LDAP_DEBUG_TRACE, "=> dn2id_add( \"%s\", %ld )\n", dn, id, 0 );
 
@@ -33,7 +35,7 @@ dn2id_add(
                return( -1 );
        }
 
-       dn = strdup( dn );
+       dn = ch_strdup( dn );
        dn_normalize_case( dn );
 
        key.dptr = dn;
@@ -41,7 +43,10 @@ dn2id_add(
        data.dptr = (char *) &id;
        data.dsize = sizeof(ID);
 
-       rc = ldbm_cache_store( db, key, data, LDBM_INSERT );
+       flags = LDBM_INSERT;
+       if ( li->li_dbcachewsync ) flags |= LDBM_SYNC;
+
+       rc = ldbm_cache_store( db, key, data, flags );
 
        free( dn );
        ldbm_cache_close( be, db );
@@ -58,31 +63,29 @@ dn2id(
 {
        struct ldbminfo *li = (struct ldbminfo *) be->be_private;
        struct dbcache  *db;
-       Entry           *e;
        ID              id;
        Datum           key, data;
 
-       Debug( LDAP_DEBUG_TRACE, "=> dn2id( \"%s\" )\n", dn, 0, 0 );
+       ldbm_datum_init( key );
+       ldbm_datum_init( data );
 
-       dn = strdup( dn );
+       dn = ch_strdup( dn );
+       Debug( LDAP_DEBUG_TRACE, "=> dn2id( \"%s\" )\n", dn, 0, 0 );
        dn_normalize_case( dn );
 
        /* first check the cache */
-       if ( (e = cache_find_entry_dn( &li->li_cache, dn )) != NULL ) {
-               id = e->e_id;
+       if ( (id = cache_find_entry_dn2id( be, &li->li_cache, dn )) != NOID ) {
                free( dn );
-               Debug( LDAP_DEBUG_TRACE, "<= dn2id %d (in cache)\n", e->e_id,
-                   0, 0 );
-               cache_return_entry( &li->li_cache, e );
-
+               Debug( LDAP_DEBUG_TRACE, "<= dn2id %lu (in cache)\n", id,
+                       0, 0 );
                return( id );
        }
 
        if ( (db = ldbm_cache_open( be, "dn2id", LDBM_SUFFIX, LDBM_WRCREAT ))
-           == NULL ) {
+               == NULL ) {
                free( dn );
                Debug( LDAP_DEBUG_ANY, "<= dn2id could not open dn2id%s\n",
-                   LDBM_SUFFIX, 0, 0 );
+                       LDBM_SUFFIX, 0, 0 );
                return( NOID );
        }
 
@@ -103,7 +106,7 @@ dn2id(
 
        ldbm_datum_free( db->dbc_db, data );
 
-       Debug( LDAP_DEBUG_TRACE, "<= dn2id %d\n", id, 0, 0 );
+       Debug( LDAP_DEBUG_TRACE, "<= dn2id %lu\n", id, 0, 0 );
        return( id );
 }
 
@@ -118,6 +121,8 @@ dn2id_delete(
        Datum           key;
        int             rc;
 
+       ldbm_datum_init( key );
+
        Debug( LDAP_DEBUG_TRACE, "=> dn2id_delete( \"%s\" )\n", dn, 0, 0 );
 
        if ( (db = ldbm_cache_open( be, "dn2id", LDBM_SUFFIX, LDBM_WRCREAT ))
@@ -128,12 +133,15 @@ dn2id_delete(
                return( -1 );
        }
 
+       dn = ch_strdup( dn );
        dn_normalize_case( dn );
        key.dptr = dn;
        key.dsize = strlen( dn ) + 1;
 
        rc = ldbm_cache_delete( db, key );
 
+       free( dn );
+
        ldbm_cache_close( be, db );
 
        Debug( LDAP_DEBUG_TRACE, "<= dn2id_delete %d\n", rc, 0, 0 );
@@ -145,23 +153,37 @@ dn2id_delete(
  * entry.
  */
 
-Entry *
+static Entry *
 dn2entry(
     Backend    *be,
     char       *dn,
-    char       **matched
+    char       **matched,
+    int         rw
 )
 {
        struct ldbminfo *li = (struct ldbminfo *) be->be_private;
        ID              id;
-       Entry           *e;
+       Entry           *e = NULL;
        char            *pdn;
 
-       if ( (id = dn2id( be, dn )) != NOID && (e = id2entry( be, id ))
-           != NULL ) {
+       Debug(LDAP_DEBUG_TRACE, "dn2entry_%s: dn: \"%s\"\n",
+               rw ? "w" : "r", dn, 0);
+
+       *matched = NULL;
+
+       if ( (id = dn2id( be, dn )) != NOID &&
+               (e = id2entry( be, id, rw )) != NULL )
+       {
                return( e );
        }
-       *matched = NULL;
+
+       if ( id != NOID ) {
+               Debug(LDAP_DEBUG_ANY,
+                       "dn2entry_%s: no entry for valid id (%lu), dn \"%s\"\n",
+                       rw ? "w" : "r", id, dn);
+               /* must have been deleted from underneath us */
+               /* treat as if NOID was found */
+       }
 
        /* stop when we get to the suffix */
        if ( be_issuffix( be, dn ) ) {
@@ -170,9 +192,14 @@ dn2entry(
 
        /* entry does not exist - see how much of the dn does exist */
        if ( (pdn = dn_parent( be, dn )) != NULL ) {
-               if ( (e = dn2entry( be, pdn, matched )) != NULL ) {
+               /* get entry with reader lock */
+               if ( (e = dn2entry_r( be, pdn, matched )) != NULL ) {
+                       if(*matched != NULL) {
+                               free(*matched);
+                       }
                        *matched = pdn;
-                       cache_return_entry( &li->li_cache, e );
+                       /* free entry with reader lock */
+                       cache_return_entry_r( &li->li_cache, e );
                } else {
                        free( pdn );
                }
@@ -180,3 +207,26 @@ dn2entry(
 
        return( NULL );
 }
+
+Entry *
+dn2entry_r(
+       Backend *be,
+       char    *dn,
+       char    **matched
+)
+{
+       return( dn2entry( be, dn, matched, 0 ) );
+}
+
+Entry *
+dn2entry_w(
+       Backend *be,
+       char    *dn,
+       char    **matched
+)
+{
+       return( dn2entry( be, dn, matched, 1 ) );
+}
+
+
+