From 76c8332ea9b251b509615bc3ae8b6ac8e2ee32b6 Mon Sep 17 00:00:00 2001 From: Nick Dimiduk Date: Mon, 25 Feb 2013 16:02:56 -0800 Subject: [PATCH] HBASE-7934 TableMapReduceUtil include module dependencies Update TableMapReduceUtil to include all necessary modules as dependency jars for MapReduce jobs. Requires change to pom such that hbase-prefix-tree becomes a compile-time dependency. --- hbase-server/pom.xml | 2 -- .../org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java | 8 ++++++++ pom.xml | 3 --- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index 60623c0..ba32fd7 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -275,8 +275,6 @@ org.apache.hbase hbase-prefix-tree - - runtime org.apache.hbase diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java index 5d62b8f..a81341f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java @@ -503,8 +503,16 @@ public class TableMapReduceUtil { public static void addDependencyJars(Job job) throws IOException { try { addDependencyJars(job.getConfiguration(), + // explicitly pull a class from each module + org.apache.hadoop.hbase.HConstants.class, // hbase-common + org.apache.hadoop.hbase.protobuf.generated.ClientProtos.class, // hbase-protocol + org.apache.hadoop.hbase.client.Put.class, // hbase-client + org.apache.hbase.codec.prefixtree.PrefixTreeCodec.class, // hbase-prefix-tree + org.apache.hadoop.hbase.CompatibilityFactory.class, // hbase-hadoop-compat + // pull necessary dependencies org.apache.zookeeper.ZooKeeper.class, com.google.protobuf.Message.class, + // pull job classed job.getMapOutputKeyClass(), job.getMapOutputValueClass(), job.getInputFormatClass(), diff --git a/pom.xml b/pom.xml index 9a66361..9ec62b6 100644 --- a/pom.xml +++ b/pom.xml @@ -1000,9 +1000,6 @@ org.apache.hbase hbase-prefix-tree ${project.version} - - runtime hbase-examples -- 1.8.1