From efb2c64b488f80a077d2aa0be8c3af569de37d9d Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 16 Dec 2014 15:34:46 +0000
Subject: [PATCH] OPENDJ-1602 (CR-5566) New pluggable storage based backend
---
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/DatabaseContainer.java | 4 ++--
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/BackendImpl.java | 6 ++----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/BackendImpl.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/BackendImpl.java
index 7fd7911..8411478 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/BackendImpl.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/BackendImpl.java
@@ -134,8 +134,6 @@
void open() throws Exception;
- void openTree(TreeName name);
-
<T> T read(ReadOperation<T> readTransaction) throws Exception;
void write(WriteOperation updateTransaction) throws Exception;
@@ -264,13 +262,13 @@
public interface WriteableStorage extends ReadableStorage
{
+ void openTree(TreeName name);
+
void put(TreeName name, ByteSequence key, ByteSequence value);
boolean putIfAbsent(TreeName treeName, ByteSequence key, ByteSequence value);
boolean remove(TreeName name, ByteSequence key);
-
- boolean remove(TreeName name, ByteSequence key, ByteSequence value);
}
/** The configuration of this JE backend. */
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/DatabaseContainer.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/DatabaseContainer.java
index 4da4491..612bbc1 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/DatabaseContainer.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/DatabaseContainer.java
@@ -80,7 +80,7 @@
*/
public void open(WriteableStorage txn) throws StorageRuntimeException
{
- storage.openTree(treeName);
+ txn.openTree(treeName);
if (logger.isTraceEnabled())
{
logger.trace("JE database %s opened. txnid=%d", treeName, txn.getId());
@@ -146,7 +146,7 @@
*/
protected ByteString read(ReadableStorage txn, ByteSequence key, boolean isRMW) throws StorageRuntimeException
{
- ByteString value = txn.get(treeName, key);
+ ByteString value = isRMW ? txn.get(treeName, key) : txn.getRMW(treeName, key);
if (logger.isTraceEnabled())
{
logger.trace(messageToLog(value != null, treeName, txn, key, value));
--
Gitblit v1.10.0