From 7c6b1f8176561447f0cdb0de118f1bd27a767b09 Mon Sep 17 00:00:00 2001
From: Yannick Lecaillez <yannick.lecaillez@forgerock.com>
Date: Fri, 20 Mar 2015 14:27:32 +0000
Subject: [PATCH] OPENDJ-1867: Consider removing ImportIDSet and using EntryIDSet instead
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Importer.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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 86cd5ed..bcea937 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
@@ -32,6 +32,7 @@
import static org.opends.server.util.DynamicConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
+import static org.opends.server.backends.pluggable.EntryIDSet.*;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
@@ -2080,11 +2081,11 @@
{
if (indexMgr.isDN2ID())
{
- return new ImportIDSet(key, 1, 1, false);
+ return new ImportIDSet(key, newDefinedSet(), 1, false);
}
final Index index = idContainerMap.get(indexID);
- return new ImportIDSet(key, 1, index.getIndexEntryLimit(), index.getMaintainCount());
+ return new ImportIDSet(key, newDefinedSet(), index.getIndexEntryLimit(), index.getMaintainCount());
}
private void addToDB(int indexID, ImportIDSet insertSet, ImportIDSet deleteSet) throws DirectoryException
@@ -2265,7 +2266,7 @@
ImportIDSet idSet = id2childTree.get(parentIDBytes);
if (idSet == null)
{
- idSet = new ImportIDSet(parentIDBytes, 1, childLimit, childDoCount);
+ idSet = new ImportIDSet(parentIDBytes, newDefinedSet(), childLimit, childDoCount);
id2childTree.put(parentIDBytes, idSet);
}
return idSet;
@@ -2315,7 +2316,7 @@
ImportIDSet idSet = id2subtreeTree.get(entryIDBytes);
if (idSet == null)
{
- idSet = new ImportIDSet(entryIDBytes, 1, subTreeLimit, subTreeDoCount);
+ idSet = new ImportIDSet(entryIDBytes, newDefinedSet(), subTreeLimit, subTreeDoCount);
id2subtreeTree.put(entryIDBytes, idSet);
}
return idSet;
--
Gitblit v1.10.0