From 2b32de2e46f63f9949886386cfe7edcb97c16d1b Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 16 Jan 2015 12:29:53 +0000
Subject: [PATCH] Remove dead code
---
opendj3-server-dev/src/server/org/opends/server/backends/jeb/Index.java | 82 +++++++++++-----------------------------
1 files changed, 23 insertions(+), 59 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/Index.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/Index.java
index f8a318a..10c5c58 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/Index.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/Index.java
@@ -22,10 +22,14 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.backends.jeb;
+import static com.sleepycat.je.OperationStatus.*;
+
+import static org.opends.messages.JebMessages.*;
+
import java.util.*;
import org.forgerock.i18n.slf4j.LocalizedLogger;
@@ -42,10 +46,6 @@
import com.sleepycat.je.*;
-import static com.sleepycat.je.OperationStatus.*;
-
-import static org.opends.messages.JebMessages.*;
-
/**
* Represents an index implemented by a JE database in which each key maps to
* a set of entry IDs. The key is a byte array, and is constructed from some
@@ -109,8 +109,6 @@
*/
private boolean rebuildRunning;
- /** Thread local area to store per thread cursors. */
- private final ThreadLocal<Cursor> curLocal = new ThreadLocal<Cursor>();
private final ImportIDSet newImportIDSet;
/**
@@ -172,7 +170,15 @@
getBufferedIndexValues(buffer, keyBytes).addEntryID(keyBytes, entryID);
}
- private void deleteKey(DatabaseEntry key, ImportIDSet importIdSet, DatabaseEntry data) throws DatabaseException {
+ /**
+ * Delete the specified import ID set from the import ID set associated with the key.
+ *
+ * @param key The key to delete the set from.
+ * @param importIdSet The import ID set to delete.
+ * @param data A database entry to use for data.
+ * @throws DatabaseException If a database error occurs.
+ */
+ public void delete(DatabaseEntry key, ImportIDSet importIdSet, DatabaseEntry data) throws DatabaseException {
final OperationStatus status = read(null, key, data, LockMode.DEFAULT);
if(status == SUCCESS) {
newImportIDSet.clear(false);
@@ -192,7 +198,15 @@
}
}
- private void insertKey(DatabaseEntry key, ImportIDSet importIdSet, DatabaseEntry data) throws DatabaseException {
+ /**
+ * Insert the specified import ID set into this index. Creates a DB cursor if needed.
+ *
+ * @param key The key to add the set to.
+ * @param importIdSet The set of import IDs.
+ * @param data Database entry to reuse for read.
+ * @throws DatabaseException If a database error occurs.
+ */
+ public void insert(DatabaseEntry key, ImportIDSet importIdSet, DatabaseEntry data) throws DatabaseException {
final OperationStatus status = read(null, key, data, LockMode.DEFAULT);
if(status == OperationStatus.SUCCESS) {
newImportIDSet.clear(false);
@@ -215,43 +229,6 @@
}
/**
- * Insert the specified import ID set into this index. Creates a DB
- * cursor if needed.
- *
- * @param key The key to add the set to.
- * @param importIdSet The set of import IDs.
- * @param data Database entry to reuse for read.
- * @throws DatabaseException If a database error occurs.
- */
- public void insert(DatabaseEntry key, ImportIDSet importIdSet, DatabaseEntry data) throws DatabaseException {
- Cursor cursor = curLocal.get();
- if(cursor == null) {
- cursor = openCursor(null, null);
- curLocal.set(cursor);
- }
- insertKey(key, importIdSet, data);
- }
-
- /**
- * Delete the specified import ID set from the import ID set associated with
- * the key.
- *
- * @param key The key to delete the set from.
- * @param importIdSet The import ID set to delete.
- * @param data A database entry to use for data.
- *
- * @throws DatabaseException If a database error occurs.
- */
- public void delete(DatabaseEntry key, ImportIDSet importIdSet, DatabaseEntry data) throws DatabaseException {
- Cursor cursor = curLocal.get();
- if(cursor == null) {
- cursor = openCursor(null, null);
- curLocal.set(cursor);
- }
- deleteKey(key, importIdSet, data);
- }
-
- /**
* Update the set of entry IDs for a given key.
*
* @param txn A database transaction, or null if none is required.
@@ -727,19 +704,6 @@
}
/**
- * Close any cursors open against this index.
- *
- * @throws DatabaseException If a database error occurs.
- */
- public void closeCursor() throws DatabaseException {
- Cursor cursor = curLocal.get();
- if(cursor != null) {
- cursor.close();
- curLocal.remove();
- }
- }
-
- /**
* Update the index buffer for a deleted entry.
*
* @param buffer The index buffer to use to store the deleted keys
--
Gitblit v1.10.0