From 0bd57577bb85119b2b4495c5ef525ba189d8d17c Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 04 Mar 2015 23:14:55 +0000
Subject: [PATCH] OPENDJ-1848: in-line and remove various storage related access methods from DatabaseContainer.
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2URI.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2URI.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2URI.java
index cde321c..a56afe1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2URI.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2URI.java
@@ -178,19 +178,19 @@
{
ByteString key = toKey(dn);
- ByteString oldValue = read(txn, key, true);
+ ByteString oldValue = txn.getRMW(getName(), key);
if (oldValue != null)
{
final Pair<DN, List<String>> dnAndUris = decode(oldValue);
final Collection<String> newUris = dnAndUris.getSecond();
if (newUris.addAll(labeledURIs))
{
- put(txn, key, encode(dn, newUris));
+ txn.create(getName(), key, encode(dn, newUris));
}
}
else
{
- txn.putIfAbsent(treeName, key, encode(dn, labeledURIs));
+ txn.putIfAbsent(getName(), key, encode(dn, labeledURIs));
}
containsReferrals = ConditionResult.TRUE;
}
@@ -209,7 +209,7 @@
{
ByteString key = toKey(dn);
- if (delete(txn, key))
+ if (txn.delete(getName(), key))
{
containsReferrals = containsReferrals(txn);
return true;
@@ -231,14 +231,14 @@
{
ByteString key = toKey(dn);
- ByteString oldValue = read(txn, key, true);
+ ByteString oldValue = txn.getRMW(getName(), key);
if (oldValue != null)
{
final Pair<DN, List<String>> dnAndUris = decode(oldValue);
final Collection<String> oldUris = dnAndUris.getSecond();
if (oldUris.removeAll(labeledURIs))
{
- put(txn, key, encode(dn, oldUris));
+ txn.create(getName(), key, encode(dn, oldUris));
containsReferrals = containsReferrals(txn);
return true;
}
@@ -256,7 +256,7 @@
*/
private ConditionResult containsReferrals(ReadableStorage txn)
{
- Cursor cursor = txn.openCursor(treeName);
+ Cursor cursor = txn.openCursor(getName());
try
{
return ConditionResult.valueOf(cursor.next());
@@ -529,7 +529,7 @@
try
{
- final Cursor cursor = txn.openCursor(treeName);
+ final Cursor cursor = txn.openCursor(getName());
try
{
// Go up through the DIT hierarchy until we find a referral.
@@ -601,7 +601,7 @@
try
{
- final Cursor cursor = txn.openCursor(treeName);
+ final Cursor cursor = txn.openCursor(getName());
try
{
// Initialize the cursor very close to the starting value then
--
Gitblit v1.10.0