mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-24 13:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

More for large multival attrs

Browse Source 
We can't persist the sorted flag since the sort order between
DB and attr schema don't necessarily agree
This commit is contained in:
Howard Chu 2016-04-01 18:49:59 +01:00
parent 283f3ae171
commit 2335285502
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
servers/slapd/back-mdb/id2entry.c
View File

@ -837,6 +837,13 @@ static int mdb_entry_partsize(struct mdb_info *mdb, MDB_txn *txn, Entry *e,
* attribute's values are already sorted. If the MDB_AT_MULTI bit of the
* attr index is set, the values are stored separately.
*
* Unfortunately, MDB_AT_MULTI and MDB_AT_SORTED are mutually exclusive;
* the DB stores big multi-valued attrs in sorted order but the sorting
* is according to the DB order which is not guaranteed to match the
* attribute's matching rule ordering. So, drop the sorted flag on big
* multi-val attributes, the values will need to be resorted when the
* entry is read again.
*
* If the MDB_AT_NVALS bit of numvals is set, the attribute also has
* normalized values present. (Note - a_numvals is an unsigned int, so this
* means it's possible to receive an attribute that we can't encode due
@ -876,10 +883,10 @@ static int mdb_entry_encode(Operation *op, Entry *e, MDB_val *data, Ecount *eh)
if (!a->a_desc->ad_index)
return LDAP_UNDEFINED_TYPE;
l = mdb->mi_adxs[a->a_desc->ad_index];
if (a->a_flags & SLAP_ATTR_SORTED_VALS)
l |= MDB_AT_SORTED;
if (a->a_flags & SLAP_ATTR_BIG_MULTI)
l |= MDB_AT_MULTI;
else if (a->a_flags & SLAP_ATTR_SORTED_VALS)
l |= MDB_AT_SORTED;
*lp++ = l;
l = a->a_numvals;
if (a->a_nvals != a->a_vals)