Bump to hbase 2.5.8-hadoop3

locationtech · Mar 27, 2024 · 89c0681 · 89c0681
1 parent afa7ec1
commit 89c0681
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 24 deletions.
diff --git a/build/cqs.tsv b/build/cqs.tsv
@@ -152,17 +152,19 @@ org.apache.hbase.thirdparty:hbase-shaded-miscellaneous	4.1.5	compile
 org.apache.hbase.thirdparty:hbase-shaded-netty	4.1.5	compile
 org.apache.hbase.thirdparty:hbase-shaded-protobuf	4.1.5	compile
 org.apache.hbase.thirdparty:hbase-unsafe	4.1.5	compile
-org.apache.hbase:hbase-asyncfs	2.5.7-hadoop3	compile
-org.apache.hbase:hbase-client	2.5.7-hadoop3	compile
-org.apache.hbase:hbase-common	2.5.7-hadoop3	compile
-org.apache.hbase:hbase-logging	2.5.7-hadoop3	compile
-org.apache.hbase:hbase-mapreduce	2.5.7-hadoop3	compile
-org.apache.hbase:hbase-metrics	2.5.7-hadoop3	compile
-org.apache.hbase:hbase-metrics-api	2.5.7-hadoop3	compile
-org.apache.hbase:hbase-protocol	2.5.7-hadoop3	compile
-org.apache.hbase:hbase-protocol-shaded	2.5.7-hadoop3	compile
-org.apache.hbase:hbase-replication	2.5.7-hadoop3	compile
-org.apache.hbase:hbase-zookeeper	2.5.7-hadoop3	compile
+org.apache.hbase:hbase-asyncfs	2.5.8-hadoop3	compile
+org.apache.hbase:hbase-client	2.5.8-hadoop3	compile
+org.apache.hbase:hbase-common	2.5.8-hadoop3	compile
+org.apache.hbase:hbase-hadoop-compat	2.5.8-hadoop3	compile
+org.apache.hbase:hbase-hadoop2-compat	2.5.8-hadoop3	compile
+org.apache.hbase:hbase-logging	2.5.8-hadoop3	compile
+org.apache.hbase:hbase-mapreduce	2.5.8-hadoop3	compile
+org.apache.hbase:hbase-metrics	2.5.8-hadoop3	compile
+org.apache.hbase:hbase-metrics-api	2.5.8-hadoop3	compile
+org.apache.hbase:hbase-protocol	2.5.8-hadoop3	compile
+org.apache.hbase:hbase-protocol-shaded	2.5.8-hadoop3	compile
+org.apache.hbase:hbase-replication	2.5.8-hadoop3	compile
+org.apache.hbase:hbase-zookeeper	2.5.8-hadoop3	compile
 org.apache.htrace:htrace-core	3.2.0-incubating	compile
 org.apache.httpcomponents:httpclient	4.5.14	compile
 org.apache.httpcomponents:httpcore	4.4.16	compile
@@ -279,7 +281,7 @@ org.apache.hadoop:hadoop-mapreduce-client-core	3.3.6	provided
 org.apache.hadoop:hadoop-mapreduce-client-jobclient	3.3.6	provided
 org.apache.hadoop:hadoop-yarn-api	3.3.6	provided
 org.apache.hadoop:hadoop-yarn-common	3.3.6	provided
-org.apache.hbase:hbase-server	2.5.7-hadoop3	provided
+org.apache.hbase:hbase-server	2.5.8-hadoop3	provided
 org.apache.htrace:htrace-core4	4.1.0-incubating	provided
 org.apache.kafka:kafka-clients	3.7.0	provided
 org.apache.kafka:kafka-streams-scala_2.12	3.7.0	provided
@@ -302,7 +304,7 @@ org.apache.arrow:arrow-vector	tests:15.0.2	test
 org.apache.cassandra:cassandra-all	3.11.14	test
 org.apache.cassandra:cassandra-thrift	3.11.14	test
 org.apache.curator:curator-test	5.6.0	test
-org.apache.hbase:hbase-testing-util	2.5.7-hadoop3	test
+org.apache.hbase:hbase-testing-util	2.5.8-hadoop3	test
 org.apache.kafka:kafka-clients	test:3.7.0	test
 org.apache.kafka:kafka-streams-test-utils	3.7.0	test
 org.apache.logging.log4j:log4j-api	2.22.1	test

