From 2f13f91c158747ca997a44d8e61830f46b77dd82 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 14 Mar 2014 11:31:24 +0000
Subject: [PATCH] OPENDJ-1308 (CR-3156) Migrate schema support - ByteString - Indexer
---
opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
index c2a21e5..beec8b1 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
@@ -36,6 +36,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.util.Utils;
import org.opends.server.admin.std.meta.LocalDBIndexCfgDefn;
import org.opends.server.admin.std.meta.LocalDBIndexCfgDefn.IndexType;
@@ -48,7 +49,6 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.extensions.DiskSpaceMonitor;
import org.opends.server.types.*;
-import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.LDIFReader;
import org.opends.server.util.Platform;
import org.opends.server.util.StaticUtils;
@@ -1431,8 +1431,8 @@
*/
private class AppendReplaceTask extends ImportTask
{
- private final Set<byte[]> insertKeySet = new HashSet<byte[]>(),
- deleteKeySet = new HashSet<byte[]>();
+ private final Set<ByteString> insertKeySet = new HashSet<ByteString>();
+ private final Set<ByteString> deleteKeySet = new HashSet<ByteString>();
private final EntryInformation entryInfo = new EntryInformation();
private Entry oldEntry;
private EntryID entryID;
@@ -1536,16 +1536,16 @@
{
deleteKeySet.clear();
index.indexer.indexEntry(oldEntry, deleteKeySet);
- for (byte[] delKey : deleteKeySet)
+ for (ByteString delKey : deleteKeySet)
{
- processKey(index, delKey, entryID, indexComparator, indexKey, false);
+ processKey(index, delKey.toByteArray(), entryID, indexComparator, indexKey, false);
}
}
insertKeySet.clear();
index.indexer.indexEntry(entry, insertKeySet);
- for (byte[] key : insertKeySet)
+ for (ByteString key : insertKeySet)
{
- processKey(index, key, entryID, indexComparator, indexKey, true);
+ processKey(index, key.toByteArray(), entryID, indexComparator, indexKey, true);
}
}
}
@@ -1558,7 +1558,7 @@
{
private final Map<IndexKey, IndexOutputBuffer> indexBufferMap =
new HashMap<IndexKey, IndexOutputBuffer>();
- private final Set<byte[]> insertKeySet = new HashSet<byte[]>();
+ private final Set<ByteString> insertKeySet = new HashSet<ByteString>();
private final EntryInformation entryInfo = new EntryInformation();
private DatabaseEntry keyEntry = new DatabaseEntry(),
valEntry = new DatabaseEntry();
@@ -1745,9 +1745,9 @@
{
insertKeySet.clear();
index.indexer.indexEntry(entry, insertKeySet);
- for (byte[] key : insertKeySet)
+ for (ByteString key : insertKeySet)
{
- processKey(index, key, entryID, indexComparator, indexKey, true);
+ processKey(index, key.toByteArray(), entryID, indexComparator, indexKey, true);
}
}
--
Gitblit v1.10.0