Author: dlanglais Date: 2010-03-09 22:40:35 +0100 (Tue, 09 Mar 2010) New Revision: 203 Log: petites modifs mineures : - ajout r?\195?\169activation table apr?\195?\168s ajout/suppression colonne ; - d?\195?\169sactivation table avant suppression colonne.. 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-09 16:07:14 UTC (rev 202) +++ trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java 2010-03-09 21:40:35 UTC (rev 203) @@ -6,8 +6,6 @@ import java.util.Map; import java.util.Properties; import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.MasterNotRunningException; @@ -141,6 +139,7 @@ hBaseAdmin.disableTable(table); hBaseAdmin.addColumn(table, hColumnDescriptor); LOG.trace("colum " + column + " created in table " + table + "."); + hBaseAdmin.enableTable(table); } catch (IOException ex) { LOG.error(ex, ex); } @@ -152,8 +151,10 @@ // @Override public void deleteColumn(String table, String column) { try { + hBaseAdmin.disableTable(table); hBaseAdmin.deleteColumn(table, column); LOG.trace("colum " + column + " deleted from table " + table + "."); + hBaseAdmin.enableTable(table); } catch (IOException ex) { LOG.error(ex, ex); } 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-09 16:07:14 UTC (rev 202) +++ trunk/msm-hbase/src/test/java/org/nuiton/mapstoragemanager/plugins/hbase/HBaseTest.java 2010-03-09 21:40:35 UTC (rev 203) @@ -1,8 +1,6 @@ package org.nuiton.mapstoragemanager.plugins.hbase; import java.net.MalformedURLException; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.MasterNotRunningException; @@ -11,7 +9,6 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.nuiton.mapstoragemanager.plugins.hbase.HBase; /** * An HBase test class. @@ -19,7 +16,10 @@ */ public class HBaseTest { - private static final Log log = LogFactory.getLog(HBaseTest.class); + /** + * Logger. + */ + private static final Log LOG = LogFactory.getLog(HBaseTest.class); public HBaseTest() { } @@ -55,9 +55,9 @@ hb.createTable(tableName); hb.createColumn(tableName, columnName); hb.put(tableName, columnName, keyValue, contentValue); - log.trace(hb.get(tableName, columnName, keyValue)); + LOG.trace(hb.get(tableName, columnName, keyValue)); } catch (MasterNotRunningException ex) { - Logger.getLogger(HBase.class.getName()).log(Level.SEVERE, null, ex); + LOG.fatal(ex, ex); } }