OPENDJ-1724 (CR-5789) Persistit: add support for verify-indexes

Jean-Noel Rouvignac

14.07.2015 e690a8c8f26e834682dd4f65fd96e1dc7bfc3b05

OPENDJ-1724 (CR-5789) Persistit: add support for verify-indexes

Moved VerifyConfig from org.opends.server.backends.pluggable to org.opends.server.backends.

 opendj3-server-dev/src/server/org/opends/server/api/Backend.java

@@ -41,7 +41,7 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.schema.MatchingRule;
import org.opends.server.admin.Configuration;
import org.opends.server.backends.pluggable.VerifyConfig;
import org.opends.server.backends.VerifyConfig;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DeleteOperation;
import org.opends.server.core.DirectoryServer;

 opendj3-server-dev/src/server/org/opends/server/backends/VerifyConfig.java

File was renamed from opendj3-server-dev/src/server/org/opends/server/backends/pluggable/VerifyConfig.java
@@ -24,7 +24,7 @@
 *      Copyright 2006-2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014-2015 ForgeRock AS
 */
package org.opends.server.backends.pluggable;
package org.opends.server.backends;

import java.util.ArrayList;
import java.util.List;

 opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackendImpl.java

@@ -56,8 +56,8 @@
import org.opends.server.api.Backend;
import org.opends.server.api.DiskSpaceMonitorHandler;
import org.opends.server.api.MonitorProvider;
import org.opends.server.backends.VerifyConfig;
import org.opends.server.backends.jeb.importLDIF.Importer;
import org.opends.server.backends.pluggable.VerifyConfig;
import org.opends.server.core.*;
import org.opends.server.extensions.DiskSpaceMonitor;
import org.opends.server.types.*;

 opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java

@@ -39,7 +39,7 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.schema.MatchingRule;
import org.forgerock.opendj.ldap.spi.IndexingOptions;
import org.opends.server.backends.pluggable.VerifyConfig;
import org.opends.server.backends.VerifyConfig;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
import org.opends.server.util.ServerConstants;

 opendj3-server-dev/src/server/org/opends/server/backends/pluggable/BackendImpl.java

@@ -52,6 +52,7 @@
import org.opends.server.api.Backend;
import org.opends.server.api.DiskSpaceMonitorHandler;
import org.opends.server.api.MonitorProvider;
import org.opends.server.backends.VerifyConfig;
import org.opends.server.backends.pluggable.spi.StorageRuntimeException;
import org.opends.server.backends.pluggable.spi.WriteOperation;
import org.opends.server.backends.pluggable.spi.WriteableStorage;

 opendj3-server-dev/src/server/org/opends/server/backends/pluggable/VerifyJob.java

@@ -52,6 +52,7 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.schema.MatchingRule;
import org.forgerock.opendj.ldap.spi.IndexingOptions;
import org.opends.server.backends.VerifyConfig;
import org.opends.server.backends.pluggable.spi.Cursor;
import org.opends.server.backends.pluggable.spi.ReadOperation;
import org.opends.server.backends.pluggable.spi.ReadableStorage;

 opendj3-server-dev/src/server/org/opends/server/tools/VerifyIndex.java

@@ -42,7 +42,7 @@
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.admin.std.server.BackendCfg;
import org.opends.server.api.Backend;
import org.opends.server.backends.pluggable.VerifyConfig;
import org.opends.server.backends.VerifyConfig;
import org.opends.server.core.CoreConfigManager;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.LockFileManager;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java

@@ -22,7 +22,7 @@
 *
 *
 *      Copyright 2006-2009 Sun Microsystems, Inc.
 *      Portions Copyright 2011-2014 ForgeRock AS
 *      Portions Copyright 2011-2015 ForgeRock AS
 */
package org.opends.server.backends.jeb;

@@ -77,6 +77,7 @@
import static org.forgerock.opendj.ldap.ConditionResult.*;
import static org.forgerock.opendj.ldap.ModificationType.*;
import static org.mockito.Mockito.*;
import static org.opends.server.backends.pluggable.SuffixContainer.*;
import static org.opends.server.protocols.internal.InternalClientConnection.*;
import static org.opends.server.protocols.internal.Requests.*;
import static org.opends.server.types.Attributes.*;
@@ -97,11 +98,6 @@
  private Entry replaceEntry;
  private Entry newTop;

  /**
   * The attribute used to return a search index debug string to the client.
   */
  public static final String ATTR_DEBUG_SEARCH_INDEX = "debugsearchindex";

  @BeforeClass
  public void setUp() throws Exception {
    // This test suite depends on having the schema available, so we'll make

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestImportJob.java

@@ -37,7 +37,7 @@
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.TestCaseUtils;
import org.opends.server.api.Backend;
import org.opends.server.backends.pluggable.VerifyConfig;
import org.opends.server.backends.VerifyConfig;
import org.opends.server.core.DirectoryServer;
import org.opends.server.tasks.TaskUtils;
import org.opends.server.types.*;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestRebuildJob.java

@@ -29,8 +29,8 @@
import static org.testng.Assert.*;

import org.opends.server.TestCaseUtils;
import org.opends.server.backends.VerifyConfig;
import org.opends.server.backends.jeb.RebuildConfig.RebuildMode;
import org.opends.server.backends.pluggable.VerifyConfig;
import org.opends.server.core.DirectoryServer;
import org.opends.server.tasks.TaskUtils;
import org.opends.server.types.DN;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVerifyJob.java

@@ -36,7 +36,7 @@
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.TestCaseUtils;
import org.opends.server.api.Backend;
import org.opends.server.backends.pluggable.VerifyConfig;
import org.opends.server.backends.VerifyConfig;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
import org.opends.server.util.StaticUtils;