]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/back-ldbm/dn2id.c
Clean up
[openldap] / servers / slapd / back-ldbm / dn2id.c
index 0a7edac280e7fdb39f8cae9873fa46e4ba828841..57340fd9a60b0f3b8d28bef42766e0c553d253a6 100644 (file)
 /* dn2id.c - routines to deal with the dn2id index */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
+
+#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"
 #include "proto-back-ldbm.h"
 
-extern struct dbcache  *ldbm_cache_open();
-extern char            *dn_parent();
-extern Datum           ldbm_cache_fetch();
-
 int
 dn2id_add(
     Backend    *be,
-    char       *dn,
+    const char *dn,
     ID         id
 )
 {
        int             rc, flags;
-       struct dbcache  *db;
+       DBCache *db;
        Datum           key, data;
        struct ldbminfo *li = (struct ldbminfo *) be->be_private;
 
-#ifdef LDBM_USE_DB2
-       memset( &key, 0, sizeof( key ) );
-       memset( &data, 0, sizeof( data ) );
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
+                  "dn2id_add: (%s):%ld\n", dn, id ));
+#else
+       Debug( LDAP_DEBUG_TRACE, "=> dn2id_add( \"%s\", %ld )\n", dn, id, 0 );
 #endif
 
-       Debug( LDAP_DEBUG_TRACE, "=> dn2id_add( \"%s\", %ld )\n", dn, id, 0 );
+       assert( id != NOID );
 
        if ( (db = ldbm_cache_open( be, "dn2id", LDBM_SUFFIX, LDBM_WRCREAT ))
            == NULL ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
+                          "dn2id_add: couldn't open/create dn2id%s\n", LDBM_SUFFIX ));
+#else
                Debug( LDAP_DEBUG_ANY, "Could not open/create dn2id%s\n",
                    LDBM_SUFFIX, 0, 0 );
+#endif
+
                return( -1 );
        }
 
-       dn = strdup( dn );
-       dn_normalize_case( dn );
+       ldbm_datum_init( key );
+       key.dsize = strlen( dn ) + 2;
+       key.dptr = ch_malloc( key.dsize );
+       sprintf( key.dptr, "%c%s", DN_BASE_PREFIX, dn );
 
-       key.dptr = dn;
-       key.dsize = strlen( dn ) + 1;
+       ldbm_datum_init( data );
        data.dptr = (char *) &id;
        data.dsize = sizeof(ID);
 
        flags = LDBM_INSERT;
-       if ( li->li_flush_wrt ) flags |= LDBM_SYNC;
-
        rc = ldbm_cache_store( db, key, data, flags );
 
-       free( dn );
+       free( key.dptr );
+
+       if ( rc != -1 ) {
+               char *pdn = dn_parent( NULL, dn );
+
+               if( pdn != NULL ) {
+                       ldbm_datum_init( key );
+                       key.dsize = strlen( pdn ) + 2;
+                       key.dptr = ch_malloc( key.dsize );
+                       sprintf( key.dptr, "%c%s", DN_ONE_PREFIX, pdn );
+                       rc = idl_insert_key( be, db, key, id );
+                       free( key.dptr );
+                       free( pdn );
+               }
+       }
+
+       if ( rc != -1 ) {
+               char **subtree = dn_subtree( NULL, dn );
+
+               if( subtree != NULL ) {
+                       int i;
+                       for( i=0; subtree[i] != NULL; i++ ) {
+                               ldbm_datum_init( key );
+                               key.dsize = strlen( subtree[i] ) + 2;
+                               key.dptr = ch_malloc( key.dsize );
+                               sprintf( key.dptr, "%c%s",
+                                       DN_SUBTREE_PREFIX, subtree[i] );
+
+                               rc = idl_insert_key( be, db, key, id );
+
+                               free( key.dptr );
+
+                               if(rc == -1) break;
+                       }
+
+                       charray_free( subtree );
+               }
+       }
+
        ldbm_cache_close( be, db );
 
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
+                  "dn2id_add: return %d\n", rc ));
+#else
        Debug( LDAP_DEBUG_TRACE, "<= dn2id_add %d\n", rc, 0, 0 );
