directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r639521 - in /directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src: main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/
Date Fri, 21 Mar 2008 02:32:06 GMT
Author: akarasulu
Date: Thu Mar 20 19:32:03 2008
New Revision: 639521

URL: http://svn.apache.org/viewvc?rev=639521&view=rev
Log:
more cursor renaming for clarity

Added:
    directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursor.java
  (contents, props changed)
      - copied, changed from r639275, directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyCursor.java
    directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleAvlCursor.java
      - copied, changed from r639279, directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeySetTupleCursor.java
    directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java
      - copied, changed from r639518, directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleCursor.java
Removed:
    directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyCursor.java
    directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeySetTupleCursor.java
    directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleCursor.java
Modified:
    directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursor.java
    directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java
    directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyCursorTest.java

Modified: directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursor.java?rev=639521&r1=639520&r2=639521&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursor.java
(original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursor.java
Thu Mar 20 19:32:03 2008
@@ -94,7 +94,7 @@
             else
             {
                 BTree tree = table.getBTree( values.getBTreeRedirect() );
-                dupsCursor = new KeyCursor<V>( tree, table.getValueComparator() );
+                dupsCursor = new KeyBTreeCursor<V>( tree, table.getValueComparator()
);
             }
 
             if ( element.getValue() == null )
@@ -162,7 +162,7 @@
             else
             {
                 BTree tree = table.getBTree( values.getBTreeRedirect() );
-                dupsCursor = new KeyCursor<V>( tree, table.getValueComparator() );
+                dupsCursor = new KeyBTreeCursor<V>( tree, table.getValueComparator()
);
             }
 
             if ( element.getValue() == null )
@@ -222,7 +222,7 @@
             else
             {
                 BTree bt = table.getBTree( values.getBTreeRedirect() );
-                dupsCursor = new KeyCursor<V>( bt, table.getValueComparator() );
+                dupsCursor = new KeyBTreeCursor<V>( bt, table.getValueComparator()
);
             }
 
             /*
@@ -259,7 +259,7 @@
             else
             {
                 BTree tree = table.getBTree( values.getBTreeRedirect() );
-                dupsCursor = new KeyCursor<V>( tree, table.getValueComparator() );
+                dupsCursor = new KeyBTreeCursor<V>( tree, table.getValueComparator()
);
             }
 
             /*
@@ -313,7 +313,7 @@
                 else
                 {
                     BTree tree = table.getBTree( values.getBTreeRedirect() );
-                    dupsCursor = new KeyCursor<V>( tree, table.getValueComparator()
);
+                    dupsCursor = new KeyBTreeCursor<V>( tree, table.getValueComparator()
);
                 }
 
                 /*
@@ -363,7 +363,7 @@
                 else
                 {
                     BTree tree = table.getBTree( values.getBTreeRedirect() );
-                    dupsCursor = new KeyCursor<V>( tree, table.getValueComparator()
);
+                    dupsCursor = new KeyBTreeCursor<V>( tree, table.getValueComparator()
);
                 }
 
                 /*

Modified: directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java?rev=639521&r1=639520&r2=639521&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java
(original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java
Thu Mar 20 19:32:03 2008
@@ -791,11 +791,11 @@
         if ( BTreeRedirectMarshaller.isRedirect( serialized ) )
         {
             BTree tree = getBTree( BTreeRedirectMarshaller.INSTANCE.deserialize( serialized
) );
-            return new KeyTupleCursor<K,V>( tree, key, keyComparator );
+            return new KeyTupleBTreeCursor<K,V>( tree, key, keyComparator );
         }
 
         AvlTree<V> set = marshaller.deserialize( serialized );
-        return new KeySetTupleCursor<K,V>( set, key, valueComparator );
+        return new KeyTupleAvlCursor<K,V>( set, key, valueComparator );
     }
 
 
@@ -823,7 +823,7 @@
         if ( BTreeRedirectMarshaller.isRedirect( serialized ) )
         {
             BTree tree = getBTree( BTreeRedirectMarshaller.INSTANCE.deserialize( serialized
) );
-            return new KeyCursor<V>( tree, valueComparator );
+            return new KeyBTreeCursor<V>( tree, valueComparator );
         }
 
         return new AvlTreeCursor<V>( marshaller.deserialize( serialized ) );

Copied: directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursor.java
(from r639275, directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyCursor.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursor.java?p2=directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursor.java&p1=directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyCursor.java&r1=639275&r2=639521&rev=639521&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyCursor.java
(original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursor.java
Thu Mar 20 19:32:03 2008
@@ -36,7 +36,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class KeyCursor<E> extends AbstractCursor<E>
+public class KeyBTreeCursor<E> extends AbstractCursor<E>
 {
     private final Tuple tuple = new Tuple();
 
@@ -53,7 +53,7 @@
      * @param comparator the Comparator used to determine key ordering
      * @throws Exception of there are problems accessing the BTree
      */
-    public KeyCursor( BTree btree, Comparator<E> comparator ) throws Exception
+    public KeyBTreeCursor( BTree btree, Comparator<E> comparator ) throws Exception
     {
         this.btree = btree;
         this.comparator = comparator;

Propchange: directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursor.java
------------------------------------------------------------------------------
    svn:executable = *

Copied: directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleAvlCursor.java
(from r639279, directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeySetTupleCursor.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleAvlCursor.java?p2=directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleAvlCursor.java&p1=directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeySetTupleCursor.java&r1=639279&r2=639521&rev=639521&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeySetTupleCursor.java
(original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleAvlCursor.java
Thu Mar 20 19:32:03 2008
@@ -36,7 +36,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class KeySetTupleCursor<K,V> extends AbstractCursor<Tuple<K,V>>
+public class KeyTupleAvlCursor<K,V> extends AbstractCursor<Tuple<K,V>>
 {
     private final Comparator<V> comparator;
     private final AvlTreeCursor<V> wrapped;
@@ -53,7 +53,7 @@
      * @param key the constant key for which values are returned
      * @param comparator the Comparator used to determine <b>key</b> ordering
      */
-    public KeySetTupleCursor( AvlTree<V> avlTree, K key, Comparator<V> comparator
)
+    public KeyTupleAvlCursor( AvlTree<V> avlTree, K key, Comparator<V> comparator
)
     {
         this.key = key;
         this.comparator = comparator;

Copied: directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java
(from r639518, directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleCursor.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java?p2=directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java&p1=directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleCursor.java&r1=639518&r2=639521&rev=639521&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleCursor.java
(original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java
Thu Mar 20 19:32:03 2008
@@ -37,7 +37,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class KeyTupleCursor<K,V> extends AbstractCursor<Tuple<K,V>>
+public class KeyTupleBTreeCursor<K,V> extends AbstractCursor<Tuple<K,V>>
 {
     private final Comparator<K> comparator;
     private final BTree btree;
@@ -57,7 +57,7 @@
      * @param comparator the Comparator used to determine <b>key</b> ordering
      * @throws Exception of there are problems accessing the BTree
      */
-    public KeyTupleCursor( BTree btree, K key, Comparator<K> comparator ) throws Exception
+    public KeyTupleBTreeCursor( BTree btree, K key, Comparator<K> comparator ) throws
Exception
     {
         this.key = key;
         this.btree = btree;

Modified: directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyCursorTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyCursorTest.java?rev=639521&r1=639520&r2=639521&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyCursorTest.java
(original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyCursorTest.java
Thu Mar 20 19:32:03 2008
@@ -59,7 +59,7 @@
     BTree bt;
     Comparator<String> comparator;
 
-    KeyCursor<String> cursor;
+    KeyBTreeCursor<String> cursor;
 
 
     @SuppressWarnings({"unchecked"})
@@ -89,8 +89,8 @@
         bt.insert( "8", EMPTY_BYTES, true );
         bt.insert( "9", EMPTY_BYTES, true );
 
-        cursor = new KeyCursor<String>( bt, comparator );
-        LOG.debug( "Created new KeyCursor and populated it's btree" );
+        cursor = new KeyBTreeCursor<String>( bt, comparator );
+        LOG.debug( "Created new KeyBTreeCursor and populated it's btree" );
     }
 
 



Mime
View raw message