/* dn2id.c - routines to deal with the dn2id index */
/* $OpenLDAP$ */
/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
#include "back-bdb.h"
#include "idl.h"
+#include "lutil.h"
#ifndef BDB_HIER
int
DB *db = bdb->bi_dn2id->bdi_db;
int rc;
DBT key, data;
- char *buf, *ptr, *pdn;
+ char *buf;
+ struct berval ptr, pdn;
+#ifdef NEW_LOGGING
+ 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 );
+#endif
assert( e->e_id != NOID );
DBTzero( &key );
key.size = e->e_nname.bv_len + 2;
+ key.ulen = key.size;
+ key.flags = DB_DBT_USERMEM;
buf = ch_malloc( key.size );
key.data = buf;
buf[0] = DN_BASE_PREFIX;
- ptr = buf + 1;
- AC_MEMCPY( ptr, e->e_ndn, key.size - 1 );
+ ptr.bv_val = buf + 1;
+ ptr.bv_len = e->e_nname.bv_len;
+ AC_MEMCPY( ptr.bv_val, e->e_nname.bv_val, e->e_nname.bv_len );
+ ptr.bv_val[ptr.bv_len] = '\0';
DBTzero( &data );
data.data = (char *) &e->e_id;
/* store it -- don't override */
rc = db->put( db, txn, &key, &data, DB_NOOVERWRITE );
if( rc != 0 ) {
+#ifdef NEW_LOGGING
+ 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 );
+#endif
goto done;
}
- if( !be_issuffix( be, ptr )) {
+ if( !be_issuffix( be, &ptr )) {
buf[0] = DN_SUBTREE_PREFIX;
rc = bdb_idl_insert_key( be, db, txn, &key, e->e_id );
if( rc != 0 ) {
+#ifdef NEW_LOGGING
+ 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",
- ptr, rc, 0 );
+ ptr.bv_val, rc, 0 );
+#endif
goto done;
}
- }
-
- pdn = dn_parent( be, ptr );
-
- if( pdn != NULL ) {
- key.size -= pdn - ptr;
- pdn[-1] = DN_ONE_PREFIX;
- key.data = pdn - 1;
+
+ dnParent( &ptr, &pdn );
+
+ key.size = pdn.bv_len + 2;
+ key.ulen = key.size;
+ pdn.bv_val[-1] = DN_ONE_PREFIX;
+ key.data = pdn.bv_val-1;
+ ptr = pdn;
rc = bdb_idl_insert_key( be, db, txn, &key, e->e_id );
if( rc != 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( INDEX, ERR,
+ "=> bdb_dn2id_add: parent (%s) insert failed: %d\n",
+ ptr.bv_val, rc, 0 );
+#else
Debug( LDAP_DEBUG_ANY,
"=> bdb_dn2id_add: parent (%s) insert failed: %d\n",
- pdn, rc, 0 );
+ ptr.bv_val, rc, 0 );
+#endif
goto done;
}
}
- while( pdn != NULL ) {
- if ( be_issuffix( be, pdn ))
- break;
- pdn[-1] = DN_SUBTREE_PREFIX;
+ while( !be_issuffix( be, &ptr )) {
+ ptr.bv_val[-1] = DN_SUBTREE_PREFIX;
rc = bdb_idl_insert_key( be, db, txn, &key, e->e_id );
if( rc != 0 ) {
+#ifdef NEW_LOGGING
+ 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",
- pdn, rc, 0 );
+ ptr.bv_val, rc, 0 );
+#endif
break;
}
+ dnParent( &ptr, &pdn );
+
+ key.size = pdn.bv_len + 2;
+ key.ulen = key.size;
+ key.data = pdn.bv_val - 1;
ptr = pdn;
- pdn = dn_parent( be, pdn );
- key.size -= pdn - ptr;
- key.data = pdn - 1;
}
done:
ch_free( buf );
+#ifdef NEW_LOGGING
+ 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
return rc;
}
bdb_dn2id_delete(
BackendDB *be,
DB_TXN *txn,
- char *pdn,
+ char *pdnc,
Entry *e )
{
struct bdb_info *bdb = (struct bdb_info *) be->be_private;
DB *db = bdb->bi_dn2id->bdi_db;
int rc;
DBT key;
- char *buf, *ptr;
+ char *buf;
+ struct berval pdn, ptr;
+#ifdef NEW_LOGGING
+ 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 );
+#endif
DBTzero( &key );
key.size = e->e_nname.bv_len + 2;
key.data = buf;
key.flags = DB_DBT_USERMEM;
buf[0] = DN_BASE_PREFIX;
- ptr = buf+1;
- AC_MEMCPY( ptr, e->e_ndn, key.size - 1 );
+ ptr.bv_val = buf+1;
+ ptr.bv_len = e->e_nname.bv_len;
+ AC_MEMCPY( ptr.bv_val, e->e_nname.bv_val, e->e_nname.bv_len );
+ ptr.bv_val[ptr.bv_len] = '\0';
/* delete it */
rc = db->del( db, txn, &key, 0 );
if( rc != 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( INDEX, ERR,
+ "=> bdb_dn2id_delete: delete failed: %s %d\n",
+ db_strerror(rc), rc, 0 );
+#else
Debug( LDAP_DEBUG_ANY, "=> bdb_dn2id_delete: delete failed: %s %d\n",
db_strerror(rc), rc, 0 );
+#endif
goto done;
}
- if( !be_issuffix( be, ptr )) {
+ if( !be_issuffix( be, &ptr )) {
buf[0] = DN_SUBTREE_PREFIX;
- rc = bdb_idl_delete_key( be, db, txn, &key, e->e_id );
+ rc = db->del( db, txn, &key, 0 );
if( rc != 0 ) {
+#ifdef NEW_LOGGING
+ 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",
- ptr, rc, 0 );
+ ptr.bv_val, rc, 0 );
+#endif
goto done;
}
- }
- pdn = dn_parent( be, ptr );
+ dnParent( &ptr, &pdn );
- if( pdn != NULL ) {
- key.size -= pdn - ptr;
- pdn[-1] = DN_ONE_PREFIX;
- key.data = pdn - 1;
+ key.size = pdn.bv_len + 2;
+ key.ulen = key.size;
+ pdn.bv_val[-1] = DN_ONE_PREFIX;
+ key.data = pdn.bv_val - 1;
+ ptr = pdn;
rc = bdb_idl_delete_key( be, db, txn, &key, e->e_id );
if( rc != 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( INDEX, ERR,
+ "=> bdb_dn2id_delete: parent (%s) delete failed: %d\n",
+ ptr.bv_val, rc, 0 );
+#else
Debug( LDAP_DEBUG_ANY,
"=> bdb_dn2id_delete: parent (%s) delete failed: %d\n",
- pdn, rc, 0 );
+ ptr.bv_val, rc, 0 );
+#endif
goto done;
}
}
- while( pdn != NULL ) {
- if ( be_issuffix( be, pdn ))
- break;
-
- pdn[-1] = DN_SUBTREE_PREFIX;
+ while( !be_issuffix( be, &ptr )) {
+ ptr.bv_val[-1] = DN_SUBTREE_PREFIX;
rc = bdb_idl_delete_key( be, db, txn, &key, e->e_id );
if( rc != 0 ) {
+#ifdef NEW_LOGGING
+ 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",
- pdn, rc, 0 );
+ ptr.bv_val, rc, 0 );
+#endif
goto done;
}
+ dnParent( &ptr, &pdn );
+
+ key.size = pdn.bv_len + 2;
+ key.ulen = key.size;
+ key.data = pdn.bv_val - 1;
ptr = pdn;
- pdn = dn_parent( be, pdn );
- key.size -= pdn - ptr;
- key.data = pdn - 1;
}
done:
ch_free( buf );
+#ifdef NEW_LOGGING
+ 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
return rc;
}
BackendDB *be,
DB_TXN *txn,
struct berval *dn,
- ID *id )
+ ID *id,
+ int flags )
{
int rc;
DBT key, data;
struct bdb_info *bdb = (struct bdb_info *) be->be_private;
DB *db = bdb->bi_dn2id->bdi_db;
+#ifdef NEW_LOGGING
+ 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
+
+ assert (id);
+
+ *id = bdb_cache_find_entry_ndn2id(be, &bdb->bi_cache, dn);
+ if (*id != NOID) {
+ return 0;
+ }
DBTzero( &key );
key.size = dn->bv_len + 2;
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 ( 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 ( 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 );
+#endif
}
ch_free( key.data );
DB_TXN *txn,
struct berval *in,
ID *id,
- char **matchedDN )
+ ID *id2,
+ int flags )
{
int rc;
DBT key, data;
struct bdb_info *bdb = (struct bdb_info *) be->be_private;
DB *db = bdb->bi_dn2id->bdi_db;
- char *buf, *dn;
-
+ char *buf;
+ struct berval dn;
+ ID cached_id;
+
+#ifdef NEW_LOGGING
+ 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
DBTzero( &key );
key.size = in->bv_len + 2;
buf = ch_malloc( key.size );
key.data = buf;
- dn = buf+1;
- AC_MEMCPY( dn, in->bv_val, key.size - 1 );
+ dn.bv_val = buf+1;
+ dn.bv_len = key.size - 2;
+ AC_MEMCPY( dn.bv_val, in->bv_val, key.size - 1 );
/* store the ID */
DBTzero( &data );
data.ulen = sizeof(ID);
data.flags = DB_DBT_USERMEM;
- *matchedDN = NULL;
-
while(1) {
- dn[-1] = DN_BASE_PREFIX;
+ dn.bv_val[-1] = DN_BASE_PREFIX;
*id = NOID;
- /* fetch it */
- rc = db->get( db, txn, &key, &data, bdb->bi_db_opflags );
+ /* lookup cache */
+ cached_id = bdb_cache_find_entry_ndn2id(be, &bdb->bi_cache, &dn);
+
+ if (cached_id != NOID) {
+ rc = 0;
+ *id = cached_id;
+ if ( dn.bv_val != buf+1 ) {
+ *id2 = *id;
+ }
+ break;
+ } else {
+ /* fetch it */
+ rc = db->get(db, txn, &key, &data, bdb->bi_db_opflags | flags );
+ }
if( rc == DB_NOTFOUND ) {
- char *pdn = dn_parent( be, dn );
-
- if( pdn == NULL || *pdn == '\0' ) {
+ struct berval pdn;
+
+ if ( ! be_issuffix( be, &dn ) ) {
+ dnParent( &dn, &pdn );
+ } else {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( INDEX, DETAIL1,
+ "<= bdb_dn2id_matched: no match\n", 0, 0, 0 );
+#else
Debug( LDAP_DEBUG_TRACE,
"<= bdb_dn2id_matched: no match\n",
0, 0, 0 );
+#endif
break;
}
- key.size -= pdn - dn;
+ key.size = pdn.bv_len + 2;
dn = pdn;
- key.data = pdn - 1;
+ key.data = pdn.bv_val - 1;
} else if ( rc == 0 ) {
if( data.size != sizeof( ID ) ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( INDEX, DETAIL1,
+ "<= bdb_dn2id_matched: get size mismatch:"
+ "expected %ld, got %ld\n",
+ (long) sizeof(ID), (long) data.size, 0 );
+#else
Debug( LDAP_DEBUG_ANY,
"<= bdb_dn2id_matched: get size mismatch: "
"expected %ld, got %ld\n",
(long) sizeof(ID), (long) data.size, 0 );
+#endif
}
- if( dn != buf+1 ) {
- *matchedDN = (char *) dn;
+ if( dn.bv_val != buf+1 ) {
+ *id2 = *id;
}
+#ifdef NEW_LOGGING
+ LDAP_LOG ( INDEX, DETAIL1,
+ "<= bdb_dn2id_matched: id=0x%08lx: %s %s\n",
+ (long) *id, *id2 == 0 ? "entry" : "matched", dn.bv_val );
+#else
Debug( LDAP_DEBUG_TRACE,
"<= bdb_dn2id_matched: id=0x%08lx: %s %s\n",
- (long) *id, *matchedDN == NULL ? "entry" : "matched", dn );
+ (long) *id, *id2 == 0 ? "entry" : "matched", dn.bv_val );
+#endif
break;
} else {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( INDEX, ERR,
+ "<= bdb_dn2id_matched: get failed: %s (%d)\n",
+ db_strerror(rc), rc, 0 );
+#else
Debug( LDAP_DEBUG_ANY,
"<= bdb_dn2id_matched: get failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
+#endif
break;
}
}
bdb_dn2id_children(
BackendDB *be,
DB_TXN *txn,
- struct berval *dn )
+ struct berval *dn,
+ int flags )
{
int rc;
DBT key, data;
DB *db = bdb->bi_dn2id->bdi_db;
ID id;
+#ifdef NEW_LOGGING
+ 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 );
+#endif
DBTzero( &key );
key.size = dn->bv_len + 2;
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 ( INDEX, DETAIL1,
+ "<= bdb_dn2id_children( %s ): %schildren (%d)\n",
+ dn->bv_val, rc == 0 ? "" : ( rc == DB_NOTFOUND ? "no " :
+ db_strerror(rc)), rc );
+#else
Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id_children( %s ): %schildren (%d)\n",
- dn,
+ dn->bv_val,
rc == 0 ? "" : ( rc == DB_NOTFOUND ? "no " :
db_strerror(rc) ), rc );
+#endif
return rc;
}
struct bdb_info *bdb = (struct bdb_info *) be->be_private;
DB *db = bdb->bi_dn2id->bdi_db;
+#ifdef NEW_LOGGING
+ 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
- if (prefix == DN_SUBTREE_PREFIX && be_issuffix(be, dn->bv_val))
+ if (prefix == DN_SUBTREE_PREFIX && be_issuffix(be, dn))
{
BDB_IDL_ALL(bdb, ids);
return 0;
DBTzero( &key );
key.size = dn->bv_len + 2;
+ key.ulen = key.size;
+ key.flags = DB_DBT_USERMEM;
key.data = ch_malloc( key.size );
((char *)key.data)[0] = prefix;
AC_MEMCPY( &((char *)key.data)[1], dn->bv_val, key.size - 1 );
rc = bdb_idl_fetch_key( be, db, NULL, &key, ids );
if( rc != 0 ) {
+#ifdef NEW_LOGGING
+ 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",
db_strerror( rc ), rc, 0 );
+#endif
} else {
+#ifdef NEW_LOGGING
+ 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 ) );
+#else
Debug( LDAP_DEBUG_TRACE,
"<= bdb_dn2idl: id=%ld first=%ld last=%ld\n",
(long) ids[0],
(long) BDB_IDL_FIRST( ids ), (long) BDB_IDL_LAST( ids ) );
+#endif
}
ch_free( key.data );
*/
static int
node_find_cmp(
- ID id,
- idNode *n
+ const void *id,
+ const void *node
)
{
- return id - n->i_id;
+ return *(const ID *)id - ((const idNode *)node)->i_id;
}
static int
node_frdn_cmp(
- char *nrdn,
- idNode *n
+ const void *v_nrdn,
+ const void *v_n
)
{
- return strcmp(nrdn, n->i_rdn->nrdn.bv_val);
+ const struct berval *nrdn = v_nrdn;
+ const idNode *n = v_n;
+ return ber_bvcmp(nrdn, &n->i_rdn->nrdn);
}
static int
node_add_cmp(
- idNode *a,
- idNode *b
+ const void *v_a,
+ const void *v_b
)
{
+ const idNode *a = v_a, *b = v_b;
return a->i_id - b->i_id;
}
static int
node_rdn_cmp(
- idNode *a,
- idNode *b
+ const void *v_a,
+ const void *v_b
)
{
- return strcmp(a->i_rdn->nrdn.bv_val, b->i_rdn->nrdn.bv_val);
+ const idNode *a = v_a, *b = v_b;
+ /* should be slightly better without ordering drawbacks */
+ return ber_bvcmp(&a->i_rdn->nrdn, &b->i_rdn->nrdn);
}
idNode * bdb_find_id_node(
Avlnode *tree
)
{
- return avl_find(tree, (const void *)id, (AVL_CMP)node_find_cmp);
+ return avl_find(tree, &id, node_find_cmp);
}
idNode * bdb_find_rdn_node(
- char *nrdn,
+ struct berval *nrdn,
Avlnode *tree
)
{
- return avl_find(tree, (const void *)nrdn, (AVL_CMP)node_frdn_cmp);
+ return avl_find(tree, nrdn, node_frdn_cmp);
}
/* This function links a node into its parent's i_kids tree. */
-int bdb_insert_kid(
- idNode *a,
- Avlnode *tree
+static int bdb_insert_kid(
+ void *v_a,
+ void *v_tree
)
{
+ idNode *a = v_a;
+ Avlnode *tree = v_tree;
int rc;
if (a->i_rdn->parent == 0)
return -1;
ldap_pvt_thread_rdwr_wlock(&a->i_parent->i_kids_rdwr);
rc = avl_insert( &a->i_parent->i_kids, (caddr_t) a,
- (AVL_CMP)node_rdn_cmp, (AVL_DUP) avl_dup_error );
+ node_rdn_cmp, avl_dup_error );
ldap_pvt_thread_rdwr_wunlock(&a->i_parent->i_kids_rdwr);
return rc;
}
node->i_rdn->rdn.bv_val += (long)d;
node->i_rdn->nrdn.bv_val += (long)d;
ldap_pvt_thread_rdwr_init(&node->i_kids_rdwr);
- avl_insert( &bdb->bi_tree, (caddr_t) node,
- (AVL_CMP)node_add_cmp, (AVL_DUP) avl_dup_error );
+ avl_insert( &bdb->bi_tree, (caddr_t) node, node_add_cmp, avl_dup_error );
if (id == 1)
bdb->bi_troot = node;
return node;
)
{
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;
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;
}
cursor->c_close( cursor );
- rc = avl_apply(bdb->bi_tree, (AVL_APPLY)bdb_insert_kid, bdb->bi_tree,
+ rc = avl_apply(bdb->bi_tree, bdb_insert_kid, bdb->bi_tree,
-1, AVL_INORDER );
return rc;
ldap_pvt_thread_rdwr_rlock(&bdb->bi_tree_rdwr);
o = bdb_find_id_node(id, bdb->bi_tree);
- rlen = be->be_suffix[0]->bv_len + 1;
- nrlen = be->be_nsuffix[0]->bv_len + 1;
- for (n = o; n; n=n->i_parent) {
+ rlen = be->be_suffix[0].bv_len + 1;
+ nrlen = be->be_nsuffix[0].bv_len + 1;
+ for (n = o; n && n->i_parent; n=n->i_parent) {
rlen += n->i_rdn->rdn.bv_len + 1;
nrlen += n->i_rdn->nrdn.bv_len + 1;
}
e->e_nname.bv_val = e->e_name.bv_val + rlen;
ptr = e->e_name.bv_val;
nptr = e->e_nname.bv_val;
- for (n = o; n; n=n->i_parent) {
- ptr = slap_strcopy(ptr, n->i_rdn->rdn.bv_val);
+ for (n = o; n && n->i_parent; n=n->i_parent) {
+ 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);
- ptr--;
- nptr--;
- strcpy(ptr, be->be_suffix[0]->bv_val);
- strcpy(nptr, be->be_nsuffix[0]->bv_val);
+ strcpy(ptr, be->be_suffix[0].bv_val);
+ strcpy(nptr, be->be_nsuffix[0].bv_val);
return 0;
}
d->rdn.bv_val -= (long)d;
d->nrdn.bv_val -= (long)d;
- if (pdn) {
- bdb_dn2id(be, txn, pdn, &d->parent);
+ if (pdn->bv_len) {
+ bdb_dn2id(be, txn, pdn, &d->parent, 0);
} else {
d->parent = 0;
}
rc = db->del( db, txn, &key, 0);
ldap_pvt_thread_rdwr_wlock(&bdb->bi_tree_rdwr);
- n = avl_delete(&bdb->bi_tree, (void *)e->e_id, (AVL_CMP)node_find_cmp);
+ n = avl_delete(&bdb->bi_tree, &e->e_id, node_find_cmp);
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_CMP)node_frdn_cmp);
+ avl_delete(&n->i_parent->i_kids, &n->i_rdn->nrdn, node_frdn_cmp);
ldap_pvt_thread_rdwr_wunlock(&n->i_parent->i_kids_rdwr);
}
free(n->i_rdn);
DB_TXN *txn,
struct berval *in,
ID *id,
- char **matchedDN )
+ 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)
return DB_NOTFOUND;
p = bdb->bi_troot;
- if (be_issuffix(be, in->bv_val)) {
+ if (be_issuffix(be, in)) {
*id = p->i_id;
return 0;
}
- rdns = ldap_explode_dn(in->bv_val, 0);
- for (i=0; rdns[i]; i++);
- i -= bdb->bi_nrdns;
- if (i < 0)
- 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);
if (n) {
*id = n->i_id;
- } else if (matchedDN) {
- int len = 0, j;
- char *ptr;
- ++i;
- for (j=i; rdns[j]; j++)
- len += strlen(rdns[j]) + 1;
- ptr = ch_malloc(len);
- *matchedDN = ptr;
- for (;rdns[i]; i++) {
- ptr = slap_strcopy(ptr, rdns[i]);
- *ptr++ = ',';
- }
- ptr[-1] = '\0';
+ } else if (id2) {
+ *id2 = p->i_id;
}
return n ? 0 : DB_NOTFOUND;
}
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;
*/
static int
insert_one(
- idNode *n,
- ID *ids
+ void *v_n,
+ void *v_ids
)
{
+ idNode *n = v_n;
+ ID *ids = v_ids;
return bdb_idl_insert(ids, n->i_id);
}
static int
insert_sub(
- idNode *n,
- ID *ids
+ void *v_n,
+ void *v_ids
)
{
+ idNode *n = v_n;
+ ID *ids = v_ids;
int rc;
rc = bdb_idl_insert(ids, n->i_id);
if (rc == 0) {
ldap_pvt_thread_rdwr_rlock(&n->i_kids_rdwr);
- rc = avl_apply(n->i_kids, (AVL_APPLY)insert_sub, ids, -1,
- AVL_INORDER);
+ rc = avl_apply(n->i_kids, insert_sub, ids, -1, AVL_INORDER);
ldap_pvt_thread_rdwr_runlock(&n->i_kids_rdwr);
}
return rc;
ID id;
idNode *n;
- if (prefix == DN_SUBTREE_PREFIX && be_issuffix(be, dn->bv_val)) {
+ if (prefix == DN_SUBTREE_PREFIX && be_issuffix(be, dn)) {
BDB_IDL_ALL(bdb, ids);
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);
ids[0] = 0;
ldap_pvt_thread_rdwr_rlock(&n->i_kids_rdwr);
if (prefix == DN_ONE_PREFIX) {
- rc = avl_apply(n->i_kids, (AVL_APPLY)insert_one, ids, -1,
- AVL_INORDER);
+ rc = avl_apply(n->i_kids, insert_one, ids, -1, AVL_INORDER);
} else {
- rc = avl_apply(n->i_kids, (AVL_APPLY)insert_sub, ids, -1,
- AVL_INORDER);
+ rc = avl_apply(n->i_kids, insert_sub, ids, -1, AVL_INORDER);
}
ldap_pvt_thread_rdwr_runlock(&n->i_kids_rdwr);
return rc;
projects / openldap / blobdiff