From 4cd06b3633e335f68d6cad0ad2483246076775b4 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 07 Apr 2015 15:43:34 +0000
Subject: [PATCH] Code simplification in AttributeIndex
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VerifyJob.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 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 b97484c..1df6583 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
@@ -53,6 +53,7 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.schema.MatchingRule;
import org.forgerock.opendj.ldap.spi.IndexingOptions;
+import org.opends.server.admin.std.meta.BackendIndexCfgDefn.IndexType;
import org.opends.server.backends.VerifyConfig;
import org.opends.server.backends.pluggable.AttributeIndex.MatchingRuleIndex;
import org.opends.server.backends.pluggable.spi.Cursor;
@@ -480,11 +481,10 @@
{
AttributeIndex attrIndex = attrIndexList.get(0);
final IndexingOptions options = attrIndex.getIndexingOptions();
- iterateAttrIndex(txn, attrIndex.getEqualityIndex(), options);
- iterateAttrIndex(txn, attrIndex.getPresenceIndex(), options);
- iterateAttrIndex(txn, attrIndex.getSubstringIndex(), options);
- iterateAttrIndex(txn, attrIndex.getOrderingIndex(), options);
- iterateAttrIndex(txn, attrIndex.getApproximateIndex(), options);
+ for (MatchingRuleIndex index : attrIndex.getDefaultNameToIndexes().values())
+ {
+ iterateAttrIndex(txn, index, options);
+ }
// TODO: Need to iterate through ExtendedMatchingRules indexes.
}
else if (vlvIndexList.size() > 0)
@@ -1381,11 +1381,12 @@
return;
}
- Index equalityIndex = attrIndex.getEqualityIndex();
- Index presenceIndex = attrIndex.getPresenceIndex();
- Index substringIndex = attrIndex.getSubstringIndex();
- Index orderingIndex = attrIndex.getOrderingIndex();
- Index approximateIndex = attrIndex.getApproximateIndex();
+ final Map<String, MatchingRuleIndex> nameToIndexes = attrIndex.getNameToIndexes();
+ Index equalityIndex = nameToIndexes.get(IndexType.EQUALITY.toString());
+ Index presenceIndex = nameToIndexes.get(IndexType.PRESENCE.toString());
+ Index substringIndex = nameToIndexes.get(IndexType.SUBSTRING.toString());
+ Index orderingIndex = nameToIndexes.get(IndexType.ORDERING.toString());
+ Index approximateIndex = nameToIndexes.get(IndexType.APPROXIMATE.toString());
// TODO: Add support for Extended Matching Rules indexes.
if (presenceIndex != null)
@@ -1548,11 +1549,10 @@
{
AttributeIndex attrIndex = attrIndexList.get(0);
totalCount = 0;
- totalCount += getRecordCount(txn, attrIndex.getEqualityIndex());
- totalCount += getRecordCount(txn, attrIndex.getPresenceIndex());
- totalCount += getRecordCount(txn, attrIndex.getSubstringIndex());
- totalCount += getRecordCount(txn, attrIndex.getOrderingIndex());
- totalCount += getRecordCount(txn, attrIndex.getApproximateIndex());
+ for (MatchingRuleIndex index : attrIndex.getDefaultNameToIndexes().values())
+ {
+ totalCount += getRecordCount(txn, index);
+ }
// TODO: Add support for Extended Matching Rules indexes.
}
else if (vlvIndexList.size() > 0)
--
Gitblit v1.10.0