From 8ac57ee1cd50fcc3d02b36bea4ab1335924f1d7a Mon Sep 17 00:00:00 2001
From: Yannick Lecaillez <yannick.lecaillez@forgerock.com>
Date: Mon, 18 May 2015 13:52:40 +0000
Subject: [PATCH] OPENDJ-1864: Ordering matching rules should reuse equality indexes where possible
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VerifyJob.java | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VerifyJob.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VerifyJob.java
index 1fa084f..4d56ff0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VerifyJob.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VerifyJob.java
@@ -51,7 +51,6 @@
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
-import org.forgerock.opendj.ldap.spi.IndexingOptions;
import org.opends.server.backends.VerifyConfig;
import org.opends.server.backends.pluggable.AttributeIndex.MatchingRuleIndex;
import org.opends.server.backends.pluggable.spi.Cursor;
@@ -431,10 +430,9 @@
else if (attrIndexList.size() > 0)
{
AttributeIndex attrIndex = attrIndexList.get(0);
- final IndexingOptions options = attrIndex.getIndexingOptions();
for (MatchingRuleIndex index : attrIndex.getNameToIndexes().values())
{
- iterateAttrIndex(txn, index, options);
+ iterateAttrIndex(txn, index);
}
}
else if (vlvIndexList.size() > 0)
@@ -672,8 +670,7 @@
* @param index The index tree to be checked.
* @throws StorageRuntimeException If an error occurs in the storage.
*/
- private void iterateAttrIndex(ReadableTransaction txn, MatchingRuleIndex index, IndexingOptions options)
- throws StorageRuntimeException
+ private void iterateAttrIndex(ReadableTransaction txn, MatchingRuleIndex index) throws StorageRuntimeException
{
if (index == null)
{
@@ -780,7 +777,7 @@
};
- index.indexEntry(entry, dummySet, options);
+ index.indexEntry(entry, dummySet);
if (!foundMatchingKey.get())
{
@@ -958,11 +955,10 @@
*/
private void verifyAttribute(ReadableTransaction txn, EntryID entryID, Entry entry, AttributeIndex attrIndex)
{
- IndexingOptions options = attrIndex.getIndexingOptions();
for (MatchingRuleIndex index : attrIndex.getNameToIndexes().values())
{
Set<ByteString> keys = new HashSet<ByteString>();
- index.indexEntry(entry, keys, options);
+ index.indexEntry(entry, keys);
for (ByteString key : keys)
{
verifyAttributeInIndex(index, txn, key, entryID);
--
Gitblit v1.10.0