+#endif
+
        return( rc );
 }
 
-ID
+int
 dn2id(
     Backend    *be,
-    char       *dn
+    const char *dn,
+    ID          *idp
 )
 {
        struct ldbminfo *li = (struct ldbminfo *) be->be_private;
-       struct dbcache  *db;
-       ID              id;
+       DBCache *db;
        Datum           key, data;
 
-#ifdef LDBM_USE_DB2
-       memset( &key, 0, sizeof( key ) );
-       memset( &data, 0, sizeof( data ) );
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
+                  "dn2id: (%s)\n", dn ));
+#else
+       Debug( LDAP_DEBUG_TRACE, "=> dn2id( \"%s\" )\n", dn, 0, 0 );
 #endif
 
-       dn = strdup( dn );
-       Debug( LDAP_DEBUG_TRACE, "=> dn2id( \"%s\" )\n", dn, 0, 0 );
-       dn_normalize_case( dn );
+       assert( idp );
 
        /* first check the cache */
-       if ( (id = cache_find_entry_dn2id( be, &li->li_cache, dn )) != NOID ) {
-               free( dn );
-               Debug( LDAP_DEBUG_TRACE, "<= dn2id %d (in cache)\n", id,
+       if ( (*idp = cache_find_entry_ndn2id( be, &li->li_cache, dn )) != NOID ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
+                          "dn2id: (%s)%ld in cache.\n", dn, *idp ));
+#else
+               Debug( LDAP_DEBUG_TRACE, "<= dn2id %ld (in cache)\n", *idp,
                        0, 0 );
-               return( id );
+#endif
+
+               return( 0 );
        }
 
        if ( (db = ldbm_cache_open( be, "dn2id", LDBM_SUFFIX, LDBM_WRCREAT ))
                == NULL ) {
-               free( dn );
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
+                          "dn2id: couldn't open dn2id%s\n", LDBM_SUFFIX ));
+#else
                Debug( LDAP_DEBUG_ANY, "<= dn2id could not open dn2id%s\n",
                        LDBM_SUFFIX, 0, 0 );
-               return( NOID );
+#endif
+               /*
+                * return code !0 if ldbm cache open failed;
+                * callers should handle this
+                */
+               *idp = NOID;
+               return( -1 );
        }
 
-       key.dptr = dn;
-       key.dsize = strlen( dn ) + 1;
+       ldbm_datum_init( key );
+
+       key.dsize = strlen( dn ) + 2;
+       key.dptr = ch_malloc( key.dsize );
+       sprintf( key.dptr, "%c%s", DN_BASE_PREFIX, dn );
 
        data = ldbm_cache_fetch( db, key );
 
        ldbm_cache_close( be, db );
-       free( dn );
+
+       free( key.dptr );
 
        if ( data.dptr == NULL ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
+                          "dn2id: (%s) NOID\n", dn ));
+#else
                Debug( LDAP_DEBUG_TRACE, "<= dn2id NOID\n", 0, 0, 0 );
-               return( NOID );
+#endif
+
+               *idp = NOID;
+               return( 0 );
        }
 
-       (void) memcpy( (char *) &id, data.dptr, sizeof(ID) );
+       AC_MEMCPY( (char *) idp, data.dptr, sizeof(ID) );
+
+       assert( *idp != NOID );
 
        ldbm_datum_free( db->dbc_db, data );
 
