From afb8c54687d4b965484ec2630ce6f66a5e5b17a3 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 08 Apr 2015 11:29:49 +0000
Subject: [PATCH] (CR-6590) Remove code specific to extensible indexes in Importer and VerifyJob
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VerifyJob.java | 10 ++++------
1 files changed, 4 insertions(+), 6 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 1df6583..80267de 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
@@ -481,11 +481,10 @@
{
AttributeIndex attrIndex = attrIndexList.get(0);
final IndexingOptions options = attrIndex.getIndexingOptions();
- for (MatchingRuleIndex index : attrIndex.getDefaultNameToIndexes().values())
+ for (MatchingRuleIndex index : attrIndex.getNameToIndexes().values())
{
iterateAttrIndex(txn, index, options);
}
- // TODO: Need to iterate through ExtendedMatchingRules indexes.
}
else if (vlvIndexList.size() > 0)
{
@@ -1545,17 +1544,16 @@
{
totalCount = id2s.getRecordCount(txn);
}
- else if(attrIndexList.size() > 0)
+ else if (!attrIndexList.isEmpty())
{
AttributeIndex attrIndex = attrIndexList.get(0);
totalCount = 0;
- for (MatchingRuleIndex index : attrIndex.getDefaultNameToIndexes().values())
+ for (MatchingRuleIndex index : attrIndex.getNameToIndexes().values())
{
totalCount += getRecordCount(txn, index);
}
- // TODO: Add support for Extended Matching Rules indexes.
}
- else if (vlvIndexList.size() > 0)
+ else if (!vlvIndexList.isEmpty())
{
totalCount = vlvIndexList.get(0).getRecordCount(txn);
}
--
Gitblit v1.10.0