You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2015/02/24 03:18:02 UTC

hbase git commit: HBASE-13045 Addendum for Hadoop 1.1 compat.

Repository: hbase
Updated Branches:
  refs/heads/0.98 b4b08dd26 -> 51d7529a1


HBASE-13045 Addendum for Hadoop 1.1 compat.

Use Text instead of NullWritable to meet TableMap type requirements.


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/51d7529a
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/51d7529a
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/51d7529a

Branch: refs/heads/0.98
Commit: 51d7529a16c9b5dcd3bba7e30075da35d091869c
Parents: b4b08dd
Author: Sean Busbey <bu...@apache.org>
Authored: Sun Feb 22 00:47:33 2015 -0600
Committer: Sean Busbey <bu...@apache.org>
Committed: Mon Feb 23 19:56:20 2015 -0600

----------------------------------------------------------------------
 .../org/apache/hadoop/hbase/mapred/TestTableInputFormat.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/51d7529a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestTableInputFormat.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestTableInputFormat.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestTableInputFormat.java
index ddefce6..a79e499 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestTableInputFormat.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestTableInputFormat.java
@@ -49,7 +49,7 @@ import org.apache.hadoop.hbase.mapreduce.MapreduceTestingShim;
 import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
 import org.apache.hadoop.hbase.testclassification.LargeTests;
 import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.hadoop.io.NullWritable;
+import org.apache.hadoop.io.Text;
 import org.apache.hadoop.mapred.JobClient;
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapred.JobConfigurable;
@@ -342,7 +342,7 @@ public class TestTableInputFormat {
         .findCounter(TestTableInputFormat.class.getName() + ":value", "value bbb").getCounter());
   }
 
-  public static class ExampleVerifier implements TableMap<NullWritable, NullWritable> {
+  public static class ExampleVerifier implements TableMap<Text, Text> {
 
     @Override
     public void configure(JobConf conf) {
@@ -350,7 +350,7 @@ public class TestTableInputFormat {
 
     @Override
     public void map(ImmutableBytesWritable key, Result value,
-        OutputCollector<NullWritable,NullWritable> output,
+        OutputCollector<Text,Text> output,
         Reporter reporter) throws IOException {
       for (Cell cell : value.listCells()) {
         reporter.getCounter(TestTableInputFormat.class.getName() + ":row",