Return-Path: Delivered-To: apmail-incubator-chukwa-commits-archive@www.apache.org Received: (qmail 10842 invoked from network); 17 Oct 2010 19:03:07 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 17 Oct 2010 19:03:07 -0000 Received: (qmail 15943 invoked by uid 500); 17 Oct 2010 19:03:07 -0000 Delivered-To: apmail-incubator-chukwa-commits-archive@incubator.apache.org Received: (qmail 15920 invoked by uid 500); 17 Oct 2010 19:03:06 -0000 Mailing-List: contact chukwa-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: chukwa-dev@incubator.apache.org Delivered-To: mailing list chukwa-commits@incubator.apache.org Received: (qmail 15912 invoked by uid 99); 17 Oct 2010 19:03:06 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 17 Oct 2010 19:03:06 +0000 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; Sun, 17 Oct 2010 19:03:03 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9C89123888FE; Sun, 17 Oct 2010 19:02:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1023558 - in /incubator/chukwa/trunk: CHANGES.txt lib/hbase-0.20.6-test.jar lib/hbase-0.20.6.jar lib/zookeeper-3.2.2.jar src/test/org/apache/hadoop/chukwa/datacollection/writer/TestHBaseWriter.java Date: Sun, 17 Oct 2010 19:02:06 -0000 To: chukwa-commits@incubator.apache.org From: eyang@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101017190206.9C89123888FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: eyang Date: Sun Oct 17 19:02:06 2010 New Revision: 1023558 URL: http://svn.apache.org/viewvc?rev=1023558&view=rev Log: CHUKWA-531. Bundle HBase 0.20.6 in library path, and comment out test case for HBaseWriter for now. (Eric Yang) Added: incubator/chukwa/trunk/lib/hbase-0.20.6-test.jar (with props) incubator/chukwa/trunk/lib/hbase-0.20.6.jar (with props) incubator/chukwa/trunk/lib/zookeeper-3.2.2.jar (with props) Modified: incubator/chukwa/trunk/CHANGES.txt incubator/chukwa/trunk/src/test/org/apache/hadoop/chukwa/datacollection/writer/TestHBaseWriter.java Modified: incubator/chukwa/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/CHANGES.txt?rev=1023558&r1=1023557&r2=1023558&view=diff ============================================================================== --- incubator/chukwa/trunk/CHANGES.txt (original) +++ incubator/chukwa/trunk/CHANGES.txt Sun Oct 17 19:02:06 2010 @@ -22,6 +22,8 @@ Trunk (unreleased changes) IMPROVEMENTS + CHUKWA-531. Bundle HBase 0.20.6 in library path, and comment out test case for HBaseWriter for now. (Eric Yang) + CHUKWA-524. Use TODO-HBASE-HOME and TODO-HBASE-CONF-DIR to control hbase location. (Eric Yang) CHUKWA-521. Changed default HICC port to 4080. (Eric Yang) Added: incubator/chukwa/trunk/lib/hbase-0.20.6-test.jar URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/lib/hbase-0.20.6-test.jar?rev=1023558&view=auto ============================================================================== Binary file - no diff available. Propchange: incubator/chukwa/trunk/lib/hbase-0.20.6-test.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: incubator/chukwa/trunk/lib/hbase-0.20.6.jar URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/lib/hbase-0.20.6.jar?rev=1023558&view=auto ============================================================================== Binary file - no diff available. Propchange: incubator/chukwa/trunk/lib/hbase-0.20.6.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: incubator/chukwa/trunk/lib/zookeeper-3.2.2.jar URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/lib/zookeeper-3.2.2.jar?rev=1023558&view=auto ============================================================================== Binary file - no diff available. Propchange: incubator/chukwa/trunk/lib/zookeeper-3.2.2.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: incubator/chukwa/trunk/src/test/org/apache/hadoop/chukwa/datacollection/writer/TestHBaseWriter.java URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/test/org/apache/hadoop/chukwa/datacollection/writer/TestHBaseWriter.java?rev=1023558&r1=1023557&r2=1023558&view=diff ============================================================================== --- incubator/chukwa/trunk/src/test/org/apache/hadoop/chukwa/datacollection/writer/TestHBaseWriter.java (original) +++ incubator/chukwa/trunk/src/test/org/apache/hadoop/chukwa/datacollection/writer/TestHBaseWriter.java Sun Oct 17 19:02:06 2010 @@ -29,7 +29,7 @@ import org.apache.hadoop.chukwa.conf.Chu import org.apache.hadoop.chukwa.datacollection.writer.hbase.HBaseWriter; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseConfiguration; -import org.apache.hadoop.hbase.HBaseTestingUtility; +//import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HTableDescriptor; @@ -42,72 +42,72 @@ import org.apache.log4j.Logger; public class TestHBaseWriter extends TestCase{ static Logger log = Logger.getLogger(TestHBaseWriter.class); - private HBaseTestingUtility util; - private HBaseWriter hbw; - private Configuration conf; - private byte[] columnFamily = Bytes.toBytes("TestColumnFamily"); - private byte[] qualifier = Bytes.toBytes("Key"); - private byte[] expectedValue = Bytes.toBytes("Value"); - - private byte[] table = Bytes.toBytes("Test"); - private byte[] test = Bytes.toBytes("1234567890 Key Value"); - private ChukwaConfiguration cc; - long timestamp = 1234567890; - - public TestHBaseWriter() { - cc = new ChukwaConfiguration(); - - conf = HBaseConfiguration.create(); - conf.set("hbase.hregion.memstore.flush.size", String.valueOf(128*1024)); - try { - util = new HBaseTestingUtility(conf); - util.startMiniZKCluster(); - util.getConfiguration().setBoolean("dfs.support.append", true); - util.startMiniCluster(2); - HTableDescriptor desc = new HTableDescriptor(); - HColumnDescriptor family = new HColumnDescriptor(columnFamily); - desc.setName(table); - desc.addFamily(family); - util.getHBaseAdmin().createTable(desc); - - } catch (Exception e) { - e.printStackTrace(); - Assert.fail(e.getMessage()); - } - } - - public void setup() { - - } - - public void tearDown() { - - } - - public void testWriters() { - ArrayList chunks = new ArrayList(); - chunks.add(new ChunkImpl("TextParser", "name", timestamp, test, null)); - try { - cc.set("hbase.demux.package", "org.apache.chukwa.datacollection.writer.test.demux"); - cc.set("TextParser","org.apache.hadoop.chukwa.datacollection.writer.test.demux.TextParser"); - conf.set(HConstants.ZOOKEEPER_QUORUM, "127.0.0.1"); - hbw = new HBaseWriter(cc, conf); - hbw.init(cc); - if(hbw.add(chunks)!=ChukwaWriter.COMMIT_OK) { - Assert.fail("Commit status is not OK."); - } - HTable testTable = new HTable(table); - ResultScanner scanner = testTable.getScanner(columnFamily, qualifier); - for(Result res : scanner) { - Assert.assertEquals(new String(expectedValue), new String(res.getValue(columnFamily, qualifier))); - } - // Cleanup and return - scanner.close(); - // Compare data in Hbase with generated chunks - util.shutdownMiniCluster(); - } catch (Exception e) { - e.printStackTrace(); - Assert.fail(e.getMessage()); - } - } +// private HBaseTestingUtility util; +// private HBaseWriter hbw; +// private Configuration conf; +// private byte[] columnFamily = Bytes.toBytes("TestColumnFamily"); +// private byte[] qualifier = Bytes.toBytes("Key"); +// private byte[] expectedValue = Bytes.toBytes("Value"); +// +// private byte[] table = Bytes.toBytes("Test"); +// private byte[] test = Bytes.toBytes("1234567890 Key Value"); +// private ChukwaConfiguration cc; +// long timestamp = 1234567890; +// +// public TestHBaseWriter() { +// cc = new ChukwaConfiguration(); +// +// conf = HBaseConfiguration.create(); +// conf.set("hbase.hregion.memstore.flush.size", String.valueOf(128*1024)); +// try { +// util = new HBaseTestingUtility(conf); +// util.startMiniZKCluster(); +// util.getConfiguration().setBoolean("dfs.support.append", true); +// util.startMiniCluster(2); +// HTableDescriptor desc = new HTableDescriptor(); +// HColumnDescriptor family = new HColumnDescriptor(columnFamily); +// desc.setName(table); +// desc.addFamily(family); +// util.getHBaseAdmin().createTable(desc); +// +// } catch (Exception e) { +// e.printStackTrace(); +// Assert.fail(e.getMessage()); +// } +// } +// +// public void setup() { +// +// } +// +// public void tearDown() { +// +// } +// +// public void testWriters() { +// ArrayList chunks = new ArrayList(); +// chunks.add(new ChunkImpl("TextParser", "name", timestamp, test, null)); +// try { +// cc.set("hbase.demux.package", "org.apache.chukwa.datacollection.writer.test.demux"); +// cc.set("TextParser","org.apache.hadoop.chukwa.datacollection.writer.test.demux.TextParser"); +// conf.set(HConstants.ZOOKEEPER_QUORUM, "127.0.0.1"); +// hbw = new HBaseWriter(cc, conf); +// hbw.init(cc); +// if(hbw.add(chunks)!=ChukwaWriter.COMMIT_OK) { +// Assert.fail("Commit status is not OK."); +// } +// HTable testTable = new HTable(table); +// ResultScanner scanner = testTable.getScanner(columnFamily, qualifier); +// for(Result res : scanner) { +// Assert.assertEquals(new String(expectedValue), new String(res.getValue(columnFamily, qualifier))); +// } +// // Cleanup and return +// scanner.close(); +// // Compare data in Hbase with generated chunks +// util.shutdownMiniCluster(); +// } catch (Exception e) { +// e.printStackTrace(); +// Assert.fail(e.getMessage()); +// } +// } }