From 83dd61651cb5d73c1a15dfcb7d217c0f272722d2 Mon Sep 17 00:00:00 2001
From: boli <boli@localhost>
Date: Tue, 03 Oct 2006 19:09:36 +0000
Subject: [PATCH] Refactoring of the JEB backend to simplify the container and entryContainer abstraction. This also elimates exposing the JE interface to backendImpl by creating a new RootContainer class. It provides a higher-level interface to access raw data in JE from anywhere in the server (ie. unit tests).
---
opends/src/server/org/opends/server/backends/jeb/AttributeIndex.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/opends/src/server/org/opends/server/backends/jeb/AttributeIndex.java b/opends/src/server/org/opends/server/backends/jeb/AttributeIndex.java
index 1de8247..8fd8930 100644
--- a/opends/src/server/org/opends/server/backends/jeb/AttributeIndex.java
+++ b/opends/src/server/org/opends/server/backends/jeb/AttributeIndex.java
@@ -79,9 +79,9 @@
new DatabaseEntry("+".getBytes());
/**
- * The container in which this attribute index resides.
+ * The entryContainer in which this attribute index resides.
*/
- Container container;
+ EntryContainer entryContainer;
/**
* The attribute index configuration.
@@ -110,13 +110,13 @@
/**
* Create a new attribute index object.
+ * @param entryContainer The entryContainer of this attribute index.
* @param indexConfig The attribute index configuration.
- * @param container The container of this attribute index.
*/
- public AttributeIndex(IndexConfig indexConfig, Container container)
+ public AttributeIndex(EntryContainer entryContainer, IndexConfig indexConfig)
{
+ this.entryContainer = entryContainer;
this.indexConfig = indexConfig;
- this.container = container;
AttributeType attrType = indexConfig.getAttributeType();
String name = attrType.getNameOrOID();
@@ -124,7 +124,7 @@
if (indexConfig.isEqualityIndex())
{
Indexer equalityIndexer = new EqualityIndexer(indexConfig);
- this.equalityIndex = new Index(container, name + ".equality",
+ this.equalityIndex = new Index(this.entryContainer, name + ".equality",
equalityIndexer,
indexConfig.getEqualityEntryLimit(),
indexConfig.getCursorEntryLimit());
@@ -133,7 +133,7 @@
if (indexConfig.isPresenceIndex())
{
Indexer presenceIndexer = new PresenceIndexer(indexConfig);
- this.presenceIndex = new Index(container, name + ".presence",
+ this.presenceIndex = new Index(this.entryContainer, name + ".presence",
presenceIndexer,
indexConfig.getPresenceEntryLimit(),
indexConfig.getCursorEntryLimit());
@@ -142,7 +142,7 @@
if (indexConfig.isSubstringIndex())
{
Indexer substringIndexer = new SubstringIndexer(indexConfig);
- this.substringIndex = new Index(container, name + ".substring",
+ this.substringIndex = new Index(this.entryContainer, name + ".substring",
substringIndexer,
indexConfig.getSubstringEntryLimit(),
indexConfig.getCursorEntryLimit());
@@ -151,7 +151,7 @@
if (indexConfig.isOrderingIndex())
{
Indexer orderingIndexer = new OrderingIndexer(indexConfig);
- this.orderingIndex = new Index(container, name + ".ordering",
+ this.orderingIndex = new Index(this.entryContainer, name + ".ordering",
orderingIndexer,
indexConfig.getEqualityEntryLimit(),
indexConfig.getCursorEntryLimit());
@@ -195,7 +195,7 @@
*/
public void close()
{
- // The container is responsible for closing the JE databases.
+ // The entryContainer is responsible for closing the JE databases.
}
/**
@@ -791,19 +791,19 @@
String name = attrType.getNameOrOID();
if (indexConfig.isEqualityIndex())
{
- container.removeDatabase(name + ".equality");
+ entryContainer.removeDatabase(name + ".equality");
}
if (indexConfig.isPresenceIndex())
{
- container.removeDatabase(name + ".presence");
+ entryContainer.removeDatabase(name + ".presence");
}
if (indexConfig.isSubstringIndex())
{
- container.removeDatabase(name + ".substring");
+ entryContainer.removeDatabase(name + ".substring");
}
if (indexConfig.isOrderingIndex())
{
- container.removeDatabase(name + ".ordering");
+ entryContainer.removeDatabase(name + ".ordering");
}
}
--
Gitblit v1.10.0