X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fdn2id.c;h=70bca2b43ea6ef243af2043d3ac67addef77a8ab;hb=6e9c21cff8fc740dc6ed21c6f64d9a8899a33401;hp=d9792904fb64bcb48a55dc55f4e4876d842644e7;hpb=7fae7fe15599213581d3e667a8e97a91f95faabb;p=openldap diff --git a/servers/slapd/back-bdb/dn2id.c b/servers/slapd/back-bdb/dn2id.c index d9792904fb..70bca2b43e 100644 --- a/servers/slapd/back-bdb/dn2id.c +++ b/servers/slapd/back-bdb/dn2id.c @@ -12,6 +12,7 @@ #include "back-bdb.h" #include "idl.h" +#include "lutil.h" #ifndef BDB_HIER int @@ -29,8 +30,8 @@ bdb_dn2id_add( struct berval ptr, pdn; #ifdef NEW_LOGGING - LDAP_LOG (( "db2id", LDAP_LEVEL_ARGS, "bdb_dn2id_add( \"%s\", 0x%08lx )\n", - e->e_ndn, (long) e->e_id )); + LDAP_LOG ( INDEX, ARGS, "bdb_dn2id_add( \"%s\", 0x%08lx )\n", + e->e_ndn, (long) e->e_id, 0 ); #else Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id_add( \"%s\", 0x%08lx )\n", e->e_ndn, (long) e->e_id, 0 ); @@ -57,9 +58,8 @@ bdb_dn2id_add( rc = db->put( db, txn, &key, &data, DB_NOOVERWRITE ); if( rc != 0 ) { #ifdef NEW_LOGGING - LDAP_LOG (( "db2id", LDAP_LEVEL_ERR, - "bdb_dn2id_add: put failed: %s %d\n", - db_strerror(rc), rc )); + LDAP_LOG ( INDEX, ERR, "bdb_dn2id_add: put failed: %s %d\n", + db_strerror(rc), rc, 0 ); #else Debug( LDAP_DEBUG_ANY, "=> bdb_dn2id_add: put failed: %s %d\n", db_strerror(rc), rc, 0 ); @@ -72,9 +72,9 @@ bdb_dn2id_add( rc = bdb_idl_insert_key( be, db, txn, &key, e->e_id ); if( rc != 0 ) { #ifdef NEW_LOGGING - LDAP_LOG (( "db2id", LDAP_LEVEL_ERR, - "=> bdb_dn2id_add: subtree (%s) insert failed: %d\n", - ptr.bv_val, rc )); + LDAP_LOG ( INDEX, ERR, + "=> bdb_dn2id_add: subtree (%s) insert failed: %d\n", + ptr.bv_val, rc, 0 ); #else Debug( LDAP_DEBUG_ANY, "=> bdb_dn2id_add: subtree (%s) insert failed: %d\n", @@ -95,9 +95,9 @@ bdb_dn2id_add( if( rc != 0 ) { #ifdef NEW_LOGGING - LDAP_LOG (( "db2id", LDAP_LEVEL_ERR, + LDAP_LOG ( INDEX, ERR, "=> bdb_dn2id_add: parent (%s) insert failed: %d\n", - ptr.bv_val, rc )); + ptr.bv_val, rc, 0 ); #else Debug( LDAP_DEBUG_ANY, "=> bdb_dn2id_add: parent (%s) insert failed: %d\n", @@ -114,9 +114,9 @@ bdb_dn2id_add( if( rc != 0 ) { #ifdef NEW_LOGGING - LDAP_LOG (( "db2id", LDAP_LEVEL_ERR, + LDAP_LOG ( INDEX, ERR, "=> bdb_dn2id_add: subtree (%s) insert failed: %d\n", - ptr.bv_val, rc )); + ptr.bv_val, rc, 0 ); #else Debug( LDAP_DEBUG_ANY, "=> bdb_dn2id_add: subtree (%s) insert failed: %d\n", @@ -135,8 +135,7 @@ bdb_dn2id_add( done: ch_free( buf ); #ifdef NEW_LOGGING - LDAP_LOG (( "db2id", LDAP_LEVEL_RESULTS, - "<= bdb_dn2id_add: %d\n", rc )); + LDAP_LOG ( INDEX, RESULTS, "<= bdb_dn2id_add: %d\n", rc, 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id_add: %d\n", rc, 0, 0 ); #endif @@ -158,9 +157,8 @@ bdb_dn2id_delete( struct berval pdn, ptr; #ifdef NEW_LOGGING - LDAP_LOG (( "db2id", LDAP_LEVEL_ARGS, - "=> bdb_dn2id_delete ( \"%s\", 0x08lx )\n", - e->e_ndn, e->e_id )); + LDAP_LOG ( INDEX, ARGS, + "=> bdb_dn2id_delete ( \"%s\", 0x%08lx )\n", e->e_ndn, e->e_id, 0); #else Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id_delete( \"%s\", 0x%08lx )\n", e->e_ndn, e->e_id, 0 ); @@ -181,9 +179,9 @@ bdb_dn2id_delete( rc = db->del( db, txn, &key, 0 ); if( rc != 0 ) { #ifdef NEW_LOGGING - LDAP_LOG (( "db2id", LDAP_LEVEL_ERR, + LDAP_LOG ( INDEX, ERR, "=> bdb_dn2id_delete: delete failed: %s %d\n", - db_strerror(rc), rc )); + db_strerror(rc), rc, 0 ); #else Debug( LDAP_DEBUG_ANY, "=> bdb_dn2id_delete: delete failed: %s %d\n", db_strerror(rc), rc, 0 ); @@ -196,9 +194,9 @@ bdb_dn2id_delete( rc = db->del( db, txn, &key, 0 ); if( rc != 0 ) { #ifdef NEW_LOGGING - LDAP_LOG (( "db2id", LDAP_LEVEL_ERR, - "=> bdb_dn2id_delete: subtree (%s) delete failed: %d\n", - ptr.bv_val, rc )); + LDAP_LOG ( INDEX, ERR, + "=> bdb_dn2id_delete: subtree (%s) delete failed: %d\n", + ptr.bv_val, rc, 0 ); #else Debug( LDAP_DEBUG_ANY, "=> bdb_dn2id_delete: subtree (%s) delete failed: %d\n", @@ -219,9 +217,9 @@ bdb_dn2id_delete( if( rc != 0 ) { #ifdef NEW_LOGGING - LDAP_LOG (( "db2id", LDAP_LEVEL_ERR, + LDAP_LOG ( INDEX, ERR, "=> bdb_dn2id_delete: parent (%s) delete failed: %d\n", - ptr.bv_val, rc )); + ptr.bv_val, rc, 0 ); #else Debug( LDAP_DEBUG_ANY, "=> bdb_dn2id_delete: parent (%s) delete failed: %d\n", @@ -237,9 +235,9 @@ bdb_dn2id_delete( rc = bdb_idl_delete_key( be, db, txn, &key, e->e_id ); if( rc != 0 ) { #ifdef NEW_LOGGING - LDAP_LOG (( "db2id", LDAP_LEVEL_ERR, + LDAP_LOG ( INDEX, ERR, "=> bdb_dn2id_delete: subtree (%s) delete failed: %d\n", - ptr.bv_val, rc )); + ptr.bv_val, rc, 0 ); #else Debug( LDAP_DEBUG_ANY, "=> bdb_dn2id_delete: subtree (%s) delete failed: %d\n", @@ -258,7 +256,7 @@ bdb_dn2id_delete( done: ch_free( buf ); #ifdef NEW_LOGGING - LDAP_LOG (( "db2id", LDAP_LEVEL_RESULTS, "<= bdb_dn2id_delete %d\n", rc )); + LDAP_LOG ( INDEX, RESULTS, "<= bdb_dn2id_delete %d\n", rc, 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id_delete %d\n", rc, 0, 0 ); #endif @@ -270,7 +268,8 @@ bdb_dn2id( BackendDB *be, DB_TXN *txn, struct berval *dn, - ID *id ) + ID *id, + int flags ) { int rc; DBT key, data; @@ -278,8 +277,7 @@ bdb_dn2id( DB *db = bdb->bi_dn2id->bdi_db; #ifdef NEW_LOGGING - LDAP_LOG (( "db2id", LDAP_LEVEL_ARGS, "=> bdb_dn2id( \"%s\" )\n", - dn->bv_val )); + LDAP_LOG ( INDEX, ARGS, "=> bdb_dn2id( \"%s\" )\n", dn->bv_val, 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id( \"%s\" )\n", dn->bv_val, 0, 0 ); #endif @@ -304,21 +302,20 @@ bdb_dn2id( data.flags = DB_DBT_USERMEM; /* fetch it */ - rc = db->get( db, txn, &key, &data, bdb->bi_db_opflags ); + rc = db->get( db, txn, &key, &data, bdb->bi_db_opflags | flags); if( rc != 0 ) { #ifdef NEW_LOGGING - LDAP_LOG (( "db2id", LDAP_LEVEL_ERR, - "<= bdb_dn2id: get failed %s (%d)\n", - db_strerror(rc), rc )); + LDAP_LOG ( INDEX, ERR, "<= bdb_dn2id: get failed %s (%d)\n", + db_strerror(rc), rc, 0 ); #else Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id: get failed: %s (%d)\n", db_strerror( rc ), rc, 0 ); #endif } else { #ifdef NEW_LOGGING - LDAP_LOG (( "db2id", LDAP_LEVEL_RESULTS, - "<= bdb_dn2id: got id=0x%08lx\n", *id )); + LDAP_LOG ( INDEX, RESULTS, + "<= bdb_dn2id: got id=0x%08lx\n", *id, 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id: got id=0x%08lx\n", *id, 0, 0 ); @@ -335,7 +332,8 @@ bdb_dn2id_matched( DB_TXN *txn, struct berval *in, ID *id, - ID *id2 ) + ID *id2, + int flags ) { int rc; DBT key, data; @@ -346,8 +344,8 @@ bdb_dn2id_matched( ID cached_id; #ifdef NEW_LOGGING - LDAP_LOG (( "db2id", LDAP_LEVEL_ARGS, - "=> bdb_dn2id_matched( \"%s\" )\n", in->bv_val )); + LDAP_LOG ( INDEX, ARGS, + "=> bdb_dn2id_matched( \"%s\" )\n", in->bv_val, 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id_matched( \"%s\" )\n", in->bv_val, 0, 0 ); #endif @@ -383,7 +381,7 @@ bdb_dn2id_matched( break; } else { /* fetch it */ - rc = db->get(db, txn, &key, &data, bdb->bi_db_opflags ); + rc = db->get(db, txn, &key, &data, bdb->bi_db_opflags | flags ); } if( rc == DB_NOTFOUND ) { @@ -393,8 +391,8 @@ bdb_dn2id_matched( dnParent( &dn, &pdn ); } else { #ifdef NEW_LOGGING - LDAP_LOG (( "db2id", LDAP_LEVEL_DETAIL1, - "<= bdb_dn2id_matched: no match\n" )); + LDAP_LOG ( INDEX, DETAIL1, + "<= bdb_dn2id_matched: no match\n", 0, 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id_matched: no match\n", @@ -410,10 +408,10 @@ bdb_dn2id_matched( } else if ( rc == 0 ) { if( data.size != sizeof( ID ) ) { #ifdef NEW_LOGGING - LDAP_LOG (( "db2id", LDAP_LEVEL_DETAIL1, + LDAP_LOG ( INDEX, DETAIL1, "<= bdb_dn2id_matched: get size mismatch:" "expected %ld, got %ld\n", - (long) sizeof(ID), (long) data.size )); + (long) sizeof(ID), (long) data.size, 0 ); #else Debug( LDAP_DEBUG_ANY, "<= bdb_dn2id_matched: get size mismatch: " @@ -427,9 +425,9 @@ bdb_dn2id_matched( } #ifdef NEW_LOGGING - LDAP_LOG (( "db2id", LDAP_LEVEL_DETAIL1, + LDAP_LOG ( INDEX, DETAIL1, "<= bdb_dn2id_matched: id=0x%08lx: %s %s\n", - (long) *id, *id2 == 0 ? "entry" : "matched", dn.bv_val )); + (long) *id, *id2 == 0 ? "entry" : "matched", dn.bv_val ); #else Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id_matched: id=0x%08lx: %s %s\n", @@ -439,9 +437,9 @@ bdb_dn2id_matched( } else { #ifdef NEW_LOGGING - LDAP_LOG (( "db2id", LDAP_LEVEL_ERR, + LDAP_LOG ( INDEX, ERR, "<= bdb_dn2id_matched: get failed: %s (%d)\n", - db_strerror(rc), rc )); + db_strerror(rc), rc, 0 ); #else Debug( LDAP_DEBUG_ANY, "<= bdb_dn2id_matched: get failed: %s (%d)\n", @@ -459,7 +457,8 @@ int bdb_dn2id_children( BackendDB *be, DB_TXN *txn, - struct berval *dn ) + struct berval *dn, + int flags ) { int rc; DBT key, data; @@ -468,8 +467,8 @@ bdb_dn2id_children( ID id; #ifdef NEW_LOGGING - LDAP_LOG (( "db2id", LDAP_LEVEL_ARGS, - "=> bdb_dn2id_children( %s )\n", dn->bv_val )); + LDAP_LOG ( INDEX, ARGS, + "=> bdb_dn2id_children( %s )\n", dn->bv_val, 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id_children( %s )\n", dn->bv_val, 0, 0 ); @@ -489,14 +488,14 @@ bdb_dn2id_children( data.doff = 0; data.dlen = sizeof(id); - rc = db->get( db, txn, &key, &data, bdb->bi_db_opflags ); + rc = db->get( db, txn, &key, &data, bdb->bi_db_opflags | flags ); free( key.data ); #ifdef NEW_LOGGING - LDAP_LOG (( "db2id", LDAP_LEVEL_DETAIL1, + LDAP_LOG ( INDEX, DETAIL1, "<= bdb_dn2id_children( %s ): %schildren (%d)\n", dn->bv_val, rc == 0 ? "" : ( rc == DB_NOTFOUND ? "no " : - db_strerror(rc)), rc )); + db_strerror(rc)), rc ); #else Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id_children( %s ): %schildren (%d)\n", dn->bv_val, @@ -520,8 +519,8 @@ bdb_dn2idl( DB *db = bdb->bi_dn2id->bdi_db; #ifdef NEW_LOGGING - LDAP_LOG (( "db2id", LDAP_LEVEL_ARGS, - "=> bdb_dn2ididl( \"%s\" )\n", dn->bv_val )); + LDAP_LOG ( INDEX, ARGS, + "=> bdb_dn2ididl( \"%s\" )\n", dn->bv_val, 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2idl( \"%s\" )\n", dn->bv_val, 0, 0 ); #endif @@ -544,9 +543,8 @@ bdb_dn2idl( if( rc != 0 ) { #ifdef NEW_LOGGING - LDAP_LOG (( "db2id", LDAP_LEVEL_ERR, - "<= bdb_dn2ididl: get failed: %s (%d)\n", - db_strerror(rc), rc )); + LDAP_LOG ( INDEX, ERR, + "<= bdb_dn2ididl: get failed: %s (%d)\n", db_strerror(rc), rc, 0 ); #else Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2idl: get failed: %s (%d)\n", @@ -555,10 +553,10 @@ bdb_dn2idl( } else { #ifdef NEW_LOGGING - LDAP_LOG (( "db2id", LDAP_LEVEL_RESULTS, + LDAP_LOG ( INDEX, RESULTS, "<= bdb_dn2ididl: id=%ld first=%ld last=%ld\n", (long) ids[0], (long) BDB_IDL_FIRST( ids ), - (long) BDB_IDL_LAST( ids ) )); + (long) BDB_IDL_LAST( ids ) ); #else Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2idl: id=%ld first=%ld last=%ld\n", @@ -624,11 +622,11 @@ node_find_cmp( static int node_frdn_cmp( - char *nrdn, + struct berval *nrdn, idNode *n ) { - return strcmp(nrdn, n->i_rdn->nrdn.bv_val); + return ber_bvcmp(nrdn, &n->i_rdn->nrdn); } static int @@ -646,9 +644,6 @@ node_rdn_cmp( idNode *b ) { -#if 0 - return strcmp(a->i_rdn->nrdn.bv_val, b->i_rdn->nrdn.bv_val); -#endif /* should be slightly better without ordering drawbacks */ return ber_bvcmp(&a->i_rdn->nrdn, &b->i_rdn->nrdn); } @@ -662,7 +657,7 @@ idNode * bdb_find_id_node( } idNode * bdb_find_rdn_node( - char *nrdn, + struct berval *nrdn, Avlnode *tree ) { @@ -719,12 +714,11 @@ int bdb_build_tree( ) { struct bdb_info *bdb = (struct bdb_info *) be->be_private; - int i, rc; + int rc; DBC *cursor; DBT key, data; ID id; idNode *node; - char **rdns; bdb->bi_tree = NULL; @@ -735,20 +729,6 @@ int bdb_build_tree( return NOID; } - /* When be_suffix is turned into struct berval or LDAPDN - * life will get a lot easier... Since no DNs live on disk, we - * need to operate on the be_suffix to fully qualify our DNs. - * We need to know how many components are in the suffix DN, - * so we can tell where the suffix ends and our nodes begin. - * - * Note that this code always uses be_suffix[0], so defining - * multiple suffixes for a single backend won't work! - */ - rdns = ldap_explode_dn(be->be_nsuffix[0].bv_val, 0); - for (i=0; rdns[i]; i++); - bdb->bi_nrdns = i; - charray_free(rdns); - DBTzero( &key ); DBTzero( &data ); key.data = (char *)&id; @@ -796,9 +776,9 @@ int bdb_fix_dn( ptr = e->e_name.bv_val; nptr = e->e_nname.bv_val; for (n = o; n && n->i_parent; n=n->i_parent) { - ptr = slap_strcopy(ptr, n->i_rdn->rdn.bv_val); + ptr = lutil_strcopy(ptr, n->i_rdn->rdn.bv_val); *ptr++ = ','; - nptr = slap_strcopy(nptr, n->i_rdn->nrdn.bv_val); + nptr = lutil_strcopy(nptr, n->i_rdn->nrdn.bv_val); *nptr++ = ','; } ldap_pvt_thread_rdwr_runlock(&bdb->bi_tree_rdwr); @@ -843,7 +823,7 @@ bdb_dn2id_add( d->nrdn.bv_val -= (long)d; if (pdn->bv_len) { - bdb_dn2id(be, txn, pdn, &d->parent); + bdb_dn2id(be, txn, pdn, &d->parent, 0); } else { d->parent = 0; } @@ -900,7 +880,7 @@ bdb_dn2id_delete( if (n) { if (n->i_parent) { ldap_pvt_thread_rdwr_wlock(&n->i_parent->i_kids_rdwr); - avl_delete(&n->i_parent->i_kids, n->i_rdn->nrdn.bv_val, + avl_delete(&n->i_parent->i_kids, &n->i_rdn->nrdn, (AVL_CMP)node_frdn_cmp); ldap_pvt_thread_rdwr_wunlock(&n->i_parent->i_kids_rdwr); } @@ -921,11 +901,12 @@ bdb_dn2id_matched( DB_TXN *txn, struct berval *in, ID *id, - ID *id2 ) + ID *id2, + int flags ) { struct bdb_info *bdb = (struct bdb_info *) be->be_private; - int i; - char **rdns; + struct berval rdn; + char *p1, *p2; idNode *n, *p; if (!bdb->bi_troot) @@ -937,24 +918,23 @@ bdb_dn2id_matched( return 0; } - rdns = ldap_explode_dn(in->bv_val, 0); - for (i=0; rdns[i]; i++); - i -= bdb->bi_nrdns; - if (i < 0) { - charray_free(rdns); - return -1; - } + p1 = in->bv_val + in->bv_len - be->be_nsuffix[0].bv_len - 1; + n = p; ldap_pvt_thread_rdwr_rlock(&bdb->bi_tree_rdwr); - for (--i; i>=0; i--) { + for (;;) { + for (p2 = p1-1; (p2 >= in->bv_val) && !DN_SEPARATOR(*p2); p2--); + rdn.bv_val = p2+1; + rdn.bv_len = p1-rdn.bv_val; + p1 = p2; + ldap_pvt_thread_rdwr_rlock(&p->i_kids_rdwr); - n = bdb_find_rdn_node(rdns[i], p->i_kids); + n = bdb_find_rdn_node(&rdn, p->i_kids); ldap_pvt_thread_rdwr_runlock(&p->i_kids_rdwr); - if (!n) break; + if (!n || p2 < in->bv_val) break; p = n; } ldap_pvt_thread_rdwr_runlock(&bdb->bi_tree_rdwr); - charray_free(rdns); if (n) { *id = n->i_id; @@ -969,23 +949,25 @@ bdb_dn2id( BackendDB *be, DB_TXN *txn, struct berval *dn, - ID *id ) + ID *id, + int flags ) { - return bdb_dn2id_matched(be, txn, dn, id, NULL); + return bdb_dn2id_matched(be, txn, dn, id, NULL, flags); } int bdb_dn2id_children( BackendDB *be, DB_TXN *txn, - struct berval *dn ) + struct berval *dn, + int flags ) { int rc; struct bdb_info *bdb = (struct bdb_info *) be->be_private; ID id; idNode *n; - rc = bdb_dn2id(be, txn, dn, &id); + rc = bdb_dn2id(be, txn, dn, &id, flags); if (rc != 0) return rc; @@ -1046,7 +1028,7 @@ bdb_dn2idl( return 0; } - rc = bdb_dn2id(be, NULL, dn, &id); + rc = bdb_dn2id(be, NULL, dn, &id, 0); if (rc) return rc; ldap_pvt_thread_rdwr_rlock(&bdb->bi_tree_rdwr);