From 1d9aa3c9d7c816633873ad4eaf8f4f513928b71c Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 17 Dec 2014 11:13:23 +0000
Subject: [PATCH] OPENDJ-1602 (CR-5566) New pluggable storage based backend
---
opendj3-server-dev/src/server/org/opends/server/backends/persistit/PersistItStorage.java | 13 ++++++++++++-
opendj3-server-dev/src/server/org/opends/server/backends/pluggable/spi/WriteableStorage.java | 4 +++-
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/persistit/PersistItStorage.java b/opendj3-server-dev/src/server/org/opends/server/backends/persistit/PersistItStorage.java
index 8c680b1..a0f6c42 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/persistit/PersistItStorage.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/persistit/PersistItStorage.java
@@ -195,7 +195,7 @@
}
@Override
- public boolean delete(TreeName treeName, ByteSequence key) {
+ public boolean remove(TreeName treeName, ByteSequence key) {
try {
final Exchange ex = getExchange(treeName);
ex.getKey().clear().append(key.toByteArray());
@@ -206,6 +206,17 @@
}
@Override
+ public void delete(TreeName treeName, ByteSequence key) {
+ try {
+ final Exchange ex = getExchange(treeName);
+ ex.getKey().clear().append(key.toByteArray());
+ ex.remove();
+ } catch (PersistitException e) {
+ throw new StorageRuntimeException(e);
+ }
+ }
+
+ @Override
public Cursor openCursor(TreeName treeName) {
try {
return new CursorImpl(getExchange(treeName));
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/spi/WriteableStorage.java b/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/spi/WriteableStorage.java
index 20fbe9f..ec429a8 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/spi/WriteableStorage.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/spi/WriteableStorage.java
@@ -38,5 +38,7 @@
void update(TreeName treeName, ByteSequence key, UpdateFunction f);
- boolean delete(TreeName name, ByteSequence key);
+ boolean remove(TreeName name, ByteSequence key);
+
+ void delete(TreeName name, ByteSequence key);
}
\ No newline at end of file
--
Gitblit v1.10.0