svn commit: r667357 - in /hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase: HMerge.java TableNotDisabledException.java master/ColumnOperation.java master/TableDelete.java

[st...@apache.org]

Author: stack
Date: Thu Jun 12 22:26:22 2008
New Revision: 667357

URL: http://svn.apache.org/viewvc?rev=667357&view=rev
Log:
Part of HBASE-487 Replace hql... Make Strings of byte arrays in TableNotDisabledException messages

Modified:
    hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HMerge.java
    hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/TableNotDisabledException.java
    hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ColumnOperation.java
    hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/TableDelete.java

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HMerge.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HMerge.java?rev=667357&r1=667356&r2=667357&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HMerge.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HMerge.java Thu Jun 12 22:26:22 2008
@@ -234,8 +234,8 @@
     protected void checkOfflined(final HRegionInfo hri)
     throws TableNotDisabledException {
       if (!hri.isOffline()) {
-        throw new TableNotDisabledException("region " +
-          hri.getRegionName() + " is not disabled");
+        throw new TableNotDisabledException("Region " +
+          hri.getRegionNameAsString() + " is not disabled");
       }
     }
     

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/TableNotDisabledException.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/TableNotDisabledException.java?rev=667357&r1=667356&r2=667357&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/TableNotDisabledException.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/TableNotDisabledException.java Thu Jun 12 22:26:22 2008
@@ -21,6 +21,8 @@
 
 import java.io.IOException;
 
+import org.apache.hadoop.hbase.util.Bytes;
+
 /**
  * Thrown if a table should be offline but is not
  */
@@ -38,4 +40,11 @@
   public TableNotDisabledException(String s) {
     super(s);
   }
-}
+
+  /**
+   * @param tableName Name of table that is not disabled
+   */
+  public TableNotDisabledException(byte[] tableName) {
+    this(Bytes.toString(tableName));
+  }
+}
\ No newline at end of file

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ColumnOperation.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ColumnOperation.java?rev=667357&r1=667356&r2=667357&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ColumnOperation.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ColumnOperation.java Thu Jun 12 22:26:22 2008
@@ -24,9 +24,9 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.hbase.HRegionInfo;
-import org.apache.hadoop.hbase.ipc.HRegionInterface;
-import org.apache.hadoop.hbase.io.BatchUpdate;
 import org.apache.hadoop.hbase.TableNotDisabledException;
+import org.apache.hadoop.hbase.io.BatchUpdate;
+import org.apache.hadoop.hbase.ipc.HRegionInterface;
 import org.apache.hadoop.hbase.util.Writables;
 
 abstract class ColumnOperation extends TableOperation {
@@ -43,7 +43,7 @@
     @SuppressWarnings("unused") long startCode, final HRegionInfo info) 
   throws IOException {
     if (isEnabled(info)) {
-      throw new TableNotDisabledException(tableName.toString());
+      throw new TableNotDisabledException(tableName);
     }
   }
 

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/TableDelete.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/TableDelete.java?rev=667357&r1=667356&r2=667357&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/TableDelete.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/TableDelete.java Thu Jun 12 22:26:22 2008
@@ -29,6 +29,7 @@
 import org.apache.hadoop.hbase.TableNotDisabledException;
 
 import org.apache.hadoop.hbase.regionserver.HRegion;
+import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.ipc.HRegionInterface;
 
 /** 
@@ -48,7 +49,7 @@
       final HRegionInfo info) throws IOException {
     
     if (isEnabled(info)) {
-      throw new TableNotDisabledException(tableName.toString());
+      throw new TableNotDisabledException(tableName);
     }
   }