#define IDL_CMP(x,y) ( x < y ? -1 : ( x > y ? 1 : 0 ) )
+#ifdef SLAP_IDL_CACHE
+#define IDL_LRU_DELETE( bdb, e ) do { \
+ if ( e->idl_lru_prev != NULL ) { \
+ e->idl_lru_prev->idl_lru_next = e->idl_lru_next; \
+ } else { \
+ bdb->bi_idl_lru_head = e->idl_lru_next; \
+ } \
+ if ( e->idl_lru_next != NULL ) { \
+ e->idl_lru_next->idl_lru_prev = e->idl_lru_prev; \
+ } else { \
+ bdb->bi_idl_lru_tail = e->idl_lru_prev; \
+ } \
+} while ( 0 )
+
+#define IDL_LRU_ADD( bdb, e ) do { \
+ e->idl_lru_next = bdb->bi_idl_lru_head; \
+ if ( e->idl_lru_next != NULL ) { \
+ e->idl_lru_next->idl_lru_prev = (e); \
+ } \
+ (bdb)->bi_idl_lru_head = (e); \
+ e->idl_lru_prev = NULL; \
+ if ( (bdb)->bi_idl_lru_tail == NULL ) { \
+ (bdb)->bi_idl_lru_tail = (e); \
+ } \
+} while ( 0 )
+
+static int
+bdb_idl_entry_cmp( const void *v_idl1, const void *v_idl2 )
+{
+ const bdb_idl_cache_entry_t *idl1 = v_idl1, *idl2 = v_idl2;
+ int rc;
+
+ if ((rc = idl1->db - idl2->db )) return rc;
+ if ((rc = idl1->kstr.bv_len - idl2->kstr.bv_len )) return rc;
+ return ( memcmp ( idl1->kstr.bv_val, idl2->kstr.bv_val , idl1->kstr.bv_len ) );
+}
+#endif
+
#if IDL_DEBUG > 0
static void idl_check( ID *ids )
{
return 0;
}
+#if 0 /* unused */
static int idl_delete( ID *ids, ID id )
{
unsigned x = bdb_idl_search( ids, id );
return 0;
}
+#endif /* unused */
static char *
bdb_show_key(
size_t len;
int rc2;
int flags = bdb->bi_db_opflags | DB_MULTIPLE;
+#ifdef SLAP_IDL_CACHE
+ bdb_idl_cache_entry_t idl_tmp;
+#endif
/* buf must be large enough to grab the entire IDL in one
* get(), otherwise BDB 4 will leak resources on subsequent
}
assert( ids != NULL );
+#ifdef SLAP_IDL_CACHE
+ if ( bdb->bi_idl_cache_max_size ) {
+ bdb_idl_cache_entry_t *matched_idl_entry;
+ DBT2bv( key, &idl_tmp.kstr );
+ idl_tmp.db = db;
+ ldap_pvt_thread_mutex_lock( &bdb->bi_idl_tree_mutex );
+ matched_idl_entry = avl_find( bdb->bi_idl_tree, &idl_tmp,
+ bdb_idl_entry_cmp );
+ if ( matched_idl_entry != NULL ) {
+ BDB_IDL_CPY( ids, matched_idl_entry->idl );
+ IDL_LRU_DELETE( bdb, matched_idl_entry );
+ IDL_LRU_ADD( bdb, matched_idl_entry );
+ ldap_pvt_thread_mutex_unlock( &bdb->bi_idl_tree_mutex );
+ return LDAP_SUCCESS;
+ }
+ ldap_pvt_thread_mutex_unlock( &bdb->bi_idl_tree_mutex );
+ }
+#endif
+
DBTzero( &data );
data.data = buf;
return -1;
}
+#ifdef SLAP_IDL_CACHE
+ if ( bdb->bi_idl_cache_max_size ) {
+ bdb_idl_cache_entry_t *ee;
+ ee = (bdb_idl_cache_entry_t *) malloc( sizeof( bdb_idl_cache_entry_t ) );
+ ee->db = db;
+ ee->idl = (ID*) malloc ( BDB_IDL_SIZEOF ( ids ) );
+ ee->idl_lru_prev = NULL;
+ ee->idl_lru_next = NULL;
+ BDB_IDL_CPY( ee->idl, ids );
+ ber_dupbv( &ee->kstr, &idl_tmp.kstr );
+ ldap_pvt_thread_mutex_lock( &bdb->bi_idl_tree_mutex );
+ if ( avl_insert( &bdb->bi_idl_tree, (caddr_t) ee,
+ bdb_idl_entry_cmp, avl_dup_error )) {
+ free( ee->kstr.bv_val );
+ free( ee->idl );
+ free( ee );
+ } else {
+ IDL_LRU_ADD( bdb, ee );
+ if ( ++bdb->bi_idl_cache_size > bdb->bi_idl_cache_max_size ) {
+ int i = 0;
+ while ( bdb->bi_idl_lru_tail != NULL && i < 10 ) {
+ ee = bdb->bi_idl_lru_tail;
+ avl_delete( &bdb->bi_idl_tree, (caddr_t) ee,
+ bdb_idl_entry_cmp );
+ IDL_LRU_DELETE( bdb, ee );
+ i++;
+ --bdb->bi_idl_cache_size;
+ free( ee->kstr.bv_val );
+ free( ee->idl );
+ free( ee );
+ }
+ }
+ }
+ ldap_pvt_thread_mutex_unlock( &bdb->bi_idl_tree_mutex );
+ }
+#endif
+
return rc;
}
assert( id != NOID );
+#ifdef SLAP_IDL_CACHE
+ if ( bdb->bi_idl_cache_size ) {
+ bdb_idl_cache_entry_t *matched_idl_entry, idl_tmp;
+ DBT2bv( key, &idl_tmp.kstr );
+ idl_tmp.db = db;
+ ldap_pvt_thread_mutex_lock( &bdb->bi_idl_tree_mutex );
+ matched_idl_entry = avl_find( bdb->bi_idl_tree, &idl_tmp,
+ bdb_idl_entry_cmp );
+ if ( matched_idl_entry != NULL ) {
+ avl_delete( &bdb->bi_idl_tree, (caddr_t) matched_idl_entry,
+ bdb_idl_entry_cmp );
+ --bdb->bi_idl_cache_size;
+ IDL_LRU_DELETE( bdb, matched_idl_entry );
+ free( matched_idl_entry->kstr.bv_val );
+ free( matched_idl_entry->idl );
+ free( matched_idl_entry );
+ }
+ ldap_pvt_thread_mutex_unlock( &bdb->bi_idl_tree_mutex );
+ }
+#endif
+
DBTzero( &data );
data.size = sizeof( ID );
data.ulen = data.size;
}
assert( id != NOID );
+#ifdef SLAP_IDL_CACHE
+ if ( bdb->bi_idl_cache_max_size ) {
+ bdb_idl_cache_entry_t *matched_idl_entry, idl_tmp;
+ DBT2bv( key, &idl_tmp.kstr );
+ idl_tmp.db = db;
+ ldap_pvt_thread_mutex_lock( &bdb->bi_idl_tree_mutex );
+ matched_idl_entry = avl_find( bdb->bi_idl_tree, &idl_tmp,
+ bdb_idl_entry_cmp );
+ if ( matched_idl_entry != NULL ) {
+ avl_delete( &bdb->bi_idl_tree, (caddr_t) matched_idl_entry,
+ bdb_idl_entry_cmp );
+ --bdb->bi_idl_cache_size;
+ IDL_LRU_DELETE( bdb, matched_idl_entry );
+ free( matched_idl_entry->kstr.bv_val );
+ free( matched_idl_entry->idl );
+ free( matched_idl_entry );
+ }
+ ldap_pvt_thread_mutex_unlock( &bdb->bi_idl_tree_mutex );
+ }
+#endif
+
DBTzero( &data );
data.data = &tmp;
data.size = sizeof( id );
return 0;
}
- if ( BDB_IDL_IS_RANGE( a ) && BDB_IDL_IS_RANGE(b) ) {
- a[1] = idmin;
- a[2] = idmax;
- return 0;
- }
-
if ( BDB_IDL_IS_RANGE( a ) ) {
- ID *tmp = a;
- a = b;
- b = tmp;
- swap = 1;
+ if ( BDB_IDL_IS_RANGE(b) ) {
+ /* If both are ranges, just shrink the boundaries */
+ a[1] = idmin;
+ a[2] = idmax;
+ return 0;
+ } else {
+ /* Else swap so that b is the range, a is a list */
+ ID *tmp = a;
+ a = b;
+ b = tmp;
+ swap = 1;
+ }
}
- if ( BDB_IDL_IS_RANGE( b ) && BDB_IDL_FIRST( b ) <= idmin &&
- BDB_IDL_LAST( b ) >= idmax) {
+ /* If a range completely covers the list, the result is
+ * just the list. If idmin to idmax is contiguous, just
+ * turn it into a range.
+ */
+ if ( BDB_IDL_IS_RANGE( b )
+ && BDB_IDL_FIRST( b ) <= BDB_IDL_FIRST( a )
+ && BDB_IDL_LAST( b ) >= BDB_IDL_LAST( a ) ) {
if (idmax - idmin + 1 == a[0])
{
a[0] = NOID;
goto done;
}
+ /* Fine, do the intersection one element at a time.
+ * First advance to idmin in both IDLs.
+ */
+ cursora = cursorb = idmin;
ida = bdb_idl_first( a, &cursora );
idb = bdb_idl_first( b, &cursorb );
cursorc = 0;
- while( ida < idmin )
- ida = bdb_idl_next( a, &cursora );
- while( idb < idmin )
- idb = bdb_idl_next( b, &cursorb );
-
while( ida <= idmax || idb <= idmax ) {
if( ida == idb ) {
a[++cursorc] = ida;
return NOID;
}
+
projects / openldap / blobdiff