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/TracedStorage.java | 34 ++++++++++++----------------------
1 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/TracedStorage.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/TracedStorage.java
index cdb7f71..34fb15d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/TracedStorage.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/TracedStorage.java
@@ -36,6 +36,7 @@
import org.opends.server.backends.pluggable.spi.Importer;
import org.opends.server.backends.pluggable.spi.ReadOperation;
import org.opends.server.backends.pluggable.spi.ReadableTransaction;
+import org.opends.server.backends.pluggable.spi.SequentialCursor;
import org.opends.server.backends.pluggable.spi.Storage;
import org.opends.server.backends.pluggable.spi.StorageRuntimeException;
import org.opends.server.backends.pluggable.spi.StorageStatus;
@@ -63,11 +64,10 @@
}
@Override
- public void createTree(final TreeName name)
+ public void clearTree(final TreeName name)
{
- importer.createTree(name);
- logger.trace("Storage@%s.Importer@%s.createTree(%s, %s)",
- storageId(), id(), backendId, name);
+ importer.clearTree(name);
+ logger.trace("Storage@%s.Importer@%s.clearTree(%s, %s)", storageId(), id(), backendId, name);
}
@Override
@@ -88,15 +88,6 @@
}
@Override
- public boolean delete(TreeName name, ByteSequence key)
- {
- final boolean delete = importer.delete(name, key);
- logger.trace("Storage@%s.Importer@%s.delete(%s, %s, %s) = %b",
- storageId(), id(), backendId, name, hex(key), delete);
- return delete;
- }
-
- @Override
public void close()
{
importer.close();
@@ -108,6 +99,13 @@
{
return System.identityHashCode(this);
}
+
+ @Override
+ public SequentialCursor<ByteString, ByteString> openCursor(TreeName name)
+ {
+ logger.trace("Storage@%s.Importer@%s.openCursor(%s,%s)", storageId(), id(), backendId, name);
+ return importer.openCursor(name);
+ }
}
/** Decorates an {@link ReadableTransaction} with additional trace logging. */
@@ -224,14 +222,6 @@
}
@Override
- public void renameTree(final TreeName oldName, final TreeName newName)
- {
- txn.renameTree(oldName, newName);
- logger.trace("Storage@%s.WriteableTransaction@%s.renameTree(%s, %s, %s)",
- storageId(), id(), backendId, oldName, newName);
- }
-
- @Override
public boolean update(final TreeName name, final ByteSequence key, final UpdateFunction f)
{
final boolean isUpdated = txn.update(name, key, f);
@@ -389,7 +379,7 @@
return results;
}
- private String hex(final ByteSequence bytes)
+ private static String hex(final ByteSequence bytes)
{
return bytes != null ? bytes.toByteString().toHexString() : null;
}
--
Gitblit v1.10.0