From 1eae551e6fae25e14e27cbdcc1745df83063a875 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 19 May 2015 09:50:20 +0000
Subject: [PATCH] Code simplifications with indexes
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Importer.java | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Importer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Importer.java
index e905e90..2772f39 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Importer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Importer.java
@@ -56,7 +56,6 @@
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedList;
@@ -1407,7 +1406,6 @@
{
private final Storage storage;
private final Map<IndexKey, IndexOutputBuffer> indexBufferMap = new HashMap<>();
- private final Set<ByteString> keySet = new HashSet<>();
private final IndexKey dnIndexKey = new IndexKey(DN_TYPE, DN2ID_INDEX_NAME, 1);
public ImportTask(final Storage storage)
@@ -1550,10 +1548,7 @@
void processAttribute0(MatchingRuleIndex index, Entry entry, EntryID entryID, IndexKey indexKey, boolean insert)
throws InterruptedException
{
- keySet.clear();
- index.indexEntry(entry, keySet);
-
- for (ByteString key : keySet)
+ for (ByteString key : index.indexEntry(entry))
{
processKey(index, key, entryID, indexKey, insert);
}
@@ -3306,8 +3301,8 @@
if (obj instanceof IndexKey)
{
IndexKey oKey = (IndexKey) obj;
- if (attributeType.equals(oKey.getAttributeType())
- && indexID.equals(oKey.getIndexID()))
+ if (attributeType.equals(oKey.attributeType)
+ && indexID.equals(oKey.indexID))
{
return true;
}
--
Gitblit v1.10.0