hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r797236 - /hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/HStoreFileToStoreFile.java
Date Thu, 23 Jul 2009 21:43:02 GMT
Author: stack
Date: Thu Jul 23 21:43:02 2009
New Revision: 797236

URL: http://svn.apache.org/viewvc?rev=797236&view=rev
Log:
HBASE-1215 migration; fixes for jgray -- make HStoreFileToStoreFile implement Tool so can
pass params

Modified:
    hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/HStoreFileToStoreFile.java

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/HStoreFileToStoreFile.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/HStoreFileToStoreFile.java?rev=797236&r1=797235&r2=797236&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/HStoreFileToStoreFile.java
(original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/HStoreFileToStoreFile.java
Thu Jul 23 21:43:02 2009
@@ -133,9 +133,10 @@
           // look in the 'mapfile' subdir.
           Path mfsdir = new Path(family, "mapfiles");
           FileStatus [] familyStatus = fs.listStatus(mfsdir);
-          if (familyStatus.length > 1) {
-            LOG.warn(family.toString() + " has " + familyStatus.length +
-            " files.  Continuing...");
+          if (familyStatus == null || familyStatus.length > 1) {
+            LOG.warn(family.toString() + " has " +
+              ((familyStatus == null) ? "null": familyStatus.length) +
+              " files.  Continuing...");
             continue;
           }
           if (familyStatus.length == 1) {



Mime
View raw message