From 4fcfe0863ec99e7a58bb7675f7c8ffebfd788a08 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 08 Oct 2015 09:59:04 +0000
Subject: [PATCH] AttributeIndex.java: Make methods static

---
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/AttributeIndex.java |   30 ++++++++++++++++--------------
 1 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/AttributeIndex.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/AttributeIndex.java
index 0a73e68..31346a6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/AttributeIndex.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/AttributeIndex.java
@@ -491,7 +491,7 @@
    *          filter usage statistics.
    * @return The candidate entry IDs that might contain the filter assertion value.
    */
-  private EntryIDSet evaluateIndexQuery(IndexQuery indexQuery, String indexName, SearchFilter filter,
+  private static EntryIDSet evaluateIndexQuery(IndexQuery indexQuery, String indexName, SearchFilter filter,
       StringBuilder debugBuffer, BackendMonitor monitor)
   {
     // FIXME equivalent code exists in evaluateExtensibleFilter()
@@ -501,15 +501,15 @@
 
     if (debugBuffer != null)
     {
-      appendDebugIndexInformation(debugBuffer, config.getAttribute(), indexName);
-      appendDebugUnindexedInformation(debugBuffer, indexNameOut);
+      appendDebugIndexInformation(debugBuffer, filter.getAttributeType(), indexName);
+      appendDebugUnindexedInformation(debugBuffer, filter.getAttributeType(), indexNameOut);
     }
 
     updateStats(monitor, filter, results, debugMessage);
     return results;
   }
 
-  private void updateStats(BackendMonitor monitor, SearchFilter filter, EntryIDSet idSet,
+  private static void updateStats(BackendMonitor monitor, SearchFilter filter, EntryIDSet idSet,
       LocalizableMessageBuilder debugMessage)
   {
     if (monitor.isFilterUseEnabled())
@@ -532,22 +532,24 @@
    * @param debugBuffer the current debugsearchindex buffer
    * @param indexName the name of the index type
    */
-  private void appendDebugUnindexedInformation(StringBuilder debugBuffer, StringBuilder indexName)
+  private static void appendDebugUnindexedInformation(StringBuilder debugBuffer, AttributeType attrType,
+      StringBuilder indexName)
   {
     if (indexName.length() > 0)
     {
       debugBuffer.append(newUndefinedSet());
-      appendDebugIndexInformation(debugBuffer, config.getAttribute(), indexName);
+      appendDebugIndexInformation(debugBuffer, attrType, indexName);
     }
   }
 
-  private void appendDebugIndexInformation(StringBuilder debugBuffer, AttributeType attrType, CharSequence indexName)
+  private static void appendDebugIndexInformation(StringBuilder debugBuffer, AttributeType attrType,
+      CharSequence indexName)
   {
     String attrNameOrOID = attrType.getNameOrOID();
     debugBuffer.append("[INDEX:").append(attrNameOrOID).append(".").append(indexName).append("]");
   }
 
-  private void appendDebugIndexesInformation(StringBuilder debugBuffer, AttributeType attrType,
+  private static void appendDebugIndexesInformation(StringBuilder debugBuffer, AttributeType attrType,
       Collection<? extends Indexer> indexers)
   {
     final String attrNameOrOID = attrType.getNameOrOID();
@@ -580,7 +582,7 @@
    *          filter usage statistics.
    * @return The candidate entry IDs that might contain match both filters.
    */
-  EntryIDSet evaluateBoundedRange(IndexQueryFactory<IndexQuery> indexQueryFactory,
+  static EntryIDSet evaluateBoundedRange(IndexQueryFactory<IndexQuery> indexQueryFactory,
       SearchFilter filter1, SearchFilter filter2, StringBuilder debugBuffer, BackendMonitor monitor)
   {
     // TODO : this implementation is not optimal
@@ -603,7 +605,7 @@
     return results1;
   }
 
-  private EntryIDSet evaluate(IndexQueryFactory<IndexQuery> indexQueryFactory, SearchFilter filter,
+  private static EntryIDSet evaluate(IndexQueryFactory<IndexQuery> indexQueryFactory, SearchFilter filter,
       StringBuilder debugBuffer, BackendMonitor monitor)
   {
     boolean isLessOrEqual = filter.getFilterType() == FilterType.LESS_OR_EQUAL;
@@ -625,7 +627,7 @@
    * @return The candidate entry IDs that might contain a value
    *         that matches the filter type.
    */
-  EntryIDSet evaluateFilter(IndexQueryFactory<IndexQuery> indexQueryFactory, IndexFilterType indexFilterType,
+  static EntryIDSet evaluateFilter(IndexQueryFactory<IndexQuery> indexQueryFactory, IndexFilterType indexFilterType,
       SearchFilter filter, StringBuilder debugBuffer, BackendMonitor monitor)
   {
     try
@@ -640,8 +642,8 @@
     }
   }
 
-  private IndexQuery getIndexQuery(IndexQueryFactory<IndexQuery> indexQueryFactory, IndexFilterType indexFilterType,
-      SearchFilter filter) throws DecodeException
+  private static IndexQuery getIndexQuery(IndexQueryFactory<IndexQuery> indexQueryFactory,
+      IndexFilterType indexFilterType, SearchFilter filter) throws DecodeException
   {
     MatchingRule rule;
     Assertion assertion;
@@ -939,7 +941,7 @@
       if (debugBuffer != null)
       {
         appendDebugIndexesInformation(debugBuffer, filter.getAttributeType(), rule.createIndexers(indexingOptions));
-        appendDebugUnindexedInformation(debugBuffer, indexNameOut);
+        appendDebugUnindexedInformation(debugBuffer, filter.getAttributeType(), indexNameOut);
       }
 
       updateStats(monitor, filter, results, debugMessage);

--
Gitblit v1.10.0