svn commit: r681590 - in /hadoop/hbase/trunk: CHANGES.txt src/java/org/apache/hadoop/hbase/mapred/RowCounter.java

[st...@apache.org]

Author: stack
Date: Thu Jul 31 19:39:22 2008
New Revision: 681590

URL: http://svn.apache.org/viewvc?rev=681590&view=rev
Log:
HBASE-791 RowCount doesn't work

Modified:
    hadoop/hbase/trunk/CHANGES.txt
    hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/RowCounter.java

Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=681590&r1=681589&r2=681590&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Thu Jul 31 19:39:22 2008
@@ -220,6 +220,7 @@
    HBASE-424   Should be able to enable/disable .META. table
    HBASE-771   Names legal in 0.1 are not in 0.2; breaks migration
    HBASE-788   Div by zero in Master.jsp (Clint Morgan via Jim Kellerman)
+   HBASE-791   RowCount doesn't work (Jean-Daniel Cryans via Stack)
    
   IMPROVEMENTS
    HBASE-559   MR example job to count table rows

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/RowCounter.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/RowCounter.java?rev=681590&r1=681589&r2=681590&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/RowCounter.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/RowCounter.java Thu Jul 31 19:39:22 2008
@@ -25,9 +25,11 @@
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hbase.HBaseConfiguration;
+import org.apache.hadoop.hbase.io.HbaseMapWritable;
 import org.apache.hadoop.hbase.io.Cell;
 import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
 import org.apache.hadoop.hbase.io.RowResult;
+import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.mapred.JobClient;
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapred.OutputCollector;
@@ -47,7 +49,8 @@
   static final String NAME = "rowcounter";
   
   private Configuration conf;
-  private final RowResult EMPTY_RESULT_VALUE = new RowResult();
+  private final RowResult EMPTY_RESULT_VALUE = 
+        new RowResult(Bytes.toBytes("dummy"),new HbaseMapWritable<byte [], Cell>());
   private static enum Counters {ROWS}
   
   @Override
@@ -119,8 +122,7 @@
 
   public static void main(String[] args) throws Exception {
     HBaseConfiguration c = new HBaseConfiguration();
-    c.set("hbase.master", args[0]);
     int errCode = ToolRunner.run(c, new RowCounter(), args);
     System.exit(errCode);
   }
-}
\ No newline at end of file
+}