You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by en...@apache.org on 2013/03/20 22:26:10 UTC

svn commit: r1459065 - in /hbase/branches/0.94/src: main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java

Author: enis
Date: Wed Mar 20 21:26:10 2013
New Revision: 1459065

URL: http://svn.apache.org/r1459065
Log:
HBASE-8146 IntegrationTestBigLinkedList does not work on distributed setup

Modified:
    hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
    hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java

Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java?rev=1459065&r1=1459064&r2=1459065&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java Wed Mar 20 21:26:10 2013
@@ -514,6 +514,7 @@ public class TableMapReduceUtil {
           org.apache.zookeeper.ZooKeeper.class,
           com.google.protobuf.Message.class,
           com.google.common.collect.ImmutableSet.class,
+          org.apache.hadoop.hbase.util.Bytes.class, //one class from hbase.jar
           job.getMapOutputKeyClass(),
           job.getMapOutputValueClass(),
           job.getInputFormatClass(),

Modified: hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java?rev=1459065&r1=1459064&r2=1459065&view=diff
==============================================================================
--- hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java (original)
+++ hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java Wed Mar 20 21:26:10 2013
@@ -39,6 +39,7 @@ import org.apache.hadoop.conf.Configurat
 import org.apache.hadoop.conf.Configured;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hbase.HBaseConfiguration;
 import org.apache.hadoop.hbase.HColumnDescriptor;
 import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.hbase.IntegrationTestingUtility;
@@ -150,7 +151,7 @@ public class IntegrationTestBigLinkedLis
 
   private static final String TABLE_NAME_KEY = "IntegrationTestBigLinkedList.table";
 
-  private static final String DEFAULT_TABLE_NAME = "ci";
+  private static final String DEFAULT_TABLE_NAME = "IntegrationTestBigLinkedList";
 
   private static byte[] FAMILY_NAME = Bytes.toBytes("meta");
 
@@ -467,6 +468,8 @@ public class IntegrationTestBigLinkedLis
       job.setOutputFormatClass(NullOutputFormat.class);
 
       job.getConfiguration().setBoolean("mapred.map.tasks.speculative.execution", false);
+      TableMapReduceUtil.addDependencyJars(job);
+      TableMapReduceUtil.initCredentials(job);
 
       boolean success = job.waitForCompletion(true);
 
@@ -1004,7 +1007,7 @@ public class IntegrationTestBigLinkedLis
   }
 
   public static void main(String[] args) throws Exception {
-    int ret = ToolRunner.run(new IntegrationTestBigLinkedList(), args);
+    int ret = ToolRunner.run(HBaseConfiguration.create(), new IntegrationTestBigLinkedList(), args);
     System.exit(ret);
   }
 }