Repository: phoenix Updated Branches: refs/heads/4.0 b5e6ddcff -> ac02df9b6
PHOENIX-1133 Skip scan intersect method not reseting state correctly Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/ac02df9b Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/ac02df9b Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/ac02df9b Branch: refs/heads/4.0 Commit: ac02df9b689654030504bb285a3baa3f08b986d5 Parents: b5e6ddc Author: James Taylor <[email protected]> Authored: Wed Jul 30 11:44:42 2014 -0700 Committer: James Taylor <[email protected]> Committed: Wed Jul 30 12:34:23 2014 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/phoenix/filter/SkipScanFilter.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/ac02df9b/phoenix-core/src/main/java/org/apache/phoenix/filter/SkipScanFilter.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/filter/SkipScanFilter.java b/phoenix-core/src/main/java/org/apache/phoenix/filter/SkipScanFilter.java index 13113c8..5cee0d7 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/filter/SkipScanFilter.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/filter/SkipScanFilter.java @@ -156,10 +156,15 @@ public class SkipScanFilter extends FilterBase implements Writable { return true; } + private void resetState() { + isDone = false; + endKeyLength = 0; + Arrays.fill(position, 0); + } + private boolean intersect(byte[] lowerInclusiveKey, byte[] upperExclusiveKey, List<List<KeyRange>> newSlots) { + resetState(); boolean lowerUnbound = (lowerInclusiveKey.length == 0); - Arrays.fill(position, 0); - isDone = false; int startPos = 0; int lastSlot = slots.size()-1; if (!lowerUnbound) {
