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/IndexQueryFactoryImpl.java | 6 +++---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java | 18 +++++-------------
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Index.java | 2 +-
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/NullIndex.java | 2 +-
4 files changed, 10 insertions(+), 18 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)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Index.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Index.java
index 8d10f57..2eca8cb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Index.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Index.java
@@ -443,7 +443,7 @@
}
}
- EntryIDSet readKey(ByteSequence key, ReadableStorage txn)
+ EntryIDSet read(ReadableStorage txn, ByteSequence key)
{
if(rebuildRunning)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexQueryFactoryImpl.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexQueryFactoryImpl.java
index d78f561..51ea65a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexQueryFactoryImpl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexQueryFactoryImpl.java
@@ -84,8 +84,8 @@
return createMatchAllQuery().evaluate(debugMessage);
}
- final EntryIDSet entrySet = index.readKey(key, txn);
- if(debugMessage != null && !entrySet.isDefined())
+ final EntryIDSet entrySet = index.read(txn, key);
+ if (debugMessage != null && !entrySet.isDefined())
{
updateStatsUndefinedResults(debugMessage, index);
}
@@ -185,7 +185,7 @@
return new EntryIDSet();
}
- final EntryIDSet entrySet = index.readKey(PresenceIndexer.presenceKey, txn);
+ final EntryIDSet entrySet = index.read(txn, PresenceIndexer.presenceKey);
if (debugMessage != null && !entrySet.isDefined())
{
updateStatsUndefinedResults(debugMessage, index);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/NullIndex.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/NullIndex.java
index 42ec263..72426a0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/NullIndex.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/NullIndex.java
@@ -72,7 +72,7 @@
}
@Override
- EntryIDSet readKey(ByteSequence key, ReadableStorage txn)
+ EntryIDSet read(ReadableStorage txn, ByteSequence key)
{
return new EntryIDSet();
}
--
Gitblit v1.10.0