CR-6474 OPENDJ-1711 - re-implement VLV support for pluggable backends

Matthew Swift

31.00.2015 8513213e8f8f1cd4d87a10b3218654c6988f5188

 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);
    }