From 0bd57577bb85119b2b4495c5ef525ba189d8d17c Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 04 Mar 2015 23:14:55 +0000
Subject: [PATCH] OPENDJ-1848: in-line and remove various storage related access methods from DatabaseContainer.

---
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VerifyJob.java |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VerifyJob.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VerifyJob.java
index f656d94..40510ce 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VerifyJob.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VerifyJob.java
@@ -388,7 +388,7 @@
    */
   private void iterateID2Entry(ReadableStorage txn) throws StorageRuntimeException
   {
-    Cursor cursor = id2entry.openCursor(txn);
+    Cursor cursor = txn.openCursor(id2entry.getName());
     try
     {
       long storedEntryCount = id2entry.getRecordCount(txn);
@@ -499,7 +499,7 @@
    */
   private void iterateDN2ID(ReadableStorage txn) throws StorageRuntimeException
   {
-    Cursor cursor = dn2id.openCursor(txn);
+    Cursor cursor = txn.openCursor(dn2id.getName());
     try
     {
       while (cursor.next())
@@ -529,7 +529,7 @@
         Entry entry;
         try
         {
-          entry = id2entry.get(txn, entryID, false);
+          entry = id2entry.get(txn, entryID);
         }
         catch (Exception e)
         {
@@ -570,7 +570,7 @@
    */
   private void iterateID2Children(ReadableStorage txn) throws StorageRuntimeException
   {
-    Cursor cursor = id2c.openCursor(txn);
+    Cursor cursor = txn.openCursor(id2c.getName());
     try
     {
       while (cursor.next())
@@ -623,7 +623,7 @@
           Entry entry;
           try
           {
-            entry = id2entry.get(txn, entryID, false);
+            entry = id2entry.get(txn, entryID);
           }
           catch (Exception e)
           {
@@ -647,7 +647,7 @@
             Entry childEntry;
             try
             {
-              childEntry = id2entry.get(txn, id, false);
+              childEntry = id2entry.get(txn, id);
             }
             catch (Exception e)
             {
@@ -696,7 +696,7 @@
    */
   private void iterateID2Subtree(ReadableStorage txn) throws StorageRuntimeException
   {
-    Cursor cursor = id2s.openCursor(txn);
+    Cursor cursor = txn.openCursor(id2s.getName());
     try
     {
       while (cursor.next())
@@ -748,7 +748,7 @@
           Entry entry;
           try
           {
-            entry = id2entry.get(txn, entryID, false);
+            entry = id2entry.get(txn, entryID);
           }
           catch (Exception e)
           {
@@ -772,7 +772,7 @@
             Entry subordEntry;
             try
             {
-              subordEntry = id2entry.get(txn, id, false);
+              subordEntry = id2entry.get(txn, id);
             }
             catch (Exception e)
             {
@@ -880,7 +880,7 @@
       return;
     }
 
-    Cursor cursor = vlvIndex.openCursor(txn);
+    Cursor cursor = txn.openCursor(vlvIndex.getName());
     try
     {
       SortValues lastValues = null;
@@ -929,7 +929,7 @@
             EntryID id = new EntryID(values.getEntryID());
             try
             {
-              entry = id2entry.get(txn, id, false);
+              entry = id2entry.get(txn, id);
             }
             catch (Exception e)
             {
@@ -984,7 +984,7 @@
       return;
     }
 
-    Cursor cursor = index.openCursor(txn);
+    Cursor cursor = txn.openCursor(index.getName());
     try
     {
       while (cursor.next())
@@ -1029,7 +1029,7 @@
             Entry entry;
             try
             {
-              entry = id2entry.get(txn, id, false);
+              entry = id2entry.get(txn, id);
             }
             catch (Exception e)
             {
@@ -1146,7 +1146,7 @@
     // Check the ID is in dn2id with the correct DN.
     try
     {
-      EntryID id = dn2id.get(txn, dn, false);
+      EntryID id = dn2id.get(txn, dn);
       if (id == null)
       {
         if (logger.isTraceEnabled())
@@ -1180,7 +1180,7 @@
     {
       try
       {
-        EntryID id = dn2id.get(txn, parentDN, false);
+        EntryID id = dn2id.get(txn, parentDN);
         if (id == null)
         {
           if (logger.isTraceEnabled())
@@ -1218,7 +1218,7 @@
       EntryID parentID = null;
       try
       {
-        parentID = dn2id.get(txn, parentDN, false);
+        parentID = dn2id.get(txn, parentDN);
         if (parentID == null)
         {
           if (logger.isTraceEnabled())
@@ -1282,7 +1282,7 @@
       EntryID id = null;
       try
       {
-        id = dn2id.get(txn, dn, false);
+        id = dn2id.get(txn, dn);
         if (id == null)
         {
           if (logger.isTraceEnabled())

--
Gitblit v1.10.0