From 9a741260c66309ff16f55b6a7b9933336db12ca6 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 16 Mar 2015 12:40:11 +0000
Subject: [PATCH] Hide IndexFilter.FILTER_CANDIDATE_THRESHOLD, use isBelowFilterThreshold() instead.
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 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 8b96d8f..d8c8117 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
@@ -27,17 +27,16 @@
*/
package org.opends.server.backends.pluggable;
-import static org.forgerock.util.Utils.closeSilently;
import static org.forgerock.util.Reject.checkNotNull;
+import static org.forgerock.util.Utils.closeSilently;
import static org.opends.messages.JebMessages.*;
+import static org.opends.server.backends.pluggable.EntryIDSet.*;
+import static org.opends.server.backends.pluggable.IndexFilter.*;
import static org.opends.server.backends.pluggable.JebFormat.*;
import static org.opends.server.core.DirectoryServer.*;
import static org.opends.server.protocols.ldap.LDAPResultCode.*;
-import static org.opends.server.backends.pluggable.IndexFilter.CURSOR_ENTRY_LIMIT;
import static org.opends.server.types.AdditionalLogItem.*;
import static org.opends.server.util.StaticUtils.*;
-import static org.opends.server.backends.pluggable.EntryIDSet.newUndefinedSet;
-import static org.opends.server.backends.pluggable.EntryIDSet.newDefinedSet;
import java.util.ArrayList;
import java.util.Arrays;
@@ -906,10 +905,9 @@
// Evaluate the filter against the attribute indexes.
entryIDSet = indexFilter.evaluate();
- // Evaluate the search scope against the id2children and id2subtree indexes
- if (entryIDSet.size() > IndexFilter.FILTER_CANDIDATE_THRESHOLD)
+ if (!isBelowFilterThreshold(entryIDSet))
{
- // Read the ID from dn2id.
+ // Evaluate the search scope against the id2children and id2subtree indexes
EntryID baseID = dn2id.get(txn, aBaseDN);
if (baseID == null)
{
--
Gitblit v1.10.0