upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-21 07:09:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#9858 back-mdb: fix index reconfig

Browse source
This commit is contained in:
Howard Chu 2022-06-03 00:48:50 +01:00
parent 9e5701cdd7
commit 395e9b250a
2 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
servers/slapd/back-mdb/attr.c
View file

@ -446,7 +446,11 @@ fail:
/* If this is leftover from a previous add, commit it */ /* If this is leftover from a previous add, commit it */
if ( b->ai_newmask ) if ( b->ai_newmask )
b->ai_indexmask = b->ai_newmask; b->ai_indexmask = b->ai_newmask;
/* If the mask changed, remember it */
if ( b->ai_indexmask != a->ai_newmask )
b->ai_newmask = a->ai_newmask; b->ai_newmask = a->ai_newmask;
else /* else ignore it */
b->ai_newmask = 0;
ch_free( a ); ch_free( a );
rc = 0; rc = 0;
continue; continue;

24
servers/slapd/back-mdb/config.c
View file

@ -349,7 +349,7 @@ mdb_setup_indexer( struct mdb_info *mdb )
MDB_txn *txn; MDB_txn *txn;
MDB_cursor *curs; MDB_cursor *curs;
MDB_val key, data; MDB_val key, data;
int i, rc; int i, rc, changed = 0;
unsigned short s; unsigned short s;
rc = mdb_txn_begin( mdb->mi_dbenv, NULL, 0, &txn ); rc = mdb_txn_begin( mdb->mi_dbenv, NULL, 0, &txn );
@ -364,17 +364,6 @@ mdb_setup_indexer( struct mdb_info *mdb )
key.mv_size = sizeof( s ); key.mv_size = sizeof( s );
key.mv_data = &s; key.mv_data = &s;
/* set indexer task to start at first entry */
{
ID id = 0;
s = 0; /* key 0 records next entryID to index */
data.mv_size = sizeof( ID );
data.mv_data = &id;
rc = mdb_cursor_put( curs, &key, &data, 0 );
if ( rc )
goto done;
}
/* record current and new index masks for all new index definitions */ /* record current and new index masks for all new index definitions */
{ {
slap_mask_t mask[2]; slap_mask_t mask[2];
@ -389,8 +378,19 @@ mdb_setup_indexer( struct mdb_info *mdb )
rc = mdb_cursor_put( curs, &key, &data, 0 ); rc = mdb_cursor_put( curs, &key, &data, 0 );
if ( rc ) if ( rc )
goto done; goto done;
changed = 1;
} }
} }
/* set indexer task to start at first entry */
if ( changed ) {
ID id = 0;
s = 0; /* key 0 records next entryID to index */
data.mv_size = sizeof( ID );
data.mv_data = &id;
rc = mdb_cursor_put( curs, &key, &data, 0 );
}
done: done:
mdb_cursor_close( curs ); mdb_cursor_close( curs );
if ( !rc ) if ( !rc )