You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2017/08/29 20:10:04 UTC
hbase git commit: HBASE-18698 MapreduceDependencyClasspathTool does
not include hbase-server as a dependency
Repository: hbase
Updated Branches:
refs/heads/master bc5478f94 -> 8c9087e6c
HBASE-18698 MapreduceDependencyClasspathTool does not include hbase-server as a dependency
Move Driver to be the main-class in hbase-mapreduce jar rather than
in the hbase-server jar.
Reference the hbase-server and shaded protobuf so they get bundled
when you do 'hbase mapredcp'.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8c9087e6
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8c9087e6
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8c9087e6
Branch: refs/heads/master
Commit: 8c9087e6c55882b3408a2f2ca7d4627f95456a84
Parents: bc5478f
Author: Michael Stack <st...@duboce.net>
Authored: Mon Aug 28 22:14:49 2017 -0700
Committer: Michael Stack <st...@apache.org>
Committed: Tue Aug 29 13:09:57 2017 -0700
----------------------------------------------------------------------
hbase-mapreduce/pom.xml | 14 ++++++++++++++
.../hadoop/hbase/mapred/TableMapReduceUtil.java | 2 --
.../org/apache/hadoop/hbase/mapreduce/Driver.java | 6 +++---
.../hadoop/hbase/mapreduce/TableMapReduceUtil.java | 2 ++
hbase-server/pom.xml | 5 -----
5 files changed, 19 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/8c9087e6/hbase-mapreduce/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-mapreduce/pom.xml b/hbase-mapreduce/pom.xml
index f75c9f9..8ab6bfe 100644
--- a/hbase-mapreduce/pom.xml
+++ b/hbase-mapreduce/pom.xml
@@ -52,6 +52,20 @@
<skipAssembly>true</skipAssembly>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <!--Include the Driver class as the 'main'.
+ Executing the jar will then show a list of the basic MR jobs.
+ -->
+ <mainClass>org/apache/hadoop/hbase/mapreduce/Driver</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
<!-- Testing plugins -->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/hbase/blob/8c9087e6/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java
----------------------------------------------------------------------
diff --git a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java
index 63ec418..f08c7ff 100644
--- a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java
+++ b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java
@@ -362,8 +362,6 @@ public class TableMapReduceUtil {
org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil.addHBaseDependencyJars(job);
org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil.addDependencyJarsForClasses(
job,
- // when making changes here, consider also mapreduce.TableMapReduceUtil
- // pull job classes
job.getMapOutputKeyClass(),
job.getMapOutputValueClass(),
job.getOutputKeyClass(),
http://git-wip-us.apache.org/repos/asf/hbase/blob/8c9087e6/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/Driver.java
----------------------------------------------------------------------
diff --git a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/Driver.java b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/Driver.java
index 9737b55..1c69e77 100644
--- a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/Driver.java
+++ b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/Driver.java
@@ -51,9 +51,9 @@ public class Driver {
pgd.addClass(CopyTable.NAME, CopyTable.class,
"Export a table from local cluster to peer cluster.");
pgd.addClass(VerifyReplication.NAME, VerifyReplication.class, "Compare" +
- " the data from tables in two different clusters. WARNING: It" +
- " doesn't work for incrementColumnValues'd cells since the" +
- " timestamp is changed after being appended to the log.");
+ " data from tables in two different clusters. It" +
+ " doesn't work for incrementColumnValues'd cells since" +
+ " timestamp is changed after appending to WAL.");
pgd.addClass(WALPlayer.NAME, WALPlayer.class, "Replay WAL files.");
pgd.addClass(ExportSnapshot.NAME, ExportSnapshot.class, "Export" +
" the specific snapshot to a given FileSystem.");
http://git-wip-us.apache.org/repos/asf/hbase/blob/8c9087e6/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
----------------------------------------------------------------------
diff --git a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
index ff458ff..5517c9c 100644
--- a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
+++ b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
@@ -784,6 +784,7 @@ public class TableMapReduceUtil {
org.apache.hadoop.hbase.protobuf.generated.ClientProtos.class, // hbase-protocol
org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.class, // hbase-protocol-shaded
org.apache.hadoop.hbase.client.Put.class, // hbase-client
+ org.apache.hadoop.hbase.ipc.RpcServer.class, // hbase-server
org.apache.hadoop.hbase.CompatibilityFactory.class, // hbase-hadoop-compat
org.apache.hadoop.hbase.mapreduce.JobUtil.class, // hbase-hadoop2-compat
org.apache.hadoop.hbase.mapreduce.TableMapper.class, // hbase-server
@@ -794,6 +795,7 @@ public class TableMapReduceUtil {
org.apache.zookeeper.ZooKeeper.class,
org.apache.hadoop.hbase.shaded.io.netty.channel.Channel.class,
com.google.protobuf.Message.class,
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.UnsafeByteOperations.class,
org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists.class,
org.apache.htrace.Trace.class,
com.codahale.metrics.MetricRegistry.class);
http://git-wip-us.apache.org/repos/asf/hbase/blob/8c9087e6/hbase-server/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index e1ef882..b6a18c0 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -117,11 +117,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
- <archive>
- <manifest>
- <mainClass>org/apache/hadoop/hbase/mapreduce/Driver</mainClass>
- </manifest>
- </archive>
<!-- Exclude these 2 packages, because their dependency _binary_ files
include the sources, and Maven 2.2 appears to add them to the sources to compile,
weird -->