Merge lp:~pbeaman/akiban-persistit/fix-1046049-keyfilter-wrong into lp:akiban-persistit

[Peter Beaman]

Fix bug 1046049: KeyFilter is broken on range deletes for LT and LTEQ directions. The bug is a simply copy-paste error in the KeyFilter class. Fix corrects the variable name and adds test cases to KeyFilterTestScript1.

[Nathan Williams (nwilliams)]

Looks good. A quick skim of RangeTerm doesn't yield anything interesting either.

review: Approve

[Peter Beaman (pbeaman)]

Pushing this through since 3.2.1 update is now merged.

[Akiban Build User (build-akiban)]

There was one failure during build/test:

* bzr error: Nothing to merge.

review: Needs Fixing

[Nathan Williams (nwilliams)]

Something is off with this branch. It got marked as merged when lp:~pbeaman/akiban-persistit/fix-1023549-traverse-wrong went in, but these changes are not in trunk. And LP/bzr thinks there is nothing to merge.

Peter, maybe try a new branch?

[Peter Beaman (pbeaman)]

Yes, strange. The branch contains the changes but Bazaar doesn't seem to know it. I'm rejecting this branch and proposing a new one as suggested.

review: Disapprove

Unmerged revisions

=== modified file 'src/main/java/com/persistit/KeyFilter.java'
--- src/main/java/com/persistit/KeyFilter.java	2012-08-24 13:57:19 +0000
+++ src/main/java/com/persistit/KeyFilter.java	2012-10-15 19:04:24 +0000
@@ -897,7 +897,7 @@
             if (compare > 0) {
                 System.arraycopy(_itemToBytes, 0, keyBytes, offset, _itemToBytes.length);
                 key.setEncodedSize(offset + _itemToBytes.length);
-                keyBytes[offset + _itemFromBytes.length] = 0;
+                keyBytes[offset + _itemToBytes.length] = 0;
                 return true;
             }
             return false;

=== modified file 'src/test/resources/com/persistit/KeyFilterTestScript1'
--- src/test/resources/com/persistit/KeyFilterTestScript1	2012-08-02 04:51:48 +0000
+++ src/test/resources/com/persistit/KeyFilterTestScript1	2012-10-15 19:04:24 +0000
@@ -194,3 +194,14 @@
 KF {:0}
 KEY {-1}
 GT {-1}
+
+#
+# Cases added for bug https://bugs.launchpad.net/akiban-persistit/+bug/1046049
+#
+KF {{:"abc"}}
+KEY {}
+NUDGE AFTER
+GT <false>
+GTEQ <false>
+LTEQ {"abc",{after}}
+LT {"abc",{after}}