From eeed545264e26d4f8d417047adc77432a30e968a Mon Sep 17 00:00:00 2001
From: Yannick Lecaillez <yannick.lecaillez@forgerock.com>
Date: Tue, 11 Oct 2016 13:27:25 +0000
Subject: [PATCH] OPENDJ-3230-3223: upgrade to 3.5.0 should rebuild indexes using DN syntax
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/AttributeIndex.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 b84dc63..8a0e9f7 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
@@ -486,33 +486,37 @@
*/
boolean isIndexed(org.opends.server.types.IndexType indexType)
{
- Set<IndexType> indexTypes = config.getIndexType();
switch (indexType)
{
case PRESENCE:
- return indexTypes.contains(IndexType.PRESENCE);
+ return isIndexed(IndexType.PRESENCE);
case EQUALITY:
- return indexTypes.contains(IndexType.EQUALITY);
+ return isIndexed(IndexType.EQUALITY);
case SUBSTRING:
case SUBINITIAL:
case SUBANY:
case SUBFINAL:
- return indexTypes.contains(IndexType.SUBSTRING);
+ return isIndexed(IndexType.SUBSTRING);
case GREATER_OR_EQUAL:
case LESS_OR_EQUAL:
- return indexTypes.contains(IndexType.ORDERING);
+ return isIndexed(IndexType.ORDERING);
case APPROXIMATE:
- return indexTypes.contains(IndexType.APPROXIMATE);
+ return isIndexed(IndexType.APPROXIMATE);
default:
return false;
}
}
+ boolean isIndexed(IndexType indexType)
+ {
+ return config.getIndexType().contains(indexType);
+ }
+
/**
* Update the attribute index for a new entry.
*
--
Gitblit v1.10.0