#include "back-bdb.h"
#include "idl.h"
+#include "lutil.h"
#ifndef BDB_HIER
int
*/
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
)
{
-#if 0
- return strcmp(a->i_rdn->nrdn.bv_val, b->i_rdn->nrdn.bv_val);
-#endif
+ 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);
}
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;
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;
}
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,
- 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)
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;
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;
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