directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1538539 - in /directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree: managed/ memory/
Date Mon, 04 Nov 2013 09:49:50 GMT
Author: elecharny
Date: Mon Nov  4 09:49:50 2013
New Revision: 1538539

URL: http://svn.apache.org/r1538539
Log:
Renamed CursorImpl to TupleCursorImpl

Added:
    directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/managed/TupleCursorImpl.java
      - copied, changed from r1536066, directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/managed/CursorImpl.java
    directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/memory/TupleCursorImpl.java
      - copied, changed from r1536066, directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/memory/CursorImpl.java
Removed:
    directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/managed/CursorImpl.java
    directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/memory/CursorImpl.java
Modified:
    directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/managed/Leaf.java
    directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/memory/Leaf.java
    directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/memory/Node.java
    directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/memory/Page.java

Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/managed/Leaf.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/managed/Leaf.java?rev=1538539&r1=1538538&r2=1538539&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/managed/Leaf.java
(original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/managed/Leaf.java
Mon Nov  4 09:49:50 2013
@@ -606,10 +606,10 @@ import org.apache.directory.mavibot.btre
     /**
      * {@inheritDoc}
      */
-    public CursorImpl<K, V> browse( K key, Transaction<K, V> transaction, LinkedList<ParentPos<K,
V>> stack )
+    public TupleCursorImpl<K, V> browse( K key, Transaction<K, V> transaction,
LinkedList<ParentPos<K, V>> stack )
     {
         int pos = findPos( key );
-        CursorImpl<K, V> cursor = null;
+        TupleCursorImpl<K, V> cursor = null;
 
         if ( pos < 0 )
         {
@@ -620,7 +620,7 @@ import org.apache.directory.mavibot.btre
             setDupsContainer( parentPos, btree );
             stack.push( parentPos );
 
-            cursor = new CursorImpl<K, V>( btree, transaction, stack );
+            cursor = new TupleCursorImpl<K, V>( btree, transaction, stack );
         }
         else
         {
@@ -631,14 +631,14 @@ import org.apache.directory.mavibot.btre
                 setDupsContainer( parentPos, btree );
                 stack.push( parentPos );
 
-                cursor = new CursorImpl<K, V>( btree, transaction, stack );
+                cursor = new TupleCursorImpl<K, V>( btree, transaction, stack );
             }
             else
             {
                 // Not found : return a null cursor
                 stack.push( new ParentPos<K, V>( null, -1 ) );
 
-                return new CursorImpl<K, V>( btree, transaction, stack );
+                return new TupleCursorImpl<K, V>( btree, transaction, stack );
             }
         }
 
@@ -649,17 +649,17 @@ import org.apache.directory.mavibot.btre
     /**
      * {@inheritDoc}
      */
-    public CursorImpl<K, V> browse( Transaction<K, V> transaction, LinkedList<ParentPos<K,
V>> stack )
+    public TupleCursorImpl<K, V> browse( Transaction<K, V> transaction, LinkedList<ParentPos<K,
V>> stack )
     {
         int pos = 0;
-        CursorImpl<K, V> cursor = null;
+        TupleCursorImpl<K, V> cursor = null;
 
         if ( nbElems == 0 )
         {
             // The tree is empty, it's the root, we have nothing to return
             stack.push( new ParentPos<K, V>( null, -1 ) );
 
-            return new CursorImpl<K, V>( btree, transaction, stack );
+            return new TupleCursorImpl<K, V>( btree, transaction, stack );
         }
         else
         {
@@ -670,7 +670,7 @@ import org.apache.directory.mavibot.btre
 
             stack.push( parentPos );
 
-            cursor = new CursorImpl<K, V>( btree, transaction, stack );
+            cursor = new TupleCursorImpl<K, V>( btree, transaction, stack );
         }
 
         return cursor;

Copied: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/managed/TupleCursorImpl.java
(from r1536066, directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/managed/CursorImpl.java)
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/managed/TupleCursorImpl.java?p2=directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/managed/TupleCursorImpl.java&p1=directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/managed/CursorImpl.java&r1=1536066&r2=1538539&rev=1538539&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/managed/CursorImpl.java
(original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/managed/TupleCursorImpl.java
Mon Nov  4 09:49:50 2013
@@ -43,7 +43,7 @@ import org.apache.directory.mavibot.btre
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class CursorImpl<K, V> implements TupleCursor<K, V>
+public class TupleCursorImpl<K, V> implements TupleCursor<K, V>
 {
     /** The transaction used for this cursor */
     private Transaction<K, V> transaction;
@@ -69,7 +69,7 @@ public class CursorImpl<K, V> implements
      * @param transaction The transaction this operation is protected by
      * @param stack The stack of parent's from root to this page
      */
-    CursorImpl( BTree<K, V> btree, Transaction<K, V> transaction, LinkedList<ParentPos<K,
V>> stack )
+    TupleCursorImpl( BTree<K, V> btree, Transaction<K, V> transaction, LinkedList<ParentPos<K,
V>> stack )
     {
         this.transaction = transaction;
         this.stack = stack;

Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/memory/Leaf.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/memory/Leaf.java?rev=1538539&r1=1538538&r2=1538539&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/memory/Leaf.java
(original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/memory/Leaf.java
Mon Nov  4 09:49:50 2013
@@ -670,10 +670,10 @@ import org.apache.directory.mavibot.btre
     /**
      * {@inheritDoc}
      */
-    public CursorImpl<K, V> browse( K key, Transaction<K, V> transaction, LinkedList<ParentPos<K,
V>> stack )
+    public TupleCursorImpl<K, V> browse( K key, Transaction<K, V> transaction,
LinkedList<ParentPos<K, V>> stack )
     {
         int pos = findPos( key );
-        CursorImpl<K, V> cursor = null;
+        TupleCursorImpl<K, V> cursor = null;
 
         if ( pos < 0 )
         {
@@ -684,7 +684,7 @@ import org.apache.directory.mavibot.btre
             setDupsContainer( parentPos, btree );
             stack.push( parentPos );
 
-            cursor = new CursorImpl<K, V>( btree, transaction, stack );
+            cursor = new TupleCursorImpl<K, V>( btree, transaction, stack );
         }
         else
         {
@@ -695,14 +695,14 @@ import org.apache.directory.mavibot.btre
                 setDupsContainer( parentPos, btree );
                 stack.push( parentPos );
 
-                cursor = new CursorImpl<K, V>( btree, transaction, stack );
+                cursor = new TupleCursorImpl<K, V>( btree, transaction, stack );
             }
             else
             {
                 // Not found : return a null cursor
                 stack.push( new ParentPos<K, V>( null, -1 ) );
 
-                return new CursorImpl<K, V>( btree, transaction, stack );
+                return new TupleCursorImpl<K, V>( btree, transaction, stack );
             }
         }
 
@@ -713,17 +713,17 @@ import org.apache.directory.mavibot.btre
     /**
      * {@inheritDoc}
      */
-    public CursorImpl<K, V> browse( Transaction<K, V> transaction, LinkedList<ParentPos<K,
V>> stack )
+    public TupleCursorImpl<K, V> browse( Transaction<K, V> transaction, LinkedList<ParentPos<K,
V>> stack )
     {
         int pos = 0;
-        CursorImpl<K, V> cursor = null;
+        TupleCursorImpl<K, V> cursor = null;
 
         if ( nbElems == 0 )
         {
             // The tree is empty, it's the root, we have nothing to return
             stack.push( new ParentPos<K, V>( null, -1 ) );
 
-            return new CursorImpl<K, V>( btree, transaction, stack );
+            return new TupleCursorImpl<K, V>( btree, transaction, stack );
         }
         else
         {
@@ -734,7 +734,7 @@ import org.apache.directory.mavibot.btre
 
             stack.push( parentPos );
 
-            cursor = new CursorImpl<K, V>( btree, transaction, stack );
+            cursor = new TupleCursorImpl<K, V>( btree, transaction, stack );
         }
 
         return cursor;

Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/memory/Node.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/memory/Node.java?rev=1538539&r1=1538538&r2=1538539&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/memory/Node.java
(original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/memory/Node.java
Mon Nov  4 09:49:50 2013
@@ -943,7 +943,7 @@ import org.apache.directory.mavibot.btre
     /**
      * {@inheritDoc}
      */
-    public CursorImpl<K, V> browse( K key, Transaction<K, V> transaction, LinkedList<ParentPos<K,
V>> stack )
+    public TupleCursorImpl<K, V> browse( K key, Transaction<K, V> transaction,
LinkedList<ParentPos<K, V>> stack )
         throws IOException
     {
         int pos = findPos( key );
@@ -963,7 +963,7 @@ import org.apache.directory.mavibot.btre
     /**
      * {@inheritDoc}
      */
-    public CursorImpl<K, V> browse( Transaction<K, V> transaction, LinkedList<ParentPos<K,
V>> stack )
+    public TupleCursorImpl<K, V> browse( Transaction<K, V> transaction, LinkedList<ParentPos<K,
V>> stack )
         throws IOException
     {
         stack.push( new ParentPos<K, V>( this, 0 ) );

Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/memory/Page.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/memory/Page.java?rev=1538539&r1=1538538&r2=1538539&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/memory/Page.java
(original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/memory/Page.java
Mon Nov  4 09:49:50 2013
@@ -134,7 +134,7 @@ import org.apache.directory.mavibot.btre
      * @return A Cursor to browse the next elements
      * @throws IOException If we have an error while trying to access the page
      */
-    CursorImpl<K, V> browse( K key, Transaction<K, V> transaction, LinkedList<ParentPos<K,
V>> stack )
+    TupleCursorImpl<K, V> browse( K key, Transaction<K, V> transaction, LinkedList<ParentPos<K,
V>> stack )
         throws IOException;
 
 
@@ -146,7 +146,7 @@ import org.apache.directory.mavibot.btre
      * @return A Cursor to browse the next elements
      * @throws IOException If we have an error while trying to access the page
      */
-    CursorImpl<K, V> browse( Transaction<K, V> transaction, LinkedList<ParentPos<K,
V>> stack )
+    TupleCursorImpl<K, V> browse( Transaction<K, V> transaction, LinkedList<ParentPos<K,
V>> stack )
         throws EndOfFileExceededException, IOException;
 
 

Copied: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/memory/TupleCursorImpl.java
(from r1536066, directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/memory/CursorImpl.java)
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/memory/TupleCursorImpl.java?p2=directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/memory/TupleCursorImpl.java&p1=directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/memory/CursorImpl.java&r1=1536066&r2=1538539&rev=1538539&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/memory/CursorImpl.java
(original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/memory/TupleCursorImpl.java
Mon Nov  4 09:49:50 2013
@@ -44,7 +44,7 @@ import org.apache.directory.mavibot.btre
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class CursorImpl<K, V> implements TupleCursor<K, V>
+public class TupleCursorImpl<K, V> implements TupleCursor<K, V>
 {
     /** The transaction used for this cursor */
     private Transaction<K, V> transaction;
@@ -70,7 +70,7 @@ public class CursorImpl<K, V> implements
      * @param transaction The transaction this operation is protected by
      * @param stack The stack of parent's from root to this page
      */
-    CursorImpl( BTree<K, V> btree, Transaction<K, V> transaction, LinkedList<ParentPos<K,
V>> stack )
+    TupleCursorImpl( BTree<K, V> btree, Transaction<K, V> transaction, LinkedList<ParentPos<K,
V>> stack )
     {
         this.transaction = transaction;
         this.stack = stack;



Mime
View raw message