From 78e976de8a533942ebc55bf5808c4e5e1de7469c Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 04 Apr 2014 10:26:17 +0000
Subject: [PATCH] OPENDJ-1308 Migrate schema support
---
opendj3-server-dev/src/server/org/opends/server/backends/jeb/IndexQueryFactoryImpl.java | 68 ++++++++++++----------------------
1 files changed, 24 insertions(+), 44 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/IndexQueryFactoryImpl.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/IndexQueryFactoryImpl.java
index 92386d9..7dd2eef 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/IndexQueryFactoryImpl.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/IndexQueryFactoryImpl.java
@@ -73,8 +73,7 @@
/** {@inheritDoc} */
@Override
- public IndexQuery createExactMatchQuery(final String indexID,
- final ByteSequence value)
+ public IndexQuery createExactMatchQuery(final String indexID, final ByteSequence value)
{
return new IndexQuery()
{
@@ -98,18 +97,7 @@
EntryIDSet entrySet = index.readKey(key, null, LockMode.DEFAULT);
if(debugMessage != null && !entrySet.isDefined())
{
- if(!index.isTrusted())
- {
- debugMessage.append(INFO_JEB_INDEX_FILTER_INDEX_NOT_TRUSTED.get(index.getName()));
- }
- else if(index.isRebuildRunning())
- {
- debugMessage.append(INFO_JEB_INDEX_FILTER_INDEX_REBUILD_IN_PROGRESS.get(index.getName()));
- }
- else
- {
- debugMessage.append(INFO_JEB_INDEX_FILTER_INDEX_LIMIT_EXCEEDED.get(index.getName()));
- }
+ updateStatsUndefinedResults(debugMessage, index);
}
return entrySet;
}
@@ -144,18 +132,7 @@
includeLowerBound, includeUpperBound);
if(debugMessage != null && !entrySet.isDefined())
{
- if(!index.isTrusted())
- {
- debugMessage.append(INFO_JEB_INDEX_FILTER_INDEX_NOT_TRUSTED.get(index.getName()));
- }
- else if(index.isRebuildRunning())
- {
- debugMessage.append(INFO_JEB_INDEX_FILTER_INDEX_REBUILD_IN_PROGRESS.get(index.getName()));
- }
- else
- {
- debugMessage.append(INFO_JEB_INDEX_FILTER_INDEX_LIMIT_EXCEEDED.get(index.getName()));
- }
+ updateStatsUndefinedResults(debugMessage, index);
}
return entrySet;
}
@@ -166,8 +143,7 @@
/** {@inheritDoc} */
@Override
- public IndexQuery createIntersectionQuery(
- Collection<IndexQuery> subqueries)
+ public IndexQuery createIntersectionQuery(Collection<IndexQuery> subqueries)
{
return IndexQuery.createIntersectionIndexQuery(subqueries);
}
@@ -197,39 +173,43 @@
@Override
public EntryIDSet evaluate(LocalizableMessageBuilder debugMessage)
{
- Index index = indexMap.get(PRESENCE_INDEX_KEY);
+ final String indexID = PRESENCE_INDEX_KEY;
+ final Index index = indexMap.get(indexID);
if (index == null)
{
if(debugMessage != null)
{
- debugMessage.append(INFO_JEB_INDEX_FILTER_INDEX_TYPE_DISABLED.get(index.getName(), ""));
+ debugMessage.append(INFO_JEB_INDEX_FILTER_INDEX_TYPE_DISABLED.get(indexID, ""));
}
return new EntryIDSet();
}
EntryIDSet entrySet = index.readKey(AttributeIndex.presenceKey, null, LockMode.DEFAULT);
-
if (debugMessage != null && !entrySet.isDefined())
{
- if (!index.isTrusted())
- {
- debugMessage.append(INFO_JEB_INDEX_FILTER_INDEX_NOT_TRUSTED.get(index.getName()));
- }
- else if (index.isRebuildRunning())
- {
- debugMessage.append(INFO_JEB_INDEX_FILTER_INDEX_REBUILD_IN_PROGRESS.get(index.getName()));
- }
- else
- {
- debugMessage.append(INFO_JEB_INDEX_FILTER_INDEX_LIMIT_EXCEEDED.get(index.getName()));
- }
+ updateStatsUndefinedResults(debugMessage, index);
}
-
return entrySet;
}
};
}
+ private static void updateStatsUndefinedResults(LocalizableMessageBuilder debugMessage, Index index)
+ {
+ if (!index.isTrusted())
+ {
+ debugMessage.append(INFO_JEB_INDEX_FILTER_INDEX_NOT_TRUSTED.get(index.getName()));
+ }
+ else if (index.isRebuildRunning())
+ {
+ debugMessage.append(INFO_JEB_INDEX_FILTER_INDEX_REBUILD_IN_PROGRESS.get(index.getName()));
+ }
+ else
+ {
+ debugMessage.append(INFO_JEB_INDEX_FILTER_INDEX_LIMIT_EXCEEDED.get(index.getName()));
+ }
+ }
+
/** {@inheritDoc} */
@Override
public IndexingOptions getIndexingOptions()
--
Gitblit v1.10.0