Repository: phoenix Updated Branches: refs/heads/master 45a9c275d -> a7af29f9e
Revert "PHOENIX-4322 DESC primary key column with variable length does not work in SkipScanFilter (fix test failures)" This reverts commit 45a9c275dbbf9206264236c690f40c309d97da3c. Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/6b24e0d5 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/6b24e0d5 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/6b24e0d5 Branch: refs/heads/master Commit: 6b24e0d5869839f861f3b7069e865e71d1fc61c6 Parents: 45a9c27 Author: James Taylor <[email protected]> Authored: Mon Oct 30 19:24:36 2017 -0700 Committer: James Taylor <[email protected]> Committed: Mon Oct 30 19:24:36 2017 -0700 ---------------------------------------------------------------------- phoenix-core/src/main/java/org/apache/phoenix/util/ScanUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b24e0d5/phoenix-core/src/main/java/org/apache/phoenix/util/ScanUtil.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ScanUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/ScanUtil.java index 3fe8ad3..8ab4f20 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/ScanUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ScanUtil.java @@ -434,7 +434,7 @@ public class ScanUtil { // The result of an RVC evaluation can come with a trailing separator already, so we // should avoid adding another one. if ( !isFixedWidth - && ( bytes.length == 0 || slotSpan[i] == 0 || key[offset - 1] != sepByte ) + && ( bytes.length == 0 || key[offset - 1] != sepByte ) && ( sepByte == QueryConstants.DESC_SEPARATOR_BYTE || ( !exclusiveUpper && (fieldIndex < schema.getMaxFields() || inclusiveUpper || exclusiveLower) ) ) ) {
