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/jeb/Suffix.java | 25 ++++---------------------
1 files changed, 4 insertions(+), 21 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Suffix.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Suffix.java
index 06fed80..cff5632 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Suffix.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Suffix.java
@@ -266,19 +266,13 @@
entryContainer.getID2Subtree().setTrusted(null, trusted);
for (AttributeIndex attributeIndex : entryContainer.getAttributeIndexes())
{
- setTrusted(attributeIndex.getEqualityIndex(), trusted);
- setTrusted(attributeIndex.getPresenceIndex(), trusted);
- setTrusted(attributeIndex.getSubstringIndex(), trusted);
- setTrusted(attributeIndex.getOrderingIndex(), trusted);
- setTrusted(attributeIndex.getApproximateIndex(), trusted);
- Map<String, Collection<Index>> exIndexes = attributeIndex.getExtensibleIndexes();
- if(!exIndexes.isEmpty())
+ for (Index index : attributeIndex.getAllIndexes())
{
- setTrusted(exIndexes.get(EXTENSIBLE_INDEXER_ID_SUBSTRING), trusted);
- setTrusted(exIndexes.get(EXTENSIBLE_INDEXER_ID_SHARED), trusted);
+ setTrusted(index, trusted);
}
}
- for(VLVIndex vlvIdx : entryContainer.getVLVIndexes()) {
+ for (VLVIndex vlvIdx : entryContainer.getVLVIndexes())
+ {
vlvIdx.setTrusted(null, trusted);
}
}
@@ -291,17 +285,6 @@
}
}
- private void setTrusted(Collection<Index> subIndexes, boolean trusted)
- {
- if (subIndexes != null)
- {
- for (Index subIndex : subIndexes)
- {
- subIndex.setTrusted(null, trusted);
- }
- }
- }
-
/**
* Return a src entry container.
*
--
Gitblit v1.10.0