You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ja...@apache.org on 2017/11/15 18:48:15 UTC
[20/37] phoenix git commit: Revert "PHOENIX-4322 DESC primary key
column with variable length does not work in SkipScanFilter (fix test
failures)"
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/0ac05493
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/0ac05493
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/0ac05493
Branch: refs/heads/4.x-HBase-1.1
Commit: 0ac05493534686cd4946b40589fc7e92944ceae5
Parents: 1d85ffa
Author: James Taylor <jt...@salesforce.com>
Authored: Mon Oct 30 19:24:36 2017 -0700
Committer: James Taylor <jt...@salesforce.com>
Committed: Wed Nov 15 10:46:39 2017 -0800
----------------------------------------------------------------------
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/0ac05493/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) ) ) ) {