Return-Path: Delivered-To: apmail-hadoop-hbase-commits-archive@locus.apache.org Received: (qmail 15398 invoked from network); 1 Aug 2008 02:39:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 1 Aug 2008 02:39:43 -0000 Received: (qmail 97568 invoked by uid 500); 1 Aug 2008 02:39:43 -0000 Delivered-To: apmail-hadoop-hbase-commits-archive@hadoop.apache.org Received: (qmail 97552 invoked by uid 500); 1 Aug 2008 02:39:42 -0000 Mailing-List: contact hbase-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hbase-dev@hadoop.apache.org Delivered-To: mailing list hbase-commits@hadoop.apache.org Received: (qmail 97543 invoked by uid 99); 1 Aug 2008 02:39:42 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 31 Jul 2008 19:39:42 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Aug 2008 02:38:56 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E33E12388987; Thu, 31 Jul 2008 19:39:22 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r681590 - in /hadoop/hbase/trunk: CHANGES.txt src/java/org/apache/hadoop/hbase/mapred/RowCounter.java Date: Fri, 01 Aug 2008 02:39:22 -0000 To: hbase-commits@hadoop.apache.org From: stack@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080801023922.E33E12388987@eris.apache.org> X-Virus-Checked: Checked by ClamAV on 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()); 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 +}