From 24ef7c741bf20dabe8a5be3978187f8f1eb5dd41 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 27 Mar 2015 15:57:07 +0000
Subject: [PATCH] OPENDJ-1849 Remove references to JE from pluggable backend
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java
index fddca7c..2428237 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java
@@ -153,7 +153,7 @@
/** The backend configuration. */
private PluggableBackendCfg config;
- /** The JE database environment. */
+ /** The database storage. */
private final Storage storage;
/** The DN database maps a normalized DN string to an entry ID (8 bytes). */
@@ -478,8 +478,8 @@
/**
* Opens the entryContainer for reading and writing.
*
- * @param txn The database transaction
- * @throws StorageRuntimeException If an error occurs in the JE database.
+ * @param txn a non null database transaction
+ * @throws StorageRuntimeException If an error occurs in the database.
* @throws ConfigException if a configuration related error occurs.
*/
void open(WriteableTransaction txn) throws StorageRuntimeException, ConfigException
@@ -560,7 +560,7 @@
/**
* Closes the entry container.
*
- * @throws StorageRuntimeException If an error occurs in the JE database.
+ * @throws StorageRuntimeException If an error occurs in the database.
*/
@Override
public void close() throws StorageRuntimeException
@@ -699,9 +699,9 @@
* Determine the highest entryID in the entryContainer.
* The entryContainer must already be open.
*
- * @param txn The database transaction
+ * @param txn a non null database transaction
* @return The highest entry ID.
- * @throws StorageRuntimeException If an error occurs in the JE database.
+ * @throws StorageRuntimeException If an error occurs in the database.
*/
EntryID getHighestEntryID(ReadableTransaction txn) throws StorageRuntimeException
{
@@ -730,7 +730,7 @@
* number of entries immediately under the given entry.
* @return The number of subordinate entries for the given entry or -1 if
* the entry does not exist.
- * @throws StorageRuntimeException If an error occurs in the JE database.
+ * @throws StorageRuntimeException If an error occurs in the database.
*/
long getNumSubordinates(final DN entryDN, final boolean subtree)
throws StorageRuntimeException
@@ -772,7 +772,7 @@
* @throws DirectoryException
* If a problem occurs while processing the
* search.
- * @throws StorageRuntimeException If an error occurs in the JE database.
+ * @throws StorageRuntimeException If an error occurs in the database.
* @throws CanceledOperationException if this operation should be cancelled.
*/
void search(final SearchOperation searchOperation)
@@ -1279,7 +1279,7 @@
/**
* Returns the entry corresponding to the provided entryID.
*
- * @param txn The database transaction
+ * @param txn a non null database transaction
* @param entryID
* the id of the entry to retrieve
* @return the entry corresponding to the provided entryID
@@ -1486,7 +1486,7 @@
* performed internally.
* @throws DirectoryException If a problem occurs while trying to add the
* entry.
- * @throws StorageRuntimeException If an error occurs in the JE database.
+ * @throws StorageRuntimeException If an error occurs in the database.
* @throws CanceledOperationException if this operation should be cancelled.
*/
void addEntry(final Entry entry, final AddOperation addOperation)
@@ -1620,7 +1620,7 @@
* deletes performed internally.
* @throws DirectoryException If a problem occurs while trying to remove the
* entry.
- * @throws StorageRuntimeException If an error occurs in the JE database.
+ * @throws StorageRuntimeException If an error occurs in the database.
* @throws CanceledOperationException if this operation should be cancelled.
*/
void deleteEntry(final DN entryDN, final DeleteOperation deleteOperation)
@@ -1988,7 +1988,7 @@
* @param modifyOperation The modify operation with which this action is
* associated. This may be <CODE>null</CODE> for
* modifications performed internally.
- * @throws StorageRuntimeException If an error occurs in the JE database.
+ * @throws StorageRuntimeException If an error occurs in the database.
* @throws DirectoryException If a Directory Server error occurs.
* @throws CanceledOperationException if this operation should be cancelled.
*/
@@ -2114,7 +2114,7 @@
* If this backend noticed and reacted
* to a request to cancel or abandon the
* modify DN operation.
- * @throws StorageRuntimeException If an error occurs in the JE database.
+ * @throws StorageRuntimeException If an error occurs in the database.
*/
void renameEntry(final DN currentDN, final Entry entry, final ModifyDNOperation modifyDNOperation)
throws StorageRuntimeException, DirectoryException, CanceledOperationException
@@ -2590,7 +2590,7 @@
* @param buffer The index buffer used to buffer up the index changes.
* @param entry The entry to be inserted into the indexes.
* @param entryID The ID of the entry to be inserted into the indexes.
- * @throws StorageRuntimeException If an error occurs in the JE database.
+ * @throws StorageRuntimeException If an error occurs in the database.
* @throws DirectoryException If a Directory Server error occurs.
*/
private void indexInsertEntry(IndexBuffer buffer, Entry entry, EntryID entryID)
@@ -2613,7 +2613,7 @@
* @param buffer The index buffer used to buffer up the index changes.
* @param entry The entry to be removed from the indexes.
* @param entryID The ID of the entry to be removed from the indexes.
- * @throws StorageRuntimeException If an error occurs in the JE database.
+ * @throws StorageRuntimeException If an error occurs in the database.
* @throws DirectoryException If a Directory Server error occurs.
*/
private void indexRemoveEntry(IndexBuffer buffer, Entry entry, EntryID entryID)
@@ -2639,7 +2639,7 @@
* @param newEntry The contents of the entry after the change.
* @param entryID The ID of the entry that was changed.
* @param mods The sequence of modifications made to the entry.
- * @throws StorageRuntimeException If an error occurs in the JE database.
+ * @throws StorageRuntimeException If an error occurs in the database.
* @throws DirectoryException If a Directory Server error occurs.
*/
private void indexModifications(IndexBuffer buffer, Entry oldEntry, Entry newEntry,
@@ -2665,9 +2665,9 @@
/**
* Get a count of the number of entries stored in this entry container.
*
- * @param txn The database transaction
+ * @param txn a non null database transaction
* @return The number of entries stored in this entry container.
- * @throws StorageRuntimeException If an error occurs in the JE database.
+ * @throws StorageRuntimeException If an error occurs in the database.
*/
long getEntryCount(ReadableTransaction txn) throws StorageRuntimeException
{
@@ -2750,7 +2750,7 @@
* Delete this entry container from disk. The entry container should be
* closed before calling this method.
*
- * @param txn The database transaction
+ * @param txn a non null database transaction
* @throws StorageRuntimeException If an error occurs while removing the entry
* container.
*/
@@ -2768,7 +2768,7 @@
/**
* Remove a database from disk.
*
- * @param txn The database transaction
+ * @param txn a non null database transaction
* @param database The database container to remove.
* @throws StorageRuntimeException If an error occurs while attempting to delete the
* database.
@@ -2791,7 +2791,7 @@
* Removes a attribute index from disk.
*
* @param attributeIndex The attribute index to remove.
- * @throws StorageRuntimeException If an JE database error occurs while attempting
+ * @throws StorageRuntimeException If an database error occurs while attempting
* to delete the index.
*/
private void deleteAttributeIndex(WriteableTransaction txn, AttributeIndex attributeIndex)
@@ -2822,7 +2822,7 @@
* existing databases in use by this entry container.
*
* @param newBaseDN The new database prefix to use.
- * @throws StorageRuntimeException If an error occurs in the JE database.
+ * @throws StorageRuntimeException If an error occurs in the database.
*/
void setDatabasePrefix(final String newBaseDN) throws StorageRuntimeException
{
@@ -3047,9 +3047,9 @@
/**
* Clear the contents for a database from disk.
*
- * @param txn The database transaction
+ * @param txn a non null database transaction
* @param database The database to clear.
- * @throws StorageRuntimeException if a JE database error occurs.
+ * @throws StorageRuntimeException if a database error occurs.
*/
void clearDatabase(WriteableTransaction txn, DatabaseContainer database)
throws StorageRuntimeException
@@ -3112,7 +3112,7 @@
/**
* Creates a new index for an attribute.
*
- * @param txn The database transaction
+ * @param txn a non null database transaction
* @param indexName the name to give to the new index
* @param indexer the indexer to use when inserting data into the index
* @param indexEntryLimit the index entry limit
--
Gitblit v1.10.0