X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldbm%2Fdn2id.c;h=57340fd9a60b0f3b8d28bef42766e0c553d253a6;hb=b09727567d047cb79c8da8545cca9c8355822185;hp=ca3a2803dc1a878ddbc9fbc21fc16b01263f1ce3;hpb=4c1927265189f886e793fb6ae3ecc97c9019f68c;p=openldap diff --git a/servers/slapd/back-ldbm/dn2id.c b/servers/slapd/back-ldbm/dn2id.c index ca3a2803dc..57340fd9a6 100644 --- a/servers/slapd/back-ldbm/dn2id.c +++ b/servers/slapd/back-ldbm/dn2id.c @@ -1,6 +1,7 @@ /* dn2id.c - routines to deal with the dn2id index */ +/* $OpenLDAP$ */ /* - * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ @@ -27,13 +28,25 @@ dn2id_add( Datum key, data; struct ldbminfo *li = (struct ldbminfo *) be->be_private; +#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 + 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 ); } @@ -47,8 +60,6 @@ dn2id_add( data.dsize = sizeof(ID); flags = LDBM_INSERT; - if ( li->li_dbcachewsync ) flags |= LDBM_SYNC; - rc = ldbm_cache_store( db, key, data, flags ); free( key.dptr ); @@ -92,35 +103,64 @@ dn2id_add( 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, - const char *dn + const char *dn, + ID *idp ) { struct ldbminfo *li = (struct ldbminfo *) be->be_private; DBCache *db; - ID id; Datum key, 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 + + assert( idp ); /* first check the cache */ - if ( (id = cache_find_entry_dn2id( be, &li->li_cache, dn )) != NOID ) { - Debug( LDAP_DEBUG_TRACE, "<= dn2id %ld (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 ) { +#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 ); } ldbm_datum_init( key ); @@ -136,38 +176,65 @@ dn2id( 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( id != NOID ); + assert( *idp != NOID ); ldbm_datum_free( db->dbc_db, data ); - Debug( LDAP_DEBUG_TRACE, "<= dn2id %ld\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 ); } -ID_BLOCK * +int dn2idl( Backend *be, const char *dn, - int prefix + int prefix, + ID_BLOCK **idlp ) { DBCache *db; Datum key; - ID_BLOCK *idl; +#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 ); - return NULL; +#endif + + return -1; } ldbm_datum_init( key ); @@ -176,13 +243,13 @@ dn2idl( key.dptr = ch_malloc( key.dsize ); sprintf( key.dptr, "%c%s", prefix, dn ); - idl = idl_fetch( be, db, key ); + *idlp = idl_fetch( be, db, key ); ldbm_cache_close( be, db ); free( key.dptr ); - return( idl ); + return( 0 ); } @@ -197,15 +264,27 @@ dn2id_delete( Datum key; int rc; +#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 + 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 ); } @@ -259,7 +338,13 @@ dn2id_delete( 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 ); } @@ -273,32 +358,48 @@ dn2entry_rw( Backend *be, const char *dn, Entry **matched, - int rw + int rw ) { - struct ldbminfo *li = (struct ldbminfo *) be->be_private; ID id; Entry *e = NULL; char *pdn; +#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( matched != NULL ) { /* caller cares about match */ *matched = NULL; } - if ( (id = dn2id( be, dn )) != NOID && - (e = id2entry_rw( be, id, rw )) != NULL ) - { - return( e ); - } + if ( dn2id( be, dn, &id ) ) { + /* something bad happened to ldbm cache */ + return( NULL ); - if ( id != NOID ) { + } 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 */ }