/* dn2id.c - routines to deal with the dn2id index */
/* $OpenLDAP$ */
/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
bdb_dn2id_add(
BackendDB *be,
DB_TXN *txn,
- char *pdn,
+ struct berval *pbv,
Entry *e )
{
struct bdb_info *bdb = (struct bdb_info *) be->be_private;
DB *db = bdb->bi_dn2id->bdi_db;
int rc;
DBT key, data;
- char *buf, *ptr;
+ char *buf;
+ 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 ));
+#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 = strlen( e->e_ndn ) + 2;
+ key.size = e->e_nname.bv_len + 2;
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 (( "db2id", LDAP_LEVEL_ERR,
+ "bdb_dn2id_add: put failed: %s %d\n",
+ db_strerror(rc), rc ));
+#else
Debug( LDAP_DEBUG_ANY, "=> bdb_dn2id_add: put failed: %s %d\n",
db_strerror(rc), rc, 0 );
+#endif
goto done;
}
- buf[0] = DN_SUBTREE_PREFIX;
- rc = bdb_idl_insert_key( be, db, txn, &key, e->e_id );
- if( rc != 0 ) {
- Debug( LDAP_DEBUG_ANY,
- "=> bdb_dn2id_add: subtree (%s) insert failed: %d\n",
- ptr, rc, 0 );
- goto done;
- }
-
- pdn = dn_parent( be, ptr );
-
- if( pdn != NULL ) {
- key.size -= pdn - ptr;
- pdn[-1] = DN_ONE_PREFIX;
- key.data = pdn - 1;
-
+ 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 (( "db2id", LDAP_LEVEL_ERR,
+ "=> bdb_dn2id_add: subtree (%s) insert failed: %d\n",
+ ptr.bv_val, rc ));
+#else
Debug( LDAP_DEBUG_ANY,
- "=> bdb_dn2id_add: parent (%s) insert failed: %d\n",
- pdn, rc, 0 );
+ "=> bdb_dn2id_add: subtree (%s) insert failed: %d\n",
+ ptr.bv_val, rc, 0 );
+#endif
goto done;
}
+
+ dnParent( &ptr, &pdn );
+
+ key.size = pdn.bv_len + 2;
+ pdn.bv_val[-1] = DN_ONE_PREFIX;
+ key.data = pdn.bv_val-1;
+ ptr = pdn;
- pdn[-1] = DN_SUBTREE_PREFIX;
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: parent (%s) insert failed: %d\n",
+ ptr.bv_val, rc ));
+#else
Debug( LDAP_DEBUG_ANY,
- "=> bdb_dn2id_add: subtree (%s) insert failed: %d\n",
- pdn, rc, 0 );
+ "=> bdb_dn2id_add: parent (%s) insert failed: %d\n",
+ ptr.bv_val, rc, 0 );
+#endif
goto done;
}
- ptr = pdn;
- pdn = dn_parent( be, pdn );
}
- while( pdn != NULL ) {
- if( be_issuffix( be, pdn ))
- break;
-
- pdn[-1] = DN_SUBTREE_PREFIX;
- key.size -= pdn - ptr;
- key.data = pdn - 1;
+ 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 (( "db2id", LDAP_LEVEL_ERR,
+ "=> bdb_dn2id_add: subtree (%s) insert failed: %d\n",
+ ptr.bv_val, rc ));
+#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.data = pdn.bv_val - 1;
ptr = pdn;
- pdn = dn_parent( be, pdn );
}
done:
ch_free( buf );
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "db2id", LDAP_LEVEL_RESULTS,
+ "<= bdb_dn2id_add: %d\n", rc ));
+#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 (( "db2id", LDAP_LEVEL_ARGS,
+ "=> bdb_dn2id_delete ( \"%s\", 0x08lx )\n",
+ e->e_ndn, e->e_id ));
+#else
Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id_delete( \"%s\", 0x%08lx )\n",
e->e_ndn, e->e_id, 0 );
+#endif
DBTzero( &key );
- key.size = strlen( e->e_ndn ) + 2;
+ key.size = e->e_nname.bv_len + 2;
buf = ch_malloc( key.size );
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 (( "db2id", LDAP_LEVEL_ERR,
+ "=> bdb_dn2id_delete: delete failed: %s %d\n",
+ db_strerror(rc), rc ));
+#else
Debug( LDAP_DEBUG_ANY, "=> bdb_dn2id_delete: delete failed: %s %d\n",
db_strerror(rc), rc, 0 );
+#endif
goto done;
}
- buf[0] = DN_SUBTREE_PREFIX;
- rc = bdb_idl_delete_key( be, db, txn, &key, e->e_id );
- if( rc != 0 ) {
- Debug( LDAP_DEBUG_ANY,
- "=> bdb_dn2id_delete: subtree (%s) delete failed: %d\n",
- ptr, rc, 0 );
- goto done;
- }
-
- pdn = dn_parent( be, ptr );
-
- if( pdn != NULL ) {
- key.size -= pdn - ptr;
- pdn[-1] = DN_ONE_PREFIX;
- key.data = pdn - 1;
-
+ if( !be_issuffix( be, &ptr )) {
+ buf[0] = DN_SUBTREE_PREFIX;
rc = bdb_idl_delete_key( be, db, txn, &key, e->e_id );
-
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 ));
+#else
Debug( LDAP_DEBUG_ANY,
- "=> bdb_dn2id_delete: parent (%s) delete failed: %d\n",
- pdn, rc, 0 );
+ "=> bdb_dn2id_delete: subtree (%s) delete failed: %d\n",
+ ptr.bv_val, rc, 0 );
+#endif
goto done;
}
- pdn[-1] = DN_SUBTREE_PREFIX;
+ dnParent( &ptr, &pdn );
+
+ key.size = pdn.bv_len + 2;
+ 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 (( "db2id", LDAP_LEVEL_ERR,
+ "=> bdb_dn2id_delete: parent (%s) delete failed: %d\n",
+ ptr.bv_val, rc ));
+#else
Debug( LDAP_DEBUG_ANY,
- "=> bdb_dn2id_delete: subtree (%s) delete failed: %d\n",
- pdn, rc, 0 );
+ "=> bdb_dn2id_delete: parent (%s) delete failed: %d\n",
+ ptr.bv_val, rc, 0 );
+#endif
goto done;
}
- ptr = pdn;
- pdn = dn_parent( be, pdn );
}
- while( pdn != NULL ) {
- if( be_issuffix( be, pdn ))
- break;
-
- pdn[-1] = DN_SUBTREE_PREFIX;
- key.size -= pdn - ptr;
- key.data = pdn - 1;
+ 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 (( "db2id", LDAP_LEVEL_ERR,
+ "=> bdb_dn2id_delete: subtree (%s) delete failed: %d\n",
+ ptr.bv_val, rc ));
+#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.data = pdn.bv_val - 1;
ptr = pdn;
- pdn = dn_parent( be, pdn );
}
done:
ch_free( buf );
- Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id_delete %d\n", rc, 0, 0 );
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "db2id", LDAP_LEVEL_RESULTS, "<= bdb_dn2id_delete %d\n", rc ));
+#else
+ Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id_delete %d\n", rc, 0, 0 )
+#endif
return rc;
}
bdb_dn2id(
BackendDB *be,
DB_TXN *txn,
- const char *dn,
+ struct berval *dn,
ID *id )
{
int rc;
struct bdb_info *bdb = (struct bdb_info *) be->be_private;
DB *db = bdb->bi_dn2id->bdi_db;
- Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id( \"%s\" )\n", dn, 0, 0 );
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "db2id", LDAP_LEVEL_ARGS, "=> bdb_dn2id( \"%s\" )\n",
+ dn->bv_val ));
+#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 = strlen( dn ) + 2;
+ key.size = dn->bv_len + 2;
key.data = ch_malloc( key.size );
((char *)key.data)[0] = DN_BASE_PREFIX;
- AC_MEMCPY( &((char *)key.data)[1], dn, key.size - 1 );
+ AC_MEMCPY( &((char *)key.data)[1], dn->bv_val, key.size - 1 );
/* store the ID */
DBTzero( &data );
rc = db->get( db, txn, &key, &data, bdb->bi_db_opflags );
if( rc != 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "db2id", LDAP_LEVEL_ERR,
+ "<= bdb_dn2id: get failed %s (%d)\n",
+ db_strerror(rc), rc ));
+#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 ));
+#else
Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id: got id=0x%08lx\n",
*id, 0, 0 );
+#endif
}
ch_free( key.data );
bdb_dn2id_matched(
BackendDB *be,
DB_TXN *txn,
- const char *in,
+ struct berval *in,
ID *id,
- char **matchedDN )
+ ID *id2 )
{
int rc;
DBT key, data;
struct bdb_info *bdb = (struct bdb_info *) be->be_private;
DB *db = bdb->bi_dn2id->bdi_db;
- const char *dn = in;
+ char *buf;
+ struct berval dn;
+ ID cached_id;
- Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id_matched( \"%s\" )\n", dn, 0, 0 );
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "db2id", LDAP_LEVEL_ARGS,
+ "=> bdb_dn2id_matched( \"%s\" )\n", in->bv_val ));
+#else
+ Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id_matched( \"%s\" )\n", in->bv_val, 0, 0 );
+#endif
DBTzero( &key );
- key.size = strlen( dn ) + 2;
- key.data = ch_malloc( key.size );
- ((char *)key.data)[0] = DN_BASE_PREFIX;
+ key.size = in->bv_len + 2;
+ buf = ch_malloc( key.size );
+ key.data = buf;
+ 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) {
- AC_MEMCPY( &((char *)key.data)[1], dn, key.size - 1 );
+ 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 );
+ }
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 (( "db2id", LDAP_LEVEL_DETAIL1,
+ "<= bdb_dn2id_matched: no match\n" ));
+#else
Debug( LDAP_DEBUG_TRACE,
"<= bdb_dn2id_matched: no match\n",
0, 0, 0 );
+#endif
break;
}
+ key.size = pdn.bv_len + 2;
dn = pdn;
- key.size = strlen( dn ) + 2;
+ key.data = pdn.bv_val - 1;
} else if ( rc == 0 ) {
if( data.size != sizeof( ID ) ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "db2id", LDAP_LEVEL_DETAIL1,
+ "<= bdb_dn2id_matched: get size mismatch:"
+ "expected %ld, got %ld\n",
+ (long) sizeof(ID), (long) data.size ));
+#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( in != dn ) {
- *matchedDN = (char *) dn;
+ if( dn.bv_val != buf+1 ) {
+ *id2 = *id;
}
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "db2id", LDAP_LEVEL_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 (( "db2id", LDAP_LEVEL_ERR,
+ "<= bdb_dn2id_matched: get failed: %s (%d)\n",
+ db_strerror(rc), rc ));
+#else
Debug( LDAP_DEBUG_ANY,
"<= bdb_dn2id_matched: get failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
+#endif
break;
}
}
- ch_free( key.data );
+ ch_free( buf );
return rc;
}
bdb_dn2id_children(
BackendDB *be,
DB_TXN *txn,
- const char *dn )
+ struct berval *dn )
{
int rc;
DBT key, data;
DB *db = bdb->bi_dn2id->bdi_db;
ID id;
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "db2id", LDAP_LEVEL_ARGS,
+ "=> bdb_dn2id_children( %s )\n", dn->bv_val ));
+#else
Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id_children( %s )\n",
- dn, 0, 0 );
+ dn->bv_val, 0, 0 );
+#endif
DBTzero( &key );
- key.size = strlen( dn ) + 2;
+ key.size = dn->bv_len + 2;
key.data = ch_malloc( key.size );
((char *)key.data)[0] = DN_ONE_PREFIX;
- AC_MEMCPY( &((char *)key.data)[1], dn, key.size - 1 );
+ AC_MEMCPY( &((char *)key.data)[1], dn->bv_val, key.size - 1 );
/* we actually could do a empty get... */
DBTzero( &data );
data.dlen = sizeof(id);
rc = db->get( db, txn, &key, &data, bdb->bi_db_opflags );
-
+ free( key.data );
+
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "db2id", LDAP_LEVEL_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;
}
int
bdb_dn2idl(
BackendDB *be,
- const char *dn,
+ struct berval *dn,
int prefix,
ID *ids )
{
int rc;
- DBT key, data;
+ DBT key;
struct bdb_info *bdb = (struct bdb_info *) be->be_private;
DB *db = bdb->bi_dn2id->bdi_db;
- Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2idl( \"%s\" )\n", dn, 0, 0 );
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "db2id", LDAP_LEVEL_ARGS,
+ "=> bdb_dn2ididl( \"%s\" )\n", dn->bv_val ));
+#else
+ Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2idl( \"%s\" )\n", dn->bv_val, 0, 0 );
+#endif
if (prefix == DN_SUBTREE_PREFIX && be_issuffix(be, dn))
{
}
DBTzero( &key );
- key.size = strlen( dn ) + 2;
+ key.size = dn->bv_len + 2;
key.data = ch_malloc( key.size );
((char *)key.data)[0] = prefix;
- AC_MEMCPY( &((char *)key.data)[1], dn, key.size - 1 );
+ 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 (( "db2id", LDAP_LEVEL_ERR,
+ "<= bdb_dn2ididl: get failed: %s (%d)\n",
+ db_strerror(rc), rc ));
+#else
Debug( LDAP_DEBUG_TRACE,
"<= bdb_dn2idl: get failed: %s (%d)\n",
db_strerror( rc ), rc, 0 );
+#endif
} else {
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "db2id", LDAP_LEVEL_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 );
ldap_pvt_thread_rdwr_t i_kids_rdwr;
} idNode;
-/* strcopy is like strcpy except it returns a pointer to the trailing NUL of
- * the result string. This allows fast construction of catenated strings
- * without the overhead of strlen/strcat.
- */
-char *
-bdb_strcopy(
- char *a,
- char *b
-)
-{
- if (!a || !b)
- return a;
-
- while (*a++ = *b++) ;
- return a-1;
-}
/* The main AVL tree is sorted in ID order. The i_kids AVL trees are
* sorted in lexical order. These are the various helper routines used
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);
}
idNode * bdb_find_id_node(
* Note that this code always uses be_suffix[0], so defining
* multiple suffixes for a single backend won't work!
*/
- bdb->bi_sufflen = strlen(be->be_suffix[0]);
-
rdns = ldap_explode_dn(be->be_nsuffix[0]->bv_val, 0);
for (i=0; rdns[i]; i++);
bdb->bi_nrdns = i;
ldap_pvt_thread_rdwr_rlock(&bdb->bi_tree_rdwr);
o = bdb_find_id_node(id, bdb->bi_tree);
- rlen = bdb->bi_sufflen + 1;
+ rlen = be->be_suffix[0]->bv_len + 1;
nrlen = be->be_nsuffix[0]->bv_len + 1;
- for (n = o; n; n=n->i_parent) {
+ 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_dn = ch_malloc(rlen + nrlen);
- e->e_ndn = e->e_dn + rlen;
- ptr = e->e_dn;
- nptr = e->e_ndn;
- for (n = o; n; n=n->i_parent) {
- ptr = bdb_strcopy(ptr, n->i_rdn->rdn.bv_val);
+ e->e_name.bv_len = rlen - 1;
+ e->e_nname.bv_len = nrlen - 1;
+ e->e_name.bv_val = ch_malloc(rlen + nrlen);
+ 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->i_parent; n=n->i_parent) {
+ ptr = slap_strcopy(ptr, n->i_rdn->rdn.bv_val);
*ptr++ = ',';
- nptr = bdb_strcopy(nptr, n->i_rdn->nrdn.bv_val);
+ nptr = slap_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]);
+ strcpy(ptr, be->be_suffix[0]->bv_val);
strcpy(nptr, be->be_nsuffix[0]->bv_val);
return 0;
bdb_dn2id_add(
BackendDB *be,
DB_TXN *txn,
- char *pdn,
+ struct berval *pdn,
Entry *e )
{
struct bdb_info *bdb = (struct bdb_info *) be->be_private;
diskNode *d;
idNode *n;
- nrlen = dn_rdnlen( be, e->e_ndn );
+ nrlen = dn_rdnlen( be, &e->e_nname );
if (nrlen) {
- rlen = dn_rdnlen( be, e->e_dn );
+ rlen = dn_rdnlen( be, &e->e_name );
} else {
rlen = 0;
}
d->rdn.bv_val -= (long)d;
d->nrdn.bv_val -= (long)d;
- if (pdn) {
+ if (pdn->bv_len) {
bdb_dn2id(be, txn, pdn, &d->parent);
} else {
d->parent = 0;
bdb_dn2id_matched(
BackendDB *be,
DB_TXN *txn,
- const char *in,
+ struct berval *in,
ID *id,
- char **matchedDN )
+ ID *id2 )
{
struct bdb_info *bdb = (struct bdb_info *) be->be_private;
int i;
return 0;
}
- rdns = ldap_explode_dn(in, 0);
+ rdns = ldap_explode_dn(in->bv_val, 0);
for (i=0; rdns[i]; i++);
i -= bdb->bi_nrdns;
- if (i < 0)
+ if (i < 0) {
+ charray_free(rdns);
return -1;
+ }
n = p;
ldap_pvt_thread_rdwr_rlock(&bdb->bi_tree_rdwr);
for (--i; i>=0; i--) {
p = n;
}
ldap_pvt_thread_rdwr_runlock(&bdb->bi_tree_rdwr);
+ charray_free(rdns);
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 = bdb_strcopy(ptr, rdns[i]);
- *ptr++ = ',';
- }
- ptr[-1] = '\0';
+ } else if (id2) {
+ *id2 = p->i_id;
}
return n ? 0 : DB_NOTFOUND;
}
bdb_dn2id(
BackendDB *be,
DB_TXN *txn,
- const char *dn,
+ struct berval *dn,
ID *id )
{
return bdb_dn2id_matched(be, txn, dn, id, NULL);
bdb_dn2id_children(
BackendDB *be,
DB_TXN *txn,
- const char *dn )
+ struct berval *dn )
{
int rc;
struct bdb_info *bdb = (struct bdb_info *) be->be_private;
int
bdb_dn2idl(
BackendDB *be,
- const char *dn,
+ struct berval *dn,
int prefix,
ID *ids )
{
projects / openldap / blobdiff