From 8df85caca96d8bb79fcc2cf01cf6ef0a3f06930d Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 13 Mar 2015 23:44:25 +0000
Subject: [PATCH] Minor code cleanup: remove DatabaseContainer.entryContainer field
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VLVIndex.java | 2 +-
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ID2Entry.java | 10 ++++------
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/State.java | 5 ++---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java | 8 ++++----
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2URI.java | 11 +++++++----
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DatabaseContainer.java | 7 +------
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Index.java | 10 +++++-----
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2ID.java | 3 +--
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/NullIndex.java | 2 +-
9 files changed, 26 insertions(+), 32 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2ID.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2ID.java
index db32aac..bf82939 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2ID.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2ID.java
@@ -56,8 +56,7 @@
DN2ID(TreeName treeName, Storage env, EntryContainer entryContainer)
throws StorageRuntimeException
{
- super(treeName, env, entryContainer);
-
+ super(treeName, env);
prefixRDNComponents = entryContainer.getBaseDN().size();
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2URI.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2URI.java
index a56afe1..20e33c4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2URI.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2URI.java
@@ -112,8 +112,7 @@
DN2URI(TreeName treeName, Storage storage, EntryContainer entryContainer)
throws StorageRuntimeException
{
- super(treeName, storage, entryContainer);
-
+ super(treeName, storage);
prefixRDNComponents = entryContainer.getBaseDN().size();
}
@@ -533,8 +532,7 @@
try
{
// Go up through the DIT hierarchy until we find a referral.
- for (DN dn = entryContainer.getParentWithinBase(targetDN); dn != null;
- dn = entryContainer.getParentWithinBase(dn))
+ for (DN dn = getParentWithinBase(targetDN); dn != null; dn = getParentWithinBase(dn))
{
// Look for a record whose key matches the current DN.
if (cursor.positionToKey(toKey(dn)))
@@ -557,6 +555,11 @@
}
}
+ private DN getParentWithinBase(DN targetDN)
+ {
+ return targetDN.size() == prefixRDNComponents ? null: targetDN.parent();
+ }
+
/**
* Return search result references for a search operation using the referral
* database to find all referral entries within scope of the search.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DatabaseContainer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DatabaseContainer.java
index 05a81f6..029ae64 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DatabaseContainer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DatabaseContainer.java
@@ -41,9 +41,6 @@
*/
abstract class DatabaseContainer implements Closeable
{
- /** The database entryContainer. */
- final EntryContainer entryContainer;
-
/** The name of the database within the entryContainer. */
private TreeName name;
@@ -55,12 +52,10 @@
*
* @param treeName The name of the entry database.
* @param storage The JE Storage.
- * @param entryContainer The entryContainer of the entry database.
*/
- DatabaseContainer(TreeName treeName, Storage storage, EntryContainer entryContainer)
+ DatabaseContainer(TreeName treeName, Storage storage)
{
this.storage = storage;
- this.entryContainer = entryContainer;
this.name = treeName;
}
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 18fda67..eb0599a 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
@@ -482,13 +482,13 @@
config.isCompactEncoding(),
rootContainer.getCompressedSchema());
- id2entry = new ID2Entry(getIndexName(ID2ENTRY_DATABASE_NAME), entryDataConfig, storage, this);
+ id2entry = new ID2Entry(getIndexName(ID2ENTRY_DATABASE_NAME), storage, entryDataConfig);
id2entry.open(txn);
dn2id = new DN2ID(getIndexName(DN2ID_DATABASE_NAME), storage, this);
dn2id.open(txn);
- state = new State(getIndexName(STATE_DATABASE_NAME), storage, this);
+ state = new State(getIndexName(STATE_DATABASE_NAME), storage);
state.open(txn);
if (config.isSubordinateIndexesEnabled())
@@ -3170,7 +3170,7 @@
private Index newIndex(WriteableStorage txn, String name, Indexer indexer)
{
final Index index = new Index(getIndexName(name),
- indexer, state, config.getIndexEntryLimit(), 0, true, storage, txn, this);
+ storage, indexer, state, config.getIndexEntryLimit(), 0, true, txn, this);
index.open(txn);
if (!index.isTrusted())
{
@@ -3191,7 +3191,7 @@
Index newIndexForAttribute(WriteableStorage txn, TreeName indexName, Indexer indexer, int indexEntryLimit)
{
final int cursorEntryLimit = 100000;
- return new Index(indexName, indexer, state, indexEntryLimit, cursorEntryLimit, false, storage, txn, this);
+ return new Index(indexName, storage, indexer, state, indexEntryLimit, cursorEntryLimit, false, txn, this);
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ID2Entry.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ID2Entry.java
index 617e913..875e543 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ID2Entry.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ID2Entry.java
@@ -225,17 +225,16 @@
* Create a new ID2Entry object.
*
* @param name The name of the entry database.
+ * @param storage The JE Storage.
* @param dataConfig The desired compression and encryption options for data
* stored in the entry database.
- * @param storage The JE Storage.
* @param entryContainer The entryContainer of the entry database.
* @throws StorageRuntimeException If an error occurs in the JE database.
*
*/
- ID2Entry(TreeName name, DataConfig dataConfig, Storage storage, EntryContainer entryContainer)
- throws StorageRuntimeException
+ ID2Entry(TreeName name, Storage storage, DataConfig dataConfig) throws StorageRuntimeException
{
- super(name, storage, entryContainer);
+ super(name, storage);
this.dataConfig = dataConfig;
}
@@ -409,8 +408,7 @@
try
{
- Entry entry = entryFromDatabase(value,
- entryContainer.getRootContainer().getCompressedSchema());
+ Entry entry = entryFromDatabase(value, dataConfig.getEntryEncodeConfig().getCompressedSchema());
entry.processVirtualAttributes();
return entry;
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Index.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Index.java
index 5389ff8..8406d26 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Index.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Index.java
@@ -111,6 +111,7 @@
/**
* Create a new index object.
* @param name The name of the index database within the entryContainer.
+ * @param storage The JE Storage
* @param indexer The indexer object to construct index keys from LDAP
* attribute values.
* @param state The state database to persist index state info.
@@ -119,17 +120,16 @@
* @param cursorEntryLimit The configured limit on the number of entry IDs
* @param maintainCount Whether to maintain a count of IDs for a key once
* the entry limit has exceeded.
- * @param storage The JE Storage
* @param txn The transaction to use when creating this object
* @param entryContainer The database entryContainer holding this index.
* @throws StorageRuntimeException If an error occurs in the JE database.
*/
- Index(TreeName name, Indexer indexer, State state,
- int indexEntryLimit, int cursorEntryLimit, boolean maintainCount,
- Storage storage, WriteableStorage txn, EntryContainer entryContainer)
+ Index(TreeName name, Storage storage, Indexer indexer,
+ State state, int indexEntryLimit, int cursorEntryLimit,
+ boolean maintainCount, WriteableStorage txn, EntryContainer entryContainer)
throws StorageRuntimeException
{
- super(name, storage, entryContainer);
+ super(name, storage);
this.indexer = indexer;
this.indexEntryLimit = indexEntryLimit;
this.cursorEntryLimit = cursorEntryLimit;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/NullIndex.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/NullIndex.java
index 72426a0..49b2f6d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/NullIndex.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/NullIndex.java
@@ -48,7 +48,7 @@
NullIndex(TreeName name, Indexer indexer, State state, Storage storage, WriteableStorage txn,
EntryContainer entryContainer) throws StorageRuntimeException
{
- super(name, indexer, state, 0, 0, false, storage, txn, entryContainer);
+ super(name, storage, indexer, state, 0, 0, false, txn, entryContainer);
}
@Override
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/State.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/State.java
index dfb3bd3..3c5af85 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/State.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/State.java
@@ -48,11 +48,10 @@
*
* @param name The name of the entry database.
* @param env The JE Storage.
- * @param entryContainer The entryContainer of the entry database.
*/
- State(TreeName name, Storage env, EntryContainer entryContainer)
+ State(TreeName name, Storage env)
{
- super(name, env, entryContainer);
+ super(name, env);
}
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VLVIndex.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VLVIndex.java
index 3ff4003..55b75fa 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VLVIndex.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VLVIndex.java
@@ -131,7 +131,7 @@
VLVIndex(BackendVLVIndexCfg config, State state, Storage storage, EntryContainer entryContainer, WriteableStorage txn)
throws StorageRuntimeException, ConfigException
{
- super(new TreeName(entryContainer.getDatabasePrefix(), "vlv." + config.getName()), storage, entryContainer);
+ super(new TreeName(entryContainer.getDatabasePrefix(), "vlv." + config.getName()), storage);
this.config = config;
this.baseDN = config.getBaseDN();
--
Gitblit v1.10.0