From bf4293bec3a219ee50a1bb1a9e45d279c2056eb2 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 13 Jan 2015 15:50:32 +0000
Subject: [PATCH] OPENDJ-1724 Persistit: add support for verify-indexes
---
opendj3-server-dev/src/server/org/opends/server/backends/pluggable/VerifyJob.java | 35 +++++++----------
opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java | 26 +++++--------
2 files changed, 24 insertions(+), 37 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java
index 8fd0681..df6cd5e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java
@@ -22,9 +22,12 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.backends.jeb;
+
+import static org.opends.messages.JebMessages.*;
+
import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -43,11 +46,7 @@
import com.sleepycat.je.*;
-import static org.opends.messages.JebMessages.*;
-
-/**
- * This class is used to run an index verification process on the backend.
- */
+/** This class is used to run an index verification process on the backend. */
public class VerifyJob
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -95,14 +94,9 @@
/** The subtree database. */
private Index id2s;
- /**
- * A list of the attribute indexes to be verified.
- */
+ /** A list of the attribute indexes to be verified. */
private final ArrayList<AttributeIndex> attrIndexList = new ArrayList<AttributeIndex>();
-
- /**
- * A list of the VLV indexes to be verified.
- */
+ /** A list of the VLV indexes to be verified. */
private final ArrayList<VLVIndex> vlvIndexList = new ArrayList<VLVIndex>();
/**
@@ -135,8 +129,8 @@
entryContainer.sharedLock.lock();
try
{
- ArrayList<String> completeList = verifyConfig.getCompleteList();
- ArrayList<String> cleanList = verifyConfig.getCleanList();
+ final List<String> completeList = verifyConfig.getCompleteList();
+ final List<String> cleanList = verifyConfig.getCleanList();
boolean cleanMode = false;
if (completeList.isEmpty() && cleanList.isEmpty())
@@ -151,7 +145,7 @@
}
else
{
- ArrayList<String> list;
+ final List<String> list;
if (!completeList.isEmpty())
{
list = completeList;
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/VerifyJob.java b/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/VerifyJob.java
index a4310b7..03e5c59 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/VerifyJob.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/VerifyJob.java
@@ -25,6 +25,10 @@
* Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.backends.pluggable;
+
+import static org.opends.messages.JebMessages.*;
+import static org.opends.server.backends.pluggable.JebFormat.*;
+
import java.util.AbstractSet;
import java.util.ArrayList;
import java.util.Arrays;
@@ -62,12 +66,7 @@
import org.opends.server.util.ServerConstants;
import org.opends.server.util.StaticUtils;
-import static org.opends.messages.JebMessages.*;
-import static org.opends.server.backends.pluggable.JebFormat.*;
-
-/**
- * This class is used to run an index verification process on the backend.
- */
+/** This class is used to run an index verification process on the backend. */
public class VerifyJob
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -115,14 +114,9 @@
/** The subtree database. */
private Index id2s;
- /**
- * A list of the attribute indexes to be verified.
- */
+ /** A list of the attribute indexes to be verified. */
private final ArrayList<AttributeIndex> attrIndexList = new ArrayList<AttributeIndex>();
-
- /**
- * A list of the VLV indexes to be verified.
- */
+ /** A list of the VLV indexes to be verified. */
private final ArrayList<VLVIndex> vlvIndexList = new ArrayList<VLVIndex>();
/**
@@ -174,8 +168,8 @@
entryContainer.sharedLock.lock();
try
{
- ArrayList<String> completeList = verifyConfig.getCompleteList();
- ArrayList<String> cleanList = verifyConfig.getCleanList();
+ final List<String> completeList = verifyConfig.getCompleteList();
+ final List<String> cleanList = verifyConfig.getCleanList();
boolean cleanMode = false;
if (completeList.isEmpty() && cleanList.isEmpty())
@@ -190,7 +184,7 @@
}
else
{
- ArrayList<String> list;
+ final List<String> list;
if (!completeList.isEmpty())
{
list = completeList;
@@ -1255,7 +1249,7 @@
{
try
{
- ConditionResult cr = id2c.containsID(null, parentID.toByteString(), entryID);
+ ConditionResult cr = id2c.containsID(txn, parentID.toByteString(), entryID);
if (cr == ConditionResult.FALSE)
{
if (logger.isTraceEnabled())
@@ -1319,8 +1313,7 @@
{
try
{
- ConditionResult cr;
- cr = id2s.containsID(null, id.toByteString(), entryID);
+ ConditionResult cr = id2s.containsID(txn, id.toByteString(), entryID);
if (cr == ConditionResult.FALSE)
{
if (logger.isTraceEnabled())
@@ -1429,8 +1422,8 @@
try
{
if (vlvIndex.shouldInclude(entry)
- && !vlvIndex.containsValues(null, entryID.longValue(),
- vlvIndex.getSortValues(entry), vlvIndex.getSortTypes()))
+ && !vlvIndex.containsValues(
+ txn, entryID.longValue(), vlvIndex.getSortValues(entry), vlvIndex.getSortTypes()))
{
if(logger.isTraceEnabled())
{
--
Gitblit v1.10.0