svn commit: r706681 - in /hadoop/hbase/trunk: CHANGES.txt src/java/org/apache/hadoop/hbase/regionserver/HStore.java

[st...@apache.org]

Author: stack
Date: Tue Oct 21 09:39:10 2008
New Revision: 706681

URL: http://svn.apache.org/viewvc?rev=706681&view=rev
Log:
HBASE-945 Be consistent in use of qualified/unqualified mapfile paths

Modified:
    hadoop/hbase/trunk/CHANGES.txt
    hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HStore.java

Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=706681&r1=706680&r2=706681&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Tue Oct 21 09:39:10 2008
@@ -36,6 +36,7 @@
                With J-D's one line patch, test cases now appear to work and
                PerformanceEvaluation works as before.
    HBASE-939   NPE in HStoreKey
+   HBASE-945   Be consistent in use of qualified/unqualified mapfile paths
 
   IMPROVEMENTS
    HBASE-901   Add a limit to key length, check key and value length on client side

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HStore.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HStore.java?rev=706681&r1=706680&r2=706681&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HStore.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HStore.java Tue Oct 21 09:39:10 2008
@@ -459,16 +459,17 @@
       results.put(Long.valueOf(storeSeqId), curfile);
       // Keep list of sympathetic data mapfiles for cleaning info dir in next
       // section.  Make sure path is fully qualified for compare.
-      mapfiles.add(mapfile);
+      mapfiles.add(this.fs.makeQualified(mapfile));
     }
     
     // List paths by experience returns fully qualified names -- at least when
     // running on a mini hdfs cluster.
-    FileStatus datfiles[] = fs.listStatus(mapdir);
+    FileStatus [] datfiles = fs.listStatus(mapdir);
     for (int i = 0; i < datfiles.length; i++) {
       Path p = datfiles[i].getPath();
       // If does not have sympathetic info file, delete.
-      if (!mapfiles.contains(fs.makeQualified(p))) {
+      Path qualifiedP = fs.makeQualified(p);
+      if (!mapfiles.contains(qualifiedP)) {
         fs.delete(p, true);
       }
     }