ITS#4088 force cursors to use same locker

[openldap] / servers / slapd / back-bdb / attr.c

diff --git a/servers/slapd/back-bdb/attr.c b/servers/slapd/back-bdb/attr.c
index 70a20ea9c1caecd877e21117168e1c24327e725f..f058c1f59672ddcda65b19638977d5d8ee64b923 100644 (file)
--- a/servers/slapd/back-bdb/attr.c
+++ b/servers/slapd/back-bdb/attr.c
@@ -23,15 +23,8 @@
 
 #include "slap.h"
 #include "back-bdb.h"
+#include "lutil.h"
 
-/* for the cache of attribute information (which are indexed, etc.) */
-typedef struct bdb_attrinfo {
-       AttributeDescription *ai_desc; /* attribute description cn;lang-en */
-       slap_mask_t ai_indexmask;       /* how the attr is indexed      */
-#ifdef LDAP_COMP_MATCH
-       ComponentReference* ai_cr; /*component indexing*/
-#endif
-} AttrInfo;
 
 static int
 ainfo_type_cmp(
@@ -54,50 +47,13 @@ ainfo_cmp(
        return SLAP_PTRCMP(a->ai_desc, b->ai_desc);
 }
 
-#ifdef LDAP_COMP_MATCH
-void
-bdb_attr_comp_ref(
-       struct bdb_info *bdb,
-       AttributeDescription *desc,
-       ComponentReference** cr )
-{
-       AttrInfo        *a;
-
-       a = (AttrInfo *) avl_find( bdb->bi_attrs, desc, ainfo_type_cmp );
-       
-       *cr = a != NULL ? a->ai_cr : 0 ;
-}
-void
-bdb_attr_mask_cr(
-       struct bdb_info *bdb,
-       AttributeDescription *desc,
-       slap_mask_t *indexmask,
-       ComponentReference** cr )
-{
-       AttrInfo        *a;
-
-       a = (AttrInfo *) avl_find( bdb->bi_attrs, desc, ainfo_type_cmp );
-       if ( a ) {
-               *indexmask = a->ai_indexmask;
-               *cr = a->ai_cr;
-       } else {
-               *indexmask = NULL;
-               *cr = NULL;
-       }
-}
-#endif
-
-void
+AttrInfo *
 bdb_attr_mask(
        struct bdb_info *bdb,
-       AttributeDescription *desc,
-       slap_mask_t *indexmask )
+       AttributeDescription *desc )
 {
-       AttrInfo        *a;
 
-       a = (AttrInfo *) avl_find( bdb->bi_attrs, desc, ainfo_type_cmp );
-       
-       *indexmask = a != NULL ? a->ai_indexmask : 0;
+       return avl_find( bdb->bi_attrs, desc, ainfo_type_cmp );
 }
 
 int
@@ -253,7 +209,15 @@ bdb_attr_index_config(
                        ad->ad_cname.bv_val, mask, 0 ); 
 
                a->ai_desc = ad;
