From eefd01abfd9921bced6ef5fcb1775fc7fd65835a Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 11 Mar 2015 17:01:44 +0000
Subject: [PATCH] Index.java: Changed readKey(ByteSequence key, ReadableStorage txn) to read(ReadableStorage txn, ByteSequence key) because it makes client code easier to read.
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java | 18 +++++-------------
1 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java
index 0bb4879..18fda67 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java
@@ -752,16 +752,8 @@
EntryID entryID = dn2id.get(txn, entryDN);
if (entryID != null)
{
- ByteString key = entryID.toByteString();
- EntryIDSet entryIDSet;
- if (subtree)
- {
- entryIDSet = id2subtree.readKey(key, txn);
- }
- else
- {
- entryIDSet = id2children.readKey(key, txn);
- }
+ final Index index = subtree ? id2subtree : id2children;
+ final EntryIDSet entryIDSet = index.read(txn, entryID.toByteString());
long count = entryIDSet.size();
if (count != Long.MAX_VALUE)
{
@@ -936,11 +928,11 @@
EntryIDSet scopeList;
if (searchScope == SearchScope.SINGLE_LEVEL)
{
- scopeList = id2children.readKey(baseIDData, txn);
+ scopeList = id2children.read(txn, baseIDData);
}
else
{
- scopeList = id2subtree.readKey(baseIDData, txn);
+ scopeList = id2subtree.read(txn, baseIDData);
if (searchScope == SearchScope.WHOLE_SUBTREE)
{
// The id2subtree list does not include the base entry ID.
@@ -2733,7 +2725,7 @@
final EntryID entryID = dn2id.get(txn, baseDN);
if (entryID != null)
{
- final EntryIDSet entryIDSet = id2subtree.readKey(entryID.toByteString(), txn);
+ final EntryIDSet entryIDSet = id2subtree.read(txn, entryID.toByteString());
long count = entryIDSet.size();
if(count != Long.MAX_VALUE)
{
--
Gitblit v1.10.0