This is an automated email from the ASF dual-hosted git repository.
ayushsaxena pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push:
new 40551ff4669 HIVE-27651: Upgrade hbase version (#4649). (zhangbutao,
reviewed by Ayush Saxena)
40551ff4669 is described below
commit 40551ff4669325defa08ff2adc0b497296cf46fa
Author: Butao Zhang <[email protected]>
AuthorDate: Mon Oct 30 12:22:34 2023 +0800
HIVE-27651: Upgrade hbase version (#4649). (zhangbutao, reviewed by Ayush
Saxena)
---
hbase-handler/pom.xml | 7 +++++++
.../test/org/apache/hadoop/hive/hbase/TestHBaseStorageHandler.java | 2 +-
hbase-handler/src/test/results/negative/cascade_dbdrop.q.out | 3 +--
itests/hcatalog-unit/pom.xml | 5 +++++
itests/pom.xml | 6 ++++++
itests/util/pom.xml | 5 +++++
pom.xml | 2 +-
7 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/hbase-handler/pom.xml b/hbase-handler/pom.xml
index 3a908a3bd03..e0a4c8de19a 100644
--- a/hbase-handler/pom.xml
+++ b/hbase-handler/pom.xml
@@ -184,6 +184,13 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-testing-util</artifactId>
+ <version>${hbase.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-mapreduce</artifactId>
diff --git
a/hbase-handler/src/test/org/apache/hadoop/hive/hbase/TestHBaseStorageHandler.java
b/hbase-handler/src/test/org/apache/hadoop/hive/hbase/TestHBaseStorageHandler.java
index 25ddd3219f9..535d1386041 100644
---
a/hbase-handler/src/test/org/apache/hadoop/hive/hbase/TestHBaseStorageHandler.java
+++
b/hbase-handler/src/test/org/apache/hadoop/hive/hbase/TestHBaseStorageHandler.java
@@ -61,7 +61,7 @@ public class TestHBaseStorageHandler {
// written out. At the time this test was written, this was the current
// behavior, so I left this test as/is. Need to research if a null
// table can be provided here.
- Assert.assertEquals("hbase://localhost:2181/null", uri.toString());
+ Assert.assertEquals("hbase://127.0.0.1:2181/null", uri.toString());
}
@Test
diff --git a/hbase-handler/src/test/results/negative/cascade_dbdrop.q.out
b/hbase-handler/src/test/results/negative/cascade_dbdrop.q.out
index 9f3d2c01a89..589efc6ab3c 100644
--- a/hbase-handler/src/test/results/negative/cascade_dbdrop.q.out
+++ b/hbase-handler/src/test/results/negative/cascade_dbdrop.q.out
@@ -18,8 +18,7 @@ TBLPROPERTIES ("hbase.table.name" = "hbase_table_0",
"external.table.purge" = "t
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:hbasedb
POSTHOOK: Output: hbaseDB@hbase_table_0
-Found 3 items
-drwxr-xr-x - ### USER ### ### GROUP ### 0 ### HDFS DATE ###
hdfs://### HDFS PATH ###
+Found 2 items
drwxr-xr-x - ### USER ### ### GROUP ### 0 ### HDFS DATE ###
hdfs://### HDFS PATH ###
drwxr-xr-x - ### USER ### ### GROUP ### 0 ### HDFS DATE ###
hdfs://### HDFS PATH ###
PREHOOK: query: DROP DATABASE IF EXISTS hbaseDB CASCADE
diff --git a/itests/hcatalog-unit/pom.xml b/itests/hcatalog-unit/pom.xml
index 4a049697b71..3f47452b7e3 100644
--- a/itests/hcatalog-unit/pom.xml
+++ b/itests/hcatalog-unit/pom.xml
@@ -71,6 +71,11 @@
<artifactId>hive-hbase-handler</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-testing-util</artifactId>
+ <classifier>tests</classifier>
+ </dependency>
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-cli</artifactId>
diff --git a/itests/pom.xml b/itests/pom.xml
index f23bd28b97a..6f2cdad408d 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -447,6 +447,12 @@
<version>${hbase.version}</version>
<classifier>tests</classifier>
</dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-testing-util</artifactId>
+ <version>${hbase.version}</version>
+ <classifier>tests</classifier>
+ </dependency>
<dependency>
<groupId>org.apache.tez</groupId>
<artifactId>tez-tests</artifactId>
diff --git a/itests/util/pom.xml b/itests/util/pom.xml
index 7f0e25a31fc..97ebb9c83aa 100644
--- a/itests/util/pom.xml
+++ b/itests/util/pom.xml
@@ -219,6 +219,11 @@
<artifactId>hbase-server</artifactId>
<classifier>tests</classifier>
</dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-testing-util</artifactId>
+ <classifier>tests</classifier>
+ </dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-mapreduce</artifactId>
diff --git a/pom.xml b/pom.xml
index b9b8339351d..bf8a5d3e5fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,7 +143,7 @@
<hadoop.version>3.3.6</hadoop.version>
<hadoop.bin.path>${basedir}/${hive.path.to.root}/testutils/hadoop</hadoop.bin.path>
<hamcrest.version>1.3</hamcrest.version>
- <hbase.version>2.0.0-alpha4</hbase.version>
+ <hbase.version>2.5.6-hadoop3</hbase.version>
<hppc.version>0.7.2</hppc.version>
<!-- required for logging test to avoid including hbase which pulls
disruptor transitively -->
<disruptor.version>3.3.7</disruptor.version>