-               a->ai_indexmask = mask;
+
+               if ( bdb->bi_flags & BDB_IS_OPEN ) {
+                       a->ai_indexmask = 0;
+                       a->ai_newmask = mask;
+               } else {
+                       a->ai_indexmask = mask;
+                       a->ai_newmask = 0;
+               }
+
 #ifdef LDAP_COMP_MATCH
                if ( cr ) {
                        a_cr = avl_find( bdb->bi_attrs, ad, ainfo_type_cmp );
@@ -282,8 +246,19 @@ bdb_attr_index_config(
                                 ainfo_cmp, avl_dup_error );
 
                if( rc ) {
+                       if ( bdb->bi_flags & BDB_IS_OPEN ) {
+                               AttrInfo *b = avl_find( bdb->bi_attrs, ad, ainfo_type_cmp );
+                               /* If we were editing this attr, reset it */
+                               b->ai_indexmask &= ~BDB_INDEX_DELETING;
+                               /* If this is leftover from a previous add, commit it */
+                               if ( b->ai_newmask )
+                                       b->ai_indexmask = b->ai_newmask;
+                               b->ai_newmask = a->ai_newmask;
+                               ch_free( a );
+                               continue;
+                       }
                        fprintf( stderr, "%s: line %d: duplicate index definition "
-                               "for attr \"%s\" (ignored)\n",
+                               "for attr \"%s\"" SLAPD_CONF_UNKNOWN_IGNORED ".\n",
                                fname, lineno, attrs[i] );
 
                        return LDAP_PARAM_ERROR;
@@ -296,9 +271,97 @@ bdb_attr_index_config(
        return LDAP_SUCCESS;
 }
 
+static int
+bdb_attr_index_unparser( void *v1, void *v2 )
+{
+       AttrInfo *ai = v1;
+       BerVarray *bva = v2;
+       struct berval bv;
+       char *ptr;
+
+       slap_index2bvlen( ai->ai_indexmask, &bv );
+       if ( bv.bv_len ) {
+               bv.bv_len += ai->ai_desc->ad_cname.bv_len + 1;
+               ptr = ch_malloc( bv.bv_len+1 );
+               bv.bv_val = lutil_strcopy( ptr, ai->ai_desc->ad_cname.bv_val );
+               *bv.bv_val++ = ' ';
+               slap_index2bv( ai->ai_indexmask, &bv );
+               bv.bv_val = ptr;
+               ber_bvarray_add( bva, &bv );
+       }
+       return 0;
+}
+
+static AttributeDescription addef = { NULL, NULL, BER_BVC("default") };
+static AttrInfo aidef = { &addef };
+
+void
+bdb_attr_index_unparse( struct bdb_info *bdb, BerVarray *bva )
+{
+       if ( bdb->bi_defaultmask ) {
+               aidef.ai_indexmask = bdb->bi_defaultmask;
+               bdb_attr_index_unparser( &aidef, bva );
+       }
+       avl_apply( bdb->bi_attrs, bdb_attr_index_unparser, bva, -1, AVL_INORDER );
+}
+
+static void
+bdb_attrinfo_free( void *v )
+{
+       AttrInfo *ai = v;
+#ifdef LDAP_COMP_MATCH
+       free( ai->ai_cr );
+#endif
+       free( ai );
+}
+
 void
 bdb_attr_index_destroy( Avlnode *tree )
 {
-       avl_free( tree, free );
+       avl_free( tree, bdb_attrinfo_free );
 }
 
+void bdb_attr_index_free( struct bdb_info *bdb, AttributeDescription *ad )
+{
+       AttrInfo *ai;
+
+       ai = avl_delete( &bdb->bi_attrs, ad, ainfo_type_cmp );
+       if ( ai )
+               bdb_attrinfo_free( ai );
+}
+
+/* Get a list of AttrInfo's to delete */
+
+typedef struct Alist {
+       struct Alist *next;
+       AttrInfo *ptr;
+} Alist;
+
+static int
+bdb_attrinfo_flush( void *v1, void *arg )
+{
+       AttrInfo *ai = v1;
+
+       if ( ai->ai_indexmask & BDB_INDEX_DELETING ) {
+               Alist **al = arg;
+               Alist *a = ch_malloc( sizeof( Alist ));
+               a->ptr = ai;
+               a->next = *al;
+               *al = a;
+       }
+       return 0;
+}
+
+void bdb_attr_flush( struct bdb_info *bdb )
+{
+       Alist *al = NULL, *a2;
+
+       avl_apply( bdb->bi_attrs, bdb_attrinfo_flush, &al, -1, AVL_INORDER );
+
+       while (( a2 = al )) {
+               al = al->next;
+               avl_delete( &bdb->bi_attrs, a2->ptr, ainfo_cmp );
+               bdb_attrinfo_free( a2->ptr );
+               ch_free( a2 );
+       }
+}