From 5d07ec161328a94de355aa4bf93918a2da5a8602 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 30 Apr 2015 14:20:06 +0000
Subject: [PATCH] OPENDJ-1801 (CR-6815) Revise usage of storage.open() and startImport()
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/TracedStorage.java | 45 ++++++++++++++++++++++++++++++---------------
1 files changed, 30 insertions(+), 15 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 ee6bc45..a820646 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
@@ -26,6 +26,7 @@
package org.opends.server.backends.pluggable;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.backends.pluggable.spi.Cursor;
@@ -44,15 +45,11 @@
import org.opends.server.types.DirectoryException;
import org.opends.server.types.RestoreConfig;
-/**
- * Decorates a {@link Storage} with additional trace logging.
- */
+/** Decorates a {@link Storage} with additional trace logging. */
@SuppressWarnings("javadoc")
final class TracedStorage implements Storage
{
- /**
- * Decorates an {@link Importer} with additional trace logging.
- */
+ /** Decorates an {@link Importer} with additional trace logging. */
private final class TracedImporter implements Importer
{
private final Importer importer;
@@ -63,14 +60,6 @@
}
@Override
- public void close()
- {
- importer.close();
- logger.trace("Storage@%s.Importer@%s.close(%s)",
- storageId(), id(), backendId);
- }
-
- @Override
public void createTree(final TreeName name)
{
importer.createTree(name);
@@ -86,6 +75,32 @@
storageId(), id(), backendId, name, hex(key), hex(value));
}
+ @Override
+ public ByteString read(TreeName name, ByteSequence key)
+ {
+ final ByteString value = importer.read(name, key);
+ logger.trace("Storage@%s.Importer@%s.read(%s, %s, %s) = %s",
+ storageId(), id(), backendId, name, hex(key), hex(value));
+ return value;
+ }
+
+ @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();
+ logger.trace("Storage@%s.Importer@%s.close(%s)",
+ storageId(), id(), backendId);
+ }
+
private int id()
{
return System.identityHashCode(this);
@@ -294,7 +309,7 @@
}
@Override
- public Importer startImport() throws Exception
+ public Importer startImport() throws ConfigException, StorageRuntimeException
{
final Importer importer = storage.startImport();
if (logger.isTraceEnabled())
--
Gitblit v1.10.0