From 8513213e8f8f1cd4d87a10b3218654c6988f5188 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Tue, 31 Mar 2015 10:00:47 +0000
Subject: [PATCH] CR-6474 OPENDJ-1711 - re-implement VLV support for pluggable backends
---
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/VLVIndex.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/VLVIndex.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/VLVIndex.java
index 5e8d539..511e287 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/VLVIndex.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/VLVIndex.java
@@ -45,7 +45,6 @@
import org.forgerock.opendj.ldap.DecodeException;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
-import org.forgerock.opendj.ldap.SearchScope.Enum;
import org.forgerock.opendj.ldap.schema.MatchingRule;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.meta.LocalDBVLVIndexCfgDefn.Scope;
@@ -130,7 +129,7 @@
this.config = config;
this.baseDN = config.getBaseDN();
- this.scope = valueOf(config.getScope());
+ this.scope = convertScope(config.getScope());
this.sortedSetCapacity = config.getMaxBlockSize();
try
@@ -204,17 +203,19 @@
this.config.addChangeListener(this);
}
- private SearchScope valueOf(Scope cfgScope)
+ private SearchScope convertScope(final Scope cfgScope)
{
- final Enum toFind = SearchScope.Enum.valueOf(cfgScope.name());
- for (SearchScope scope : SearchScope.values())
+ switch (cfgScope)
{
- if (scope.asEnum() == toFind)
- {
- return scope;
- }
+ case BASE_OBJECT:
+ return SearchScope.BASE_OBJECT;
+ case SINGLE_LEVEL:
+ return SearchScope.SINGLE_LEVEL;
+ case SUBORDINATE_SUBTREE:
+ return SearchScope.SUBORDINATES;
+ default: // WHOLE_SUBTREE
+ return SearchScope.WHOLE_SUBTREE;
}
- return null;
}
/** {@inheritDoc} */
@@ -1298,7 +1299,7 @@
// Update scope only if changed.
if(!config.getScope().equals(cfg.getScope()))
{
- this.scope = SearchScope.valueOf(cfg.getScope().name());
+ this.scope = convertScope(cfg.getScope());
ccr.setAdminActionRequired(true);
}
--
Gitblit v1.10.0