IMPALA-7039: Ignore the port in HBase planner tests Before this patch, we used to check the HBase port in the HBase planner tests. This caused a failure when HBase was running on a different port than expected. We fix the problem in this patch by not checking the HBase port.
Testing: ran the FE tests and they passed. Change-Id: I8eb7628061b2ebaf84323b37424925e9a64f70a0 Reviewed-on: http://gerrit.cloudera.org:8080/10459 Reviewed-by: Tim Armstrong <[email protected]> Tested-by: Impala Public Jenkins <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/impala/repo Commit: http://git-wip-us.apache.org/repos/asf/impala/commit/b07bb272 Tree: http://git-wip-us.apache.org/repos/asf/impala/tree/b07bb272 Diff: http://git-wip-us.apache.org/repos/asf/impala/diff/b07bb272 Branch: refs/heads/2.x Commit: b07bb2729df4aa92d68626f88afa7cd09733ec23 Parents: 98052e0 Author: Taras Bobrovytsky <[email protected]> Authored: Fri May 18 15:42:15 2018 -0700 Committer: Impala Public Jenkins <[email protected]> Committed: Fri May 25 23:17:16 2018 +0000 ---------------------------------------------------------------------- .../apache/impala/planner/PlannerTestBase.java | 3 -- .../queries/PlannerTest/hbase.test | 38 ++++++++++---------- .../queries/PlannerTest/joins.test | 2 +- 3 files changed, 20 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/impala/blob/b07bb272/fe/src/test/java/org/apache/impala/planner/PlannerTestBase.java ---------------------------------------------------------------------- diff --git a/fe/src/test/java/org/apache/impala/planner/PlannerTestBase.java b/fe/src/test/java/org/apache/impala/planner/PlannerTestBase.java index bcd1fc3..e7e228f 100644 --- a/fe/src/test/java/org/apache/impala/planner/PlannerTestBase.java +++ b/fe/src/test/java/org/apache/impala/planner/PlannerTestBase.java @@ -288,10 +288,7 @@ public class PlannerTestBase extends FrontendTestBase { } if (locations.scan_range.isSetHbase_key_range()) { THBaseKeyRange keyRange = locations.scan_range.getHbase_key_range(); - Integer hostIdx = locations.locations.get(0).host_idx; - TNetworkAddress networkAddress = execRequest.getHost_list().get(hostIdx); result.append("HBASE KEYRANGE "); - result.append("port=" + networkAddress.port + " "); if (keyRange.isSetStartKey()) { result.append(HBaseScanNode.printKey(keyRange.getStartKey().getBytes())); } else { http://git-wip-us.apache.org/repos/asf/impala/blob/b07bb272/testdata/workloads/functional-planner/queries/PlannerTest/hbase.test ---------------------------------------------------------------------- diff --git a/testdata/workloads/functional-planner/queries/PlannerTest/hbase.test b/testdata/workloads/functional-planner/queries/PlannerTest/hbase.test index e0728be..2119e2c 100644 --- a/testdata/workloads/functional-planner/queries/PlannerTest/hbase.test +++ b/testdata/workloads/functional-planner/queries/PlannerTest/hbase.test @@ -16,9 +16,9 @@ PLAN-ROOT SINK predicates: id < 5 ---- SCANRANGELOCATIONS NODE 0: - HBASE KEYRANGE port=16201 <unbounded>:3 - HBASE KEYRANGE port=16202 3:7 - HBASE KEYRANGE port=16203 7:<unbounded> + HBASE KEYRANGE <unbounded>:3 + HBASE KEYRANGE 3:7 + HBASE KEYRANGE 7:<unbounded> ---- DISTRIBUTEDPLAN PLAN-ROOT SINK | @@ -40,7 +40,7 @@ PLAN-ROOT SINK predicates: tinyint_col = 5 ---- SCANRANGELOCATIONS NODE 0: - HBASE KEYRANGE port=16202 5:5\0 + HBASE KEYRANGE 5:5\0 ---- DISTRIBUTEDPLAN PLAN-ROOT SINK | @@ -62,8 +62,8 @@ PLAN-ROOT SINK predicates: tinyint_col = 5 ---- SCANRANGELOCATIONS NODE 0: - HBASE KEYRANGE port=16202 5\0:7 - HBASE KEYRANGE port=16203 7:<unbounded> + HBASE KEYRANGE 5\0:7 + HBASE KEYRANGE 7:<unbounded> ---- DISTRIBUTEDPLAN PLAN-ROOT SINK | @@ -84,8 +84,8 @@ PLAN-ROOT SINK predicates: tinyint_col = 5 ---- SCANRANGELOCATIONS NODE 0: - HBASE KEYRANGE port=16202 5:7 - HBASE KEYRANGE port=16203 7:<unbounded> + HBASE KEYRANGE 5:7 + HBASE KEYRANGE 7:<unbounded> ---- DISTRIBUTEDPLAN PLAN-ROOT SINK | @@ -106,8 +106,8 @@ PLAN-ROOT SINK predicates: tinyint_col = 5 ---- SCANRANGELOCATIONS NODE 0: - HBASE KEYRANGE port=16201 <unbounded>:3 - HBASE KEYRANGE port=16202 3:5 + HBASE KEYRANGE <unbounded>:3 + HBASE KEYRANGE 3:5 ---- DISTRIBUTEDPLAN PLAN-ROOT SINK | @@ -139,7 +139,7 @@ PLAN-ROOT SINK predicates: tinyint_col = 5 ---- SCANRANGELOCATIONS NODE 0: - HBASE KEYRANGE port=16202 4\0:5 + HBASE KEYRANGE 4\0:5 ---- DISTRIBUTEDPLAN PLAN-ROOT SINK | @@ -162,7 +162,7 @@ PLAN-ROOT SINK predicates: tinyint_col = 5 ---- SCANRANGELOCATIONS NODE 0: - HBASE KEYRANGE port=16202 4:5 + HBASE KEYRANGE 4:5 ---- DISTRIBUTEDPLAN PLAN-ROOT SINK | @@ -185,7 +185,7 @@ PLAN-ROOT SINK predicates: tinyint_col = 5 ---- SCANRANGELOCATIONS NODE 0: - HBASE KEYRANGE port=16202 4\0:5\0 + HBASE KEYRANGE 4\0:5\0 ---- DISTRIBUTEDPLAN PLAN-ROOT SINK | @@ -208,7 +208,7 @@ PLAN-ROOT SINK predicates: tinyint_col = 5 ---- SCANRANGELOCATIONS NODE 0: - HBASE KEYRANGE port=16202 4:5\0 + HBASE KEYRANGE 4:5\0 ---- DISTRIBUTEDPLAN PLAN-ROOT SINK | @@ -395,7 +395,7 @@ PLAN-ROOT SINK predicates: tinyint_col = 5, string_col = '4' ---- SCANRANGELOCATIONS NODE 0: - HBASE KEYRANGE port=16202 4:5\0 + HBASE KEYRANGE 4:5\0 ---- DISTRIBUTEDPLAN PLAN-ROOT SINK | @@ -449,7 +449,7 @@ PLAN-ROOT SINK predicates: tinyint_col = 5, string_col = '4' ---- SCANRANGELOCATIONS NODE 0: - HBASE KEYRANGE port=16202 4:5\0 + HBASE KEYRANGE 4:5\0 ---- DISTRIBUTEDPLAN PLAN-ROOT SINK | @@ -548,9 +548,9 @@ PLAN-ROOT SINK predicates: bigint_col IS NOT NULL, bool_col = TRUE ---- SCANRANGELOCATIONS NODE 0: - HBASE KEYRANGE port=16201 <unbounded>:3 - HBASE KEYRANGE port=16202 3:7 - HBASE KEYRANGE port=16203 7:<unbounded> + HBASE KEYRANGE <unbounded>:3 + HBASE KEYRANGE 3:7 + HBASE KEYRANGE 7:<unbounded> ---- DISTRIBUTEDPLAN PLAN-ROOT SINK | http://git-wip-us.apache.org/repos/asf/impala/blob/b07bb272/testdata/workloads/functional-planner/queries/PlannerTest/joins.test ---------------------------------------------------------------------- diff --git a/testdata/workloads/functional-planner/queries/PlannerTest/joins.test b/testdata/workloads/functional-planner/queries/PlannerTest/joins.test index 26d4d2f..4c5d7ab 100644 --- a/testdata/workloads/functional-planner/queries/PlannerTest/joins.test +++ b/testdata/workloads/functional-planner/queries/PlannerTest/joins.test @@ -358,7 +358,7 @@ NODE 0: HDFS SPLIT hdfs://localhost:20500/test-warehouse/alltypesagg/year=2010/month=1/day=8/100108.txt 0:76263 HDFS SPLIT hdfs://localhost:20500/test-warehouse/alltypesagg/year=2010/month=1/day=9/100109.txt 0:76263 NODE 1: - HBASE KEYRANGE port=16202 5:5\0 + HBASE KEYRANGE 5:5\0 ---- DISTRIBUTEDPLAN PLAN-ROOT SINK |
