svn commit: r659335 - in /hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase: master/BaseScanner.java regionserver/HStoreFile.java

[st...@apache.org]

Author: stack
Date: Thu May 22 17:30:25 2008
New Revision: 659335

URL: http://svn.apache.org/viewvc?rev=659335&view=rev
Log:
Fix a few log messages where we outputting byte arrays instead of String

Modified:
    hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/BaseScanner.java
    hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HStoreFile.java

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/BaseScanner.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/BaseScanner.java?rev=659335&r1=659334&r2=659335&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/BaseScanner.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/BaseScanner.java Thu May 22 17:30:25 2008
@@ -240,7 +240,8 @@
       return false;
     }
     if (!info.isOffline()) {
-      LOG.warn("Region is split but not offline: " + info.getRegionName());
+      LOG.warn("Region is split but not offline: " +
+        info.getRegionNameAsString());
     }
     return true;
   }
@@ -268,7 +269,7 @@
         parent.getRegionName(), rowContent, COL_SPLITB);
     
     if (!hasReferencesA && !hasReferencesB) {
-      LOG.info("Deleting region " + parent.getRegionName() +
+      LOG.info("Deleting region " + parent.getRegionNameAsString() +
         " because daughter splits no longer hold references");
       HRegion.deleteRegion(master.fs, master.rootdir, parent);
       
@@ -334,8 +335,8 @@
     }
     
     if (LOG.isDebugEnabled()) {
-      LOG.debug(split.getRegionName().toString()
-          +" no longer has references to " + parent.toString());
+      LOG.debug(split.getRegionNameAsString() +
+        " no longer has references to " + parent.toString());
     }
     
     BatchUpdate b = new BatchUpdate(parent);
@@ -365,7 +366,7 @@
         // Skip if region is on kill list
         if(LOG.isDebugEnabled()) {
           LOG.debug("not assigning region (on kill list): " +
-            info.getRegionName());
+            info.getRegionNameAsString());
         }
         return;
       }
@@ -385,7 +386,7 @@
       // The current assignment is invalid
       if (LOG.isDebugEnabled()) {
         LOG.debug("Current assignment of " +
-          Bytes.toString(info.getRegionName()) +
+          info.getRegionNameAsString() +
           " is not valid: serverInfo: " + storedInfo + ", passed startCode: " +
           startCode + ", storedInfo.startCode: " +
           ((storedInfo != null)? storedInfo.getStartCode(): -1) +

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HStoreFile.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HStoreFile.java?rev=659335&r1=659334&r2=659335&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HStoreFile.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HStoreFile.java Thu May 22 17:30:25 2008
@@ -470,7 +470,7 @@
   /** {@inheritDoc} */
   @Override
   public String toString() {
-    return encodedRegionName + "/" + colFamily + "/" + fileId +
+    return encodedRegionName + "/" + Bytes.toString(colFamily) + "/" + fileId +
       (isReference()? "-" + reference.toString(): "");
   }