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/Index.java |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/opends/src/server/org/opends/server/backends/jeb/Index.java b/opends/src/server/org/opends/server/backends/jeb/Index.java
index e32e99f..ec11b0f 100644
--- a/opends/src/server/org/opends/server/backends/jeb/Index.java
+++ b/opends/src/server/org/opends/server/backends/jeb/Index.java
@@ -65,9 +65,9 @@
 
 
   /**
-   * The database container holding this index database.
+   * The database entryContainer holding this index database.
    */
-  private Container container;
+  private EntryContainer entryContainer;
 
   /**
    * The JE database configuration.
@@ -75,7 +75,7 @@
   private DatabaseConfig dbConfig;
 
   /**
-   * The name of the database within the container.
+   * The name of the database within the entryContainer.
    */
   private String name;
 
@@ -114,8 +114,8 @@
 
   /**
    * Create a new index object.
-   * @param container The database container holding this index.
-   * @param name The name of the index database within the container.
+   * @param entryContainer The database entryContainer holding this index.
+   * @param name The name of the index database within the entryContainer.
    * @param indexer The indexer object to construct index keys from LDAP
    * attribute values.
    * @param indexEntryLimit The configured limit on the number of entry IDs
@@ -123,10 +123,10 @@
    * @param cursorEntryLimit The configured limit on the number of entry IDs
    * that may be retrieved by cursoring through an index.
    */
-  public Index(Container container, String name, Indexer indexer,
+  public Index(EntryContainer entryContainer, String name, Indexer indexer,
                int indexEntryLimit, int cursorEntryLimit)
   {
-    this.container = container;
+    this.entryContainer = entryContainer;
     this.name = name;
     this.indexer = indexer;
     this.comparator = indexer.getComparator();
@@ -148,7 +148,7 @@
 
   /**
    * Get a handle to the database. It returns a per-thread handle to avoid
-   * any thread contention on the database handle. The container is
+   * any thread contention on the database handle. The entryContainer is
    * responsible for closing all handles.
    *
    * @return A database handle.
@@ -160,7 +160,7 @@
     Database database = threadLocalDatabase.get();
     if (database == null)
     {
-      database = container.openDatabase(dbConfig, name);
+      database = entryContainer.openDatabase(dbConfig, name);
       threadLocalDatabase.set(database);
     }
     return database;
@@ -182,7 +182,7 @@
     DatabaseEntry entryIDData = entryID.getDatabaseEntry();
     DatabaseEntry data = new DatabaseEntry();
 
-    status = Container.read(getDatabase(), txn, key, data, lockMode);
+    status = EntryContainer.read(getDatabase(), txn, key, data, lockMode);
 
     if (status == OperationStatus.SUCCESS)
     {
@@ -202,12 +202,12 @@
 
         byte[] after = entryIDList.toDatabase();
         data.setData(after);
-        Container.put(getDatabase(), txn, key, data);
+        EntryContainer.put(getDatabase(), txn, key, data);
       }
     }
     else
     {
-      Container.put(getDatabase(), txn, key, entryIDData);
+      EntryContainer.put(getDatabase(), txn, key, entryIDData);
     }
   }
 
@@ -226,7 +226,7 @@
     LockMode lockMode = LockMode.RMW;
     DatabaseEntry data = new DatabaseEntry();
 
-    status = Container.read(getDatabase(), txn, key, data, lockMode);
+    status = EntryContainer.read(getDatabase(), txn, key, data, lockMode);
 
     if (status == OperationStatus.SUCCESS)
     {
@@ -244,12 +244,12 @@
           if (after == null)
           {
             // No more IDs, so remove the key
-            Container.delete(getDatabase(), txn, key);
+            EntryContainer.delete(getDatabase(), txn, key);
           }
           else
           {
             data.setData(after);
-            Container.put(getDatabase(), txn, key, data);
+            EntryContainer.put(getDatabase(), txn, key, data);
           }
         }
       }
@@ -280,7 +280,7 @@
     LockMode lockMode = LockMode.DEFAULT;
     DatabaseEntry data = new DatabaseEntry();
 
-    status = Container.read(getDatabase(), txn, key, data, lockMode);
+    status = EntryContainer.read(getDatabase(), txn, key, data, lockMode);
     if (status == OperationStatus.SUCCESS)
     {
       EntryIDSet entryIDList =
@@ -320,7 +320,7 @@
     {
       OperationStatus status;
       DatabaseEntry data = new DatabaseEntry();
-      status = Container.read(getDatabase(), txn, key, data, lockMode);
+      status = EntryContainer.read(getDatabase(), txn, key, data, lockMode);
       if (status != OperationStatus.SUCCESS)
       {
         return new EntryIDSet(key.getData(), null);
@@ -351,7 +351,7 @@
     if (after == null)
     {
       // No more IDs, so remove the key.
-      Container.delete(getDatabase(), txn, key);
+      EntryContainer.delete(getDatabase(), txn, key);
     }
     else
     {
@@ -360,7 +360,7 @@
         entryLimitExceededCount++;
       }
       data.setData(after);
-      Container.put(getDatabase(), txn, key, data);
+      EntryContainer.put(getDatabase(), txn, key, data);
     }
   }
 

--
Gitblit v1.10.0