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:34:48 UTC
[20/40] phoenix git commit: PHOENIX-4322 DESC primary key column with
variable length does not work in SkipScanFilter (fix test failures)
PHOENIX-4322 DESC primary key column with variable length does not work in SkipScanFilter (fix test failures)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/698b074d
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/698b074d
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/698b074d
Branch: refs/heads/4.x-HBase-1.2
Commit: 698b074d0de4657fcf9edf9e707927435a6a0ba6
Parents: 0c5dd68
Author: maryannxue <ma...@gmail.com>
Authored: Mon Oct 30 15:13:43 2017 -0700
Committer: James Taylor <jt...@salesforce.com>
Committed: Wed Nov 15 10:02:14 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/698b074d/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 8ab4f20..3fe8ad3 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 || key[offset - 1] != sepByte )
+ && ( bytes.length == 0 || slotSpan[i] == 0 || key[offset - 1] != sepByte )
&& ( sepByte == QueryConstants.DESC_SEPARATOR_BYTE
|| ( !exclusiveUpper
&& (fieldIndex < schema.getMaxFields() || inclusiveUpper || exclusiveLower) ) ) ) {