Repository: hbase Updated Branches: refs/heads/0.98 df8921a79 -> ed61064ba
HBASE-11557 Counter.class should always be added as dependencyJar Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ed61064b Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ed61064b Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ed61064b Branch: refs/heads/0.98 Commit: ed61064ba2219398ea51dc4637c12cc7029eeb04 Parents: df8921a Author: Nick Dimiduk <[email protected]> Authored: Mon Jul 21 15:03:08 2014 -0700 Committer: Nick Dimiduk <[email protected]> Committed: Mon Jul 21 16:33:52 2014 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java | 2 -- .../org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java | 6 ++---- 2 files changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/ed61064b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java index ae3b830..63efa90 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java @@ -154,8 +154,6 @@ public class TableMapReduceUtil { initTableMapJob(snapshotName, columns, mapper, outputKeyClass, outputValueClass, job, addDependencyJars, TableSnapshotInputFormat.class); org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil.resetCacheConfig(job); - // We would need even more libraries that hbase-server depends on - org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil.addDependencyJars(job, Counter.class); } /** http://git-wip-us.apache.org/repos/asf/hbase/blob/ed61064b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java ---------------------------------------------------------------------- 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 fc7ccc3..b09a771 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 @@ -314,10 +314,7 @@ public class TableMapReduceUtil { TableSnapshotInputFormat.setInput(job, snapshotName, tmpRestoreDir); initTableMapperJob(snapshotName, scan, mapper, outputKeyClass, outputValueClass, job, addDependencyJars, false, TableSnapshotInputFormat.class); - resetCacheConfig(job.getConfiguration()); - // We would need even more libraries that hbase-server depends on - TableMapReduceUtil.addDependencyJars(job.getConfiguration(), Counter.class); } /** @@ -719,7 +716,8 @@ public class TableMapReduceUtil { org.jboss.netty.channel.ChannelFactory.class, com.google.protobuf.Message.class, com.google.common.collect.Lists.class, - org.cloudera.htrace.Trace.class); + org.cloudera.htrace.Trace.class, + org.cliffc.high_scale_lib.Counter.class); // needed for mapred over snapshots } /**
