PHOENIX-3608 KeyRange interset should return EMPTY_RANGE when one of it is NULL_RANGE(Rajeshbabu)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/e7ef25ec Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/e7ef25ec Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/e7ef25ec Branch: refs/heads/calcite Commit: e7ef25eca2468e6d0a154b5e3539219f07748f22 Parents: 895cb1d Author: Rajeshbabu Chintaguntla <rajeshb...@apache.org> Authored: Fri Jan 20 19:05:06 2017 +0530 Committer: Rajeshbabu Chintaguntla <rajeshb...@apache.org> Committed: Fri Jan 20 19:05:06 2017 +0530 ---------------------------------------------------------------------- .../src/main/java/org/apache/phoenix/query/KeyRange.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/e7ef25ec/phoenix-core/src/main/java/org/apache/phoenix/query/KeyRange.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/KeyRange.java b/phoenix-core/src/main/java/org/apache/phoenix/query/KeyRange.java index f4bf793..babce9d 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/query/KeyRange.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/query/KeyRange.java @@ -356,10 +356,9 @@ public class KeyRange implements Writable { boolean newUpperInclusive; // Special case for null, is it is never included another range // except for null itself. - if (this == IS_NULL_RANGE) { - if (range == IS_NULL_RANGE) { + if (this == IS_NULL_RANGE && range == IS_NULL_RANGE) { return IS_NULL_RANGE; - } + } else if(this == IS_NULL_RANGE || range == IS_NULL_RANGE) { return EMPTY_RANGE; } if (lowerUnbound()) {