-       Debug( LDAP_DEBUG_TRACE, "<= dn2id %d\n", id, 0, 0 );
-       return( id );
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
+                  "dn2id: %ld\n", *idp ));
+#else
+       Debug( LDAP_DEBUG_TRACE, "<= dn2id %ld\n", *idp, 0, 0 );
+#endif
+
+       return( 0 );
+}
+
+int
+dn2idl(
+    Backend    *be,
+    const char *dn,
+    int                prefix,
+    ID_BLOCK    **idlp
+)
+{
+       DBCache *db;
+       Datum           key;
+
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
+                  "dn2idl: \"%c%s\"\n", prefix, dn ));
+#else
+       Debug( LDAP_DEBUG_TRACE, "=> dn2idl( \"%c%s\" )\n", prefix, dn, 0 );
+#endif
+
+       assert( idlp != NULL );
+       *idlp = NULL;
+
+       if ( (db = ldbm_cache_open( be, "dn2id", LDBM_SUFFIX, LDBM_WRCREAT ))
+               == NULL ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
+                          "dn2idl: could not open dn2id%s\n", LDBM_SUFFIX ));
+#else
+               Debug( LDAP_DEBUG_ANY, "<= dn2idl could not open dn2id%s\n",
+                       LDBM_SUFFIX, 0, 0 );
+#endif
+
+               return -1;
+       }
+
+       ldbm_datum_init( key );
+
+       key.dsize = strlen( dn ) + 2;
+       key.dptr = ch_malloc( key.dsize );
+       sprintf( key.dptr, "%c%s", prefix, dn );
+
+       *idlp = idl_fetch( be, db, key );
+
+       ldbm_cache_close( be, db );
+
+       free( key.dptr );
+
+       return( 0 );
 }
 
+
 int
 dn2id_delete(
     Backend    *be,
-    char       *dn
+    const char *dn,
+       ID id
 )
 {
-       struct ldbminfo *li = (struct ldbminfo *) be->be_private;
-       struct dbcache  *db;
+       DBCache *db;
        Datum           key;
        int             rc;
 
-#ifdef LDBM_USE_DB2
-       memset( &key, 0, sizeof( key ) );
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
+                  "dn2id_delete: (%s)%ld\n", dn, id ));
+#else
+       Debug( LDAP_DEBUG_TRACE, "=> dn2id_delete( \"%s\", %ld )\n", dn, id, 0 );
 #endif
 
-       Debug( LDAP_DEBUG_TRACE, "=> dn2id_delete( \"%s\" )\n", dn, 0, 0 );
+
+       assert( id != NOID );
 
        if ( (db = ldbm_cache_open( be, "dn2id", LDBM_SUFFIX, LDBM_WRCREAT ))
            == NULL ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
+                          "dn2id_delete: couldn't open db2id%s\n", LDBM_SUFFIX ));
+#else
                Debug( LDAP_DEBUG_ANY,
                    "<= dn2id_delete could not open dn2id%s\n", LDBM_SUFFIX,
                    0, 0 );
+#endif
+
                return( -1 );
        }
 
-       dn_normalize_case( dn );
-       key.dptr = dn;
-       key.dsize = strlen( dn ) + 1;
+
+       {
+               char *pdn = dn_parent( NULL, dn );
+
+               if( pdn != NULL ) {
+                       ldbm_datum_init( key );
+                       key.dsize = strlen( pdn ) + 2;
+                       key.dptr = ch_malloc( key.dsize );
+                       sprintf( key.dptr, "%c%s", DN_ONE_PREFIX, pdn );
+
+                       (void) idl_delete_key( be, db, key, id );
+
+                       free( key.dptr );
+                       free( pdn );
+               }
+       }
+
+       {
+               char **subtree = dn_subtree( NULL, dn );
+
+               if( subtree != NULL ) {
+                       int i;
+                       for( i=0; subtree[i] != NULL; i++ ) {
+                               ldbm_datum_init( key );
+                               key.dsize = strlen( subtree[i] ) + 2;
+                               key.dptr = ch_malloc( key.dsize );
+                               sprintf( key.dptr, "%c%s",
+                                       DN_SUBTREE_PREFIX, subtree[i] );
+
+                               (void) idl_delete_key( be, db, key, id );
+
+                               free( key.dptr );
+                       }
+
+                       charray_free( subtree );
+               }
+       }
+
+       ldbm_datum_init( key );
+
+       key.dsize = strlen( dn ) + 2;
+       key.dptr = ch_malloc( key.dsize );
+       sprintf( key.dptr, "%c%s", DN_BASE_PREFIX, dn );
 
        rc = ldbm_cache_delete( db, key );
 
+       free( key.dptr );
+
        ldbm_cache_close( be, db );
 
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
+                  "dn2id_delete: return %d\n", rc ));
+#else
        Debug( LDAP_DEBUG_TRACE, "<= dn2id_delete %d\n", rc, 0, 0 );
+#endif
+
        return( rc );
 }
 
@@ -157,81 +353,70 @@ dn2id_delete(
  * entry.
  */
 
-static Entry *
-dn2entry(
+Entry *
+dn2entry_rw(
     Backend    *be,
-    char       *dn,
-    char       **matched,
-    int         rw
+    const char *dn,
+    Entry      **matched,
+    int                rw
 )
 {
-       struct ldbminfo *li = (struct ldbminfo *) be->be_private;
        ID              id;
-       Entry           *e;
+       Entry           *e = NULL;
        char            *pdn;
 
-       Debug(LDAP_DEBUG_TRACE, "dn2entry_%s: dn: %s\n",
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
+                  "dn2entry_rw: %s entry %s\n", rw ? "w" : "r",
+                  dn ));
+#else
+       Debug(LDAP_DEBUG_TRACE, "dn2entry_%s: dn: \"%s\"\n",
                rw ? "w" : "r", dn, 0);
+#endif
 
-       if ( (id = dn2id( be, dn )) != NOID &&
-               (e = id2entry( be, id, rw )) != NULL )
-       {
-               return( e );
+
+       if( matched != NULL ) {
+               /* caller cares about match */
+               *matched = NULL;
        }
-       *matched = NULL;
 
-       /* stop when we get to the suffix */
-       if ( be_issuffix( be, dn ) ) {
+       if ( dn2id( be, dn, &id ) ) {
+               /* something bad happened to ldbm cache */
                return( NULL );
+
+       } else if ( id != NOID ) {
+               /* try to return the entry */
+               if ((e = id2entry_rw( be, id, rw )) != NULL ) {
+                       return( e );
+               }
+
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
+                          "dn2entry_rw: no entry for valid id (%ld), dn (%s)\n",
+                          id, dn ));
+#else
+               Debug(LDAP_DEBUG_ANY,
+                       "dn2entry_%s: no entry for valid id (%ld), dn \"%s\"\n",
+                       rw ? "w" : "r", id, dn);
+#endif
+
+               /* must have been deleted from underneath us */
+               /* treat as if NOID was found */
        }
 
+       /* caller doesn't care about match */
+       if( matched == NULL ) return NULL;
+
        /* entry does not exist - see how much of the dn does exist */
+       /* dn_parent checks returns NULL if dn is suffix */
        if ( (pdn = dn_parent( be, dn )) != NULL ) {
                /* get entry with reader lock */
                if ( (e = dn2entry_r( be, pdn, matched )) != NULL ) {
-                       *matched = pdn;
-                       /* free entry with reader lock */
-                       cache_return_entry_r( &li->li_cache, e );
-               } else {
-                       free( pdn );
+                       *matched = e;
                }
+               free( pdn );
        }
 
-       return( NULL );
-}
-
-#if 0
-               if (e->e_state == ENTRY_STATE_DELETED)
-                       continue;
-
-               if (strcmp(dn, e->e_dn) != 0)
-                       continue;
-
-               /* return locked entry entry */
-               return(e);
-       }
-}
-#endif
-
-Entry *
-dn2entry_r(
-       Backend *be,
-       char    *dn,
-       char    **matched
-)
-{
-       return( dn2entry( be, dn, matched, 0 ) );
+       return NULL;
 }
 
-Entry *
-dn2entry_w(
-       Backend *be,
-       char    *dn,
-       char    **matched
-)
-{
-       return( dn2entry( be, dn, matched, 1 ) );
-}
-
-
-