Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 40017 invoked from network); 16 Mar 2008 07:52:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 16 Mar 2008 07:52:55 -0000 Received: (qmail 5304 invoked by uid 500); 16 Mar 2008 07:52:53 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 5253 invoked by uid 500); 16 Mar 2008 07:52:53 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 5242 invoked by uid 99); 16 Mar 2008 07:52:52 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 16 Mar 2008 00:52:52 -0700 X-ASF-Spam-Status: No, hits=-1999.6 required=10.0 tests=ALL_TRUSTED,SUBJECT_FUZZY_TION X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 16 Mar 2008 07:52:12 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0D6171A9832; Sun, 16 Mar 2008 00:52:32 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r637553 - 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: Sun, 16 Mar 2008 07:52:31 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080316075232.0D6171A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: akarasulu Date: Sun Mar 16 00:52:31 2008 New Revision: 637553 URL: http://svn.apache.org/viewvc?rev=637553&view=rev Log: removing unecessary code as exposed by code coverage tools from NoDupsCursor Modified: directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursor.java directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java Modified: directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursor.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/NoDupsCursor.java?rev=637553&r1=637552&r2=637553&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursor.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursor.java Sun Mar 16 00:52:31 2008 @@ -104,36 +104,17 @@ //noinspection unchecked K next = ( K ) jdbmTuple.getKey(); - //noinspection unchecked int nextCompared = table.getKeyComparator().compare( next, element.getKey() ); - if ( nextCompared <= 0 ) + if ( nextCompared > 0 ) { - // just continue - } - else if ( nextCompared > 0 ) - { - /* - * If we just have values greater than the element argument - * then we are before the first element and cannot backup, and - * the call below to getPrevious() will fail. In this special - * case we just reset the Cursor's browser and return. - */ - if ( browser.getPrevious( jdbmTuple ) ) - { - } - else - { - browser = table.getBTree().browse( element.getKey() ); - } - + browser.getPrevious( jdbmTuple ); clearValue(); return; } } clearValue(); - // just return } Modified: directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.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/NoDupsCursorTest.java?rev=637553&r1=637552&r2=637553&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java Sun Mar 16 00:52:31 2008 @@ -101,6 +101,13 @@ assertFalse( cursor.available() ); assertFalse( cursor.isClosed() ); assertTrue( cursor.isElementReused() ); + + cursor = table.cursor(); + assertFalse( cursor.previous() ); + + cursor = table.cursor(); + assertFalse( cursor.next() ); + cursor.after( new Tuple(7,7) ); cursor.get(); } @@ -175,7 +182,13 @@ assertTrue( tuple.getValue().equals( 1 ) ); } - + + @Test + public void testMiscellaneous() throws Exception + { + } + + private class MockComparatorRegistry implements ComparatorRegistry { private Comparator comparator = new Comparator()