From 641e89ef0e15c9edde69f3b8cf82c7dd5f68687a Mon Sep 17 00:00:00 2001
From: Yannick Lecaillez <ylecaillez@forgerock.com>
Date: Wed, 30 Sep 2015 14:28:07 +0000
Subject: [PATCH] OPENDJ-2016: New on disk merge import strategy based on storage engine.
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DefaultIndex.java | 49 -------------------------------------------------
1 files changed, 0 insertions(+), 49 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DefaultIndex.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DefaultIndex.java
index 30bb629..a5e9991 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DefaultIndex.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DefaultIndex.java
@@ -36,13 +36,11 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
-import org.forgerock.util.Reject;
import org.forgerock.util.promise.NeverThrowsException;
import org.opends.server.backends.pluggable.CursorTransformer.ValueTransformer;
import org.opends.server.backends.pluggable.EntryIDSet.EntryIDSetCodec;
import org.opends.server.backends.pluggable.State.IndexFlag;
import org.opends.server.backends.pluggable.spi.Cursor;
-import org.opends.server.backends.pluggable.spi.Importer;
import org.opends.server.backends.pluggable.spi.ReadableTransaction;
import org.opends.server.backends.pluggable.spi.StorageRuntimeException;
import org.opends.server.backends.pluggable.spi.TreeName;
@@ -146,53 +144,6 @@
return importIDSet.valueToByteString(codec);
}
- // TODO JNR rename to importUpsert() ?
- @Override
- public final void importPut(Importer importer, ImportIDSet idsToBeAdded) throws StorageRuntimeException
- {
- Reject.ifNull(importer, "importer must not be null");
- Reject.ifNull(idsToBeAdded, "idsToBeAdded must not be null");
- ByteSequence key = idsToBeAdded.getKey();
- ByteString value = importer.read(getName(), key);
- if (value != null)
- {
- final EntryIDSet entryIDSet = decodeValue(key, value);
- final ImportIDSet importIDSet = new ImportIDSet(key, entryIDSet, indexEntryLimit);
- importIDSet.merge(idsToBeAdded);
- importer.put(getName(), key, toValue(importIDSet));
- }
- else
- {
- importer.put(getName(), key, toValue(idsToBeAdded));
- }
- }
-
- @Override
- public final void importRemove(Importer importer, ImportIDSet idsToBeRemoved) throws StorageRuntimeException
- {
- Reject.ifNull(importer, "importer must not be null");
- Reject.ifNull(idsToBeRemoved, "idsToBeRemoved must not be null");
- ByteSequence key = idsToBeRemoved.getKey();
- ByteString value = importer.read(getName(), key);
- if (value == null)
- {
- // Should never happen -- the keys should always be there.
- throw new IllegalStateException("Expected to have a value associated to key " + key + " for index " + getName());
- }
-
- final EntryIDSet entryIDSet = decodeValue(key, value);
- final ImportIDSet importIDSet = new ImportIDSet(key, entryIDSet, indexEntryLimit);
- importIDSet.remove(idsToBeRemoved);
- if (importIDSet.isDefined() && importIDSet.size() == 0)
- {
- importer.delete(getName(), key);
- }
- else
- {
- importer.put(getName(), key, toValue(importIDSet));
- }
- }
-
@Override
public final void update(final WriteableTransaction txn, final ByteString key, final EntryIDSet deletedIDs,
final EntryIDSet addedIDs) throws StorageRuntimeException
--
Gitblit v1.10.0