Author: gcrieloue Date: 2010-03-10 19:00:13 +0100 (Wed, 10 Mar 2010) New Revision: 207 Log: Avancement (mineur) sur le plugin hbase. Added: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/Main.java Modified: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java trunk/msm-hbase/src/test/java/org/nuiton/mapstoragemanager/plugins/hbase/HBaseTest.java Modified: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java =================================================================== --- trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java 2010-03-10 14:18:42 UTC (rev 206) +++ trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java 2010-03-10 18:00:13 UTC (rev 207) @@ -80,9 +80,10 @@ // @Override public void createTable(String table) { HTableDescriptor hTableDescriptor = new HTableDescriptor(table); + try { hBaseAdmin.createTable(hTableDescriptor); - + hBaseAdmin.enableTable(table); LOG.trace("table " + table + " created."); } catch (TableExistsException e) { @@ -134,12 +135,14 @@ // @Override public void createColumn(String table, String column) { HColumnDescriptor hColumnDescriptor = new HColumnDescriptor(column); + try { - hBaseAdmin.disableTable(table); - hBaseAdmin.addColumn(table, hColumnDescriptor); + //hBaseAdmin.disableTable(table); + hBaseAdmin.getTableDescriptor(table.getBytes()).addFamily(hColumnDescriptor); + //hBaseAdmin.addColumn(table, hColumnDescriptor); LOG.trace("colum " + column + " created in table " + table + "."); - hBaseAdmin.enableTable(table); + //hBaseAdmin.enableTable(table); } catch (IOException ex) { LOG.error(ex, ex); } Added: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/Main.java =================================================================== --- trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/Main.java (rev 0) +++ trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/Main.java 2010-03-10 18:00:13 UTC (rev 207) @@ -0,0 +1,32 @@ + +package org.nuiton.mapstoragemanager.plugins.hbase; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.hbase.MasterNotRunningException; + + + +public class Main { + + /** + * Logger. + */ + private static final Log LOG = LogFactory.getLog(HBase.class); + + public static void main(String[] args){ + String tableName = "myTable"; + String columnName = "myColumn"; + String contentValue = "val"; + String keyValue="key"; + try { + HBase hb = new HBase(); + hb.createTable(tableName); + hb.createColumn(tableName, columnName); + hb.put(tableName, columnName, keyValue, contentValue); + //LOG.trace(hb.get(tableName, columnName, keyValue)); + } catch (MasterNotRunningException ex) { + LOG.fatal(ex, ex); + } + } +} \ No newline at end of file Modified: trunk/msm-hbase/src/test/java/org/nuiton/mapstoragemanager/plugins/hbase/HBaseTest.java =================================================================== --- trunk/msm-hbase/src/test/java/org/nuiton/mapstoragemanager/plugins/hbase/HBaseTest.java 2010-03-10 14:18:42 UTC (rev 206) +++ trunk/msm-hbase/src/test/java/org/nuiton/mapstoragemanager/plugins/hbase/HBaseTest.java 2010-03-10 18:00:13 UTC (rev 207) @@ -3,9 +3,13 @@ import java.net.MalformedURLException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.MasterNotRunningException; +import org.apache.hadoop.hbase.client.HBaseAdmin; import org.junit.After; import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.Assume; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; @@ -26,6 +30,11 @@ @BeforeClass public static void setUpClass() throws Exception { +// org.apache.hadoop.conf.Configuration conf = +// new org.apache.hadoop.conf.Configuration(); +// HBaseConfiguration config = new HBaseConfiguration(conf); +// HBaseAdmin hBaseAdmin = new HBaseAdmin(config); +// Assume.assumeTrue(hBaseAdmin.isMasterRunning()); } @AfterClass @@ -46,20 +55,19 @@ */ @Test public void testHBase() throws MalformedURLException { - String tableName = "myTable"; - String columnName = "myColumn"; - String contentValue = "val"; - String keyValue="key"; - try { - HBase hb = new HBase(); - hb.createTable(tableName); - hb.createColumn(tableName, columnName); - hb.put(tableName, columnName, keyValue, contentValue); - LOG.trace(hb.get(tableName, columnName, keyValue)); - } catch (MasterNotRunningException ex) { - LOG.fatal(ex, ex); - } +// String tableName = "myTable"; +// String columnName = "myColumn"; +// String contentValue = "val"; +// String keyValue="key"; +// try { +// HBase hb = new HBase(); +// hb.createTable(tableName); +// hb.createColumn(tableName, columnName); +// hb.put(tableName, columnName, keyValue, contentValue); +// LOG.trace(hb.get(tableName, columnName, keyValue)); +// } catch (MasterNotRunningException ex) { +// LOG.fatal(ex, ex); +// } + } - - }