From d7ec4654dadc120851dad97bc4452b44c6c66e2c Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 17 Dec 2014 10:39:12 +0000
Subject: [PATCH] Rename transaction methods to create/read/update/delete
---
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/DatabaseContainer.java | 6 +++---
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/spi/WriteableStorage.java | 4 ++--
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/spi/ReadableStorage.java | 2 +-
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/persistit/PersistItStorage.java | 8 ++++----
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/ConfigurableEnvironment.java | 4 ++--
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/VLVIndex.java | 2 +-
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/State.java | 2 +-
7 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/persistit/PersistItStorage.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/persistit/PersistItStorage.java
index b4b9a95..6e4377a 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/persistit/PersistItStorage.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/persistit/PersistItStorage.java
@@ -121,7 +121,7 @@
}
@Override
- public ByteString get(TreeName treeName, ByteSequence key) {
+ public ByteString read(TreeName treeName, ByteSequence key) {
try {
final Exchange ex = getExchange(treeName);
ex.getKey().clear().append(key.toByteArray());
@@ -138,11 +138,11 @@
@Override
public ByteString getRMW(TreeName treeName, ByteSequence key) {
- return get(treeName, key);
+ return read(treeName, key);
}
@Override
- public void put(TreeName treeName, ByteSequence key, ByteSequence value) {
+ public void create(TreeName treeName, ByteSequence key, ByteSequence value) {
try {
final Exchange ex = getExchange(treeName);
ex.getKey().clear().append(key.toByteArray());
@@ -173,7 +173,7 @@
}
@Override
- public boolean remove(TreeName treeName, ByteSequence key) {
+ public boolean delete(TreeName treeName, ByteSequence key) {
try {
final Exchange ex = getExchange(treeName);
ex.getKey().clear().append(key.toByteArray());
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/ConfigurableEnvironment.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/ConfigurableEnvironment.java
index 7baa2bf..9718790 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/ConfigurableEnvironment.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/ConfigurableEnvironment.java
@@ -463,12 +463,12 @@
{
if (MemoryBudget.getRuntimeMaxMemory() < cfg.getDBCacheSize()) {
throw new ConfigException(
- ERR_CONFIG_JEB_CACHE_SIZE_GREATER_THAN_JVM_HEAP.get(
+ ERR_CONFIG_JEB_CACHE_SIZE_GREATER_THAN_JVM_HEAP.read(
cfg.getDBCacheSize(), MemoryBudget.getRuntimeMaxMemory()));
}
if (cfg.getDBCacheSize() < MemoryBudget.MIN_MAX_MEMORY_SIZE) {
throw new ConfigException(
- ERR_CONFIG_JEB_CACHE_SIZE_TOO_SMALL.get(
+ ERR_CONFIG_JEB_CACHE_SIZE_TOO_SMALL.read(
cfg.getDBCacheSize(), MemoryBudget.MIN_MAX_MEMORY_SIZE));
}
}
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 ec1647e..e7bb0b2 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
@@ -129,7 +129,7 @@
protected void put(WriteableStorage txn, ByteSequence key, ByteSequence value)
throws StorageRuntimeException
{
- txn.put(treeName, key, value);
+ txn.create(treeName, key, value);
if (logger.isTraceEnabled())
{
logger.trace(messageToLog(true, treeName, txn, key, value));
@@ -146,7 +146,7 @@
*/
protected ByteString read(ReadableStorage txn, ByteSequence key, boolean isRMW) throws StorageRuntimeException
{
- ByteString value = isRMW ? txn.get(treeName, key) : txn.getRMW(treeName, key);
+ ByteString value = isRMW ? txn.read(treeName, key) : txn.getRMW(treeName, key);
if (logger.isTraceEnabled())
{
logger.trace(messageToLog(value != null, treeName, txn, key, value));
@@ -183,7 +183,7 @@
*/
protected boolean delete(WriteableStorage txn, ByteSequence key) throws StorageRuntimeException
{
- boolean result = txn.remove(treeName, key);
+ boolean result = txn.delete(treeName, key);
if (logger.isTraceEnabled())
{
logger.trace(messageToLog(result, treeName, txn, key, null));
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/State.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/State.java
index 4050cb6..09fad97 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/State.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/State.java
@@ -116,7 +116,7 @@
{
ByteString key = keyForIndex(index);
- txn.put(treeName, key, trusted ? trueBytes : falseBytes);
+ txn.create(treeName, key, trusted ? trueBytes : falseBytes);
}
}
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/VLVIndex.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/VLVIndex.java
index 7e2d7cb..b3eece7 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/VLVIndex.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/VLVIndex.java
@@ -424,7 +424,7 @@
private SortValuesSet getSortValuesSet(ReadableStorage txn, ByteString key, boolean isRMW)
{
- ByteString value = isRMW ? txn.getRMW(treeName, key) : txn.get(treeName, key);
+ ByteString value = isRMW ? txn.getRMW(treeName, key) : txn.read(treeName, key);
if (value == null)
{
// There are no records in the database
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/spi/ReadableStorage.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/spi/ReadableStorage.java
index f9aa703..5692349 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/spi/ReadableStorage.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/spi/ReadableStorage.java
@@ -31,7 +31,7 @@
public interface ReadableStorage
{
- ByteString get(TreeName name, ByteSequence key);
+ ByteString read(TreeName name, ByteSequence key);
ByteString getRMW(TreeName name, ByteSequence key);
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/spi/WriteableStorage.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/spi/WriteableStorage.java
index 1c3beb6..9fadb7a 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/spi/WriteableStorage.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/spi/WriteableStorage.java
@@ -32,9 +32,9 @@
{
void openTree(TreeName name);
- void put(TreeName name, ByteSequence key, ByteSequence value);
+ void create(TreeName name, ByteSequence key, ByteSequence value);
boolean putIfAbsent(TreeName treeName, ByteSequence key, ByteSequence value);
- boolean remove(TreeName name, ByteSequence key);
+ boolean delete(TreeName name, ByteSequence key);
}
\ No newline at end of file
--
Gitblit v1.10.0