diff --git a/docs/user/upgrade.rst b/docs/user/upgrade.rst
@@ -165,7 +165,7 @@ The following dependencies have been upgraded:
 * gson ``2.10`` -> ``2.10.1``
 * guava ``30.1-jre`` -> ``32.0.0-jre``
 * hadoop ``2.10.2`` -> ``3.3.6``
-* hbase ``2.5.2`` -> ``2.5.7``
+* hbase ``2.5.2`` -> ``2.5.8-hadoop3``
 * httpclient ``4.5.13`` -> ``4.5.14``
 * httpcore ``4.4.15`` -> ``4.4.16``
 * io.netty ``4.1.85.Final`` -> ``4.1.106.Final``

diff --git a/...ase-jobs/src/main/scala/org/locationtech/geomesa/hbase/jobs/GeoMesaHBaseInputFormat.scala b/...ase-jobs/src/main/scala/org/locationtech/geomesa/hbase/jobs/GeoMesaHBaseInputFormat.scala
@@ -13,8 +13,7 @@ import org.apache.hadoop.conf.{Configurable, Configuration}
 import org.apache.hadoop.hbase.HBaseConfiguration
 import org.apache.hadoop.hbase.client.{Result, Scan}
 import org.apache.hadoop.hbase.io.ImmutableBytesWritable
-import org.apache.hadoop.hbase.mapreduce.{MultiTableInputFormat, TableInputFormat}
-import org.apache.hadoop.hbase.protobuf.ProtobufUtil
+import org.apache.hadoop.hbase.mapreduce.{MultiTableInputFormat, TableInputFormat, TableMapReduceUtil}
 import org.apache.hadoop.io.Text
 import org.apache.hadoop.mapreduce._
 import org.geotools.api.data.Query
@@ -27,8 +26,6 @@ import org.locationtech.geomesa.jobs.GeoMesaConfigurator
 import org.locationtech.geomesa.utils.collection.CloseableIterator
 import org.locationtech.geomesa.utils.io.WithStore
 
-import java.util.Base64
-
 /**
   * Input format that allows processing of simple features from GeoMesa based on a CQL query
   */
@@ -116,7 +113,7 @@ object GeoMesaHBaseInputFormat {
     val scans = plan.scans.head.scans.map { scan =>
       // need to set the table name in each scan
       scan.setAttribute(Scan.SCAN_ATTRIBUTES_TABLE_NAME, plan.scans.head.table.getName)
-      Base64.getEncoder.encodeToString(ProtobufUtil.toScan(scan).toByteArray)
+      TableMapReduceUtil.convertScanToString(scan)
     }
     conf.setStrings(MultiTableInputFormat.SCANS, scans: _*)
 

diff --git a/geomesa-hbase/geomesa-hbase-spark-runtime-hbase2/pom.xml b/geomesa-hbase/geomesa-hbase-spark-runtime-hbase2/pom.xml
@@ -39,25 +39,31 @@
         <dependency>
             <groupId>org.apache.hbase</groupId>
             <artifactId>hbase-client</artifactId>
-            <version>${hbase.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.hbase</groupId>
             <artifactId>hbase-common</artifactId>
-            <version>${hbase.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.hbase</groupId>
             <artifactId>hbase-protocol</artifactId>
-            <version>${hbase.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hbase</groupId>
+            <artifactId>hbase-hadoop-compat</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hbase</groupId>
+            <artifactId>hbase-hadoop2-compat</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.hbase</groupId>
             <artifactId>hbase-mapreduce</artifactId>
-            <version>${hbase.version}</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>
@@ -66,6 +72,16 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.apache.zookeeper</groupId>
+            <artifactId>zookeeper</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.zookeeper</groupId>
+            <artifactId>zookeeper-jute</artifactId>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -132,7 +132,7 @@
         <thrift-cassandra.version>0.12.0</thrift-cassandra.version>
         <hadoop.version>3.3.6</hadoop.version>
         <spark.version>3.5.0</spark.version>
-        <hbase.version>2.5.7-hadoop3</hbase.version>
+        <hbase.version>2.5.8-hadoop3</hbase.version>
         <hbase.htrace.version>4.1.0-incubating</hbase.htrace.version>
         <protobuf.version>2.5.0</protobuf.version> <!-- see also confluent.protobuf.version-->
         <cassandra.version>3.11.5</cassandra.version>