ITS#7329 optimize index update for simple add ops

Don't need to reindex all the attr values if there were no deletes.

diff --git a/servers/slapd/back-bdb/modify.c b/servers/slapd/back-bdb/modify.c
index 961649cd0d38cbe3c36cd1276c97a0539b208f8a..3cab8770eea34e91ac93e0f023e875bf4a458f4c 100644 (file)
--- a/servers/slapd/back-bdb/modify.c
+++ b/servers/slapd/back-bdb/modify.c
@@ -228,7 +228,9 @@ int bdb_modify_internal(
 
                        mod->sm_op = SLAP_MOD_SOFTDEL;
 
-                       if ( err == LDAP_NO_SUCH_ATTRIBUTE ) {
+                       if ( err == LDAP_SUCCESS ) {
+                               got_delete = 1;
+                       } else if ( err == LDAP_NO_SUCH_ATTRIBUTE ) {
                                err = LDAP_SUCCESS;
                        }
 
@@ -338,6 +340,9 @@ int bdb_modify_internal(
                        if ( a2 ) {
                                /* need to detect which values were deleted */
                                int i, j;
+                               /* let add know there were deletes */
+                               if ( a2->a_flags & SLAP_ATTR_IXADD )
+                                       a2->a_flags |= SLAP_ATTR_IXDEL;
                                vals = op->o_tmpalloc( (ap->a_numvals + 1) *
                                        sizeof(struct berval), op->o_tmpmemctx );
                                j = 0;
@@ -375,9 +380,42 @@ int bdb_modify_internal(
        for ( ap = e->e_attrs; ap != NULL; ap = ap->a_next ) {
                if (ap->a_flags & SLAP_ATTR_IXADD) {
                        ap->a_flags &= ~SLAP_ATTR_IXADD;
-                       rc = bdb_index_values( op, tid, ap->a_desc,
-                               ap->a_nvals,
-                               e->e_id, SLAP_INDEX_ADD_OP );
+                       if ( ap->a_flags & SLAP_ATTR_IXDEL ) {
+                               /* if any values were deleted, we must readd index
+                                * for all remaining values.
+                                */
+                               ap->a_flags &= ~SLAP_ATTR_IXDEL;
+                               rc = bdb_index_values( op, tid, ap->a_desc,
+                                       ap->a_nvals,
+                                       e->e_id, SLAP_INDEX_ADD_OP );
+                       } else {
+                               /* if this was only an add, we only need to index
+                                * the added values.
+                                */
+                               for ( ml = modlist; ml != NULL; ml = ml->sml_next ) {
+                                       struct berval *vals;
+                                       if ( ml->sml_desc != ap->a_desc || !ml->sml_numvals )
+                                               continue;
+                                       switch( ml->sml_op ) {
+                                       case LDAP_MOD_ADD:
+                                       case LDAP_MOD_REPLACE:
+                                       case LDAP_MOD_INCREMENT:
+                                       case SLAP_MOD_SOFTADD:
+                                       case SLAP_MOD_ADD_IF_NOT_PRESENT:
+                                               if ( ml->sml_op == LDAP_MOD_INCREMENT )
+                                                       vals = ap->a_nvals;
+                                               else if ( ml->sml_nvalues )
+                                                       vals = ml->sml_nvalues;
+                                               else
+                                                       vals = ml->sml_values;
+                                               rc = bdb_index_values( op, tid, ap->a_desc,
+                                                       vals, e->e_id, SLAP_INDEX_ADD_OP );
+                                               break;
+                                       }
+                                       if ( rc )
+                                               break;
+                               }
+                       }
                        if ( rc != LDAP_SUCCESS ) {
                                Debug( LDAP_DEBUG_ANY,
                                       "%s: attribute \"%s\" index add failure\n",

diff --git a/servers/slapd/back-mdb/modify.c b/servers/slapd/back-mdb/modify.c
index 1a81e820a084b0fd612737f9b852f7669de0e6a3..44805b6e4e25f21856c48a5a57d375489ab13b12 100644 (file)
--- a/servers/slapd/back-mdb/modify.c
+++ b/servers/slapd/back-mdb/modify.c
@@ -228,7 +228,9 @@ int mdb_modify_internal(
 
                        mod->sm_op = SLAP_MOD_SOFTDEL;
 
-                       if ( err == LDAP_NO_SUCH_ATTRIBUTE ) {
+                       if ( err == LDAP_SUCCESS ) {
+                               got_delete = 1;
+                       } else if ( err == LDAP_NO_SUCH_ATTRIBUTE ) {
                                err = LDAP_SUCCESS;
                        }
 
@@ -338,6 +340,9 @@ int mdb_modify_internal(
                        if ( a2 ) {
                                /* need to detect which values were deleted */
                                int i, j;
+                               /* let add know there were deletes */
+                               if ( a2->a_flags & SLAP_ATTR_IXADD )
+                                       a2->a_flags |= SLAP_ATTR_IXDEL;
                                vals = op->o_tmpalloc( (ap->a_numvals + 1) *
                                        sizeof(struct berval), op->o_tmpmemctx );
                                j = 0;
@@ -375,9 +380,42 @@ int mdb_modify_internal(
        for ( ap = e->e_attrs; ap != NULL; ap = ap->a_next ) {
                if (ap->a_flags & SLAP_ATTR_IXADD) {
                        ap->a_flags &= ~SLAP_ATTR_IXADD;
-                       rc = mdb_index_values( op, tid, ap->a_desc,
-                               ap->a_nvals,
-                               e->e_id, SLAP_INDEX_ADD_OP );
+                       if ( ap->a_flags & SLAP_ATTR_IXDEL ) {
+                               /* if any values were deleted, we must readd index
+                                * for all remaining values.
+                                */
+                               ap->a_flags &= ~SLAP_ATTR_IXDEL;
+                               rc = mdb_index_values( op, tid, ap->a_desc,
+                                       ap->a_nvals,
+                                       e->e_id, SLAP_INDEX_ADD_OP );
+                       } else {
+                               /* if this was only an add, we only need to index
+                                * the added values.
+                                */
+                               for ( ml = modlist; ml != NULL; ml = ml->sml_next ) {
+                                       struct berval *vals;
+                                       if ( ml->sml_desc != ap->a_desc || !ml->sml_numvals )
+                                               continue;
+                                       switch( ml->sml_op ) {
+                                       case LDAP_MOD_ADD:
+                                       case LDAP_MOD_REPLACE:
+                                       case LDAP_MOD_INCREMENT:
+                                       case SLAP_MOD_SOFTADD:
+                                       case SLAP_MOD_ADD_IF_NOT_PRESENT:
+                                               if ( ml->sml_op == LDAP_MOD_INCREMENT )
+                                                       vals = ap->a_nvals;
+                                               else if ( ml->sml_nvalues )
+                                                       vals = ml->sml_nvalues;
+                                               else
+                                                       vals = ml->sml_values;
+                                               rc = mdb_index_values( op, tid, ap->a_desc,
+                                                       vals, e->e_id, SLAP_INDEX_ADD_OP );
+                                               break;
+                                       }
+                                       if ( rc )
+                                               break;
+                               }
+                       }
                        if ( rc != LDAP_SUCCESS ) {
                                Debug( LDAP_DEBUG_ANY,
                                       "%s: attribute \"%s\" index add failure\n",