svn commit: r967301 - in /hbase/trunk: CHANGES.txt src/main/java/org/apache/hadoop/hbase/master/BaseScanner.java

[st...@apache.org]

Author: stack
Date: Fri Jul 23 23:12:53 2010
New Revision: 967301

URL: http://svn.apache.org/viewvc?rev=967301&view=rev
Log:
HBASE-2873 Minor clean up in basescanner; fix a log and make deletes of region processing run in order

Modified:
    hbase/trunk/CHANGES.txt
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/BaseScanner.java

Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=967301&r1=967300&r2=967301&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Fri Jul 23 23:12:53 2010
@@ -796,6 +796,8 @@ Release 0.21.0 - Unreleased
                repeats info, too many numbers after the point, etc.
    HBASE-2869  Regularize how we log sequenceids -- sometimes its myseqid,
                other times its sequence id, etc.
+   HBASE-2873  Minor clean up in basescanner; fix a log and make deletes of
+               region processing run in order
 
   NEW FEATURES
    HBASE-1961  HBase EC2 scripts

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/BaseScanner.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/BaseScanner.java?rev=967301&r1=967300&r2=967301&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/BaseScanner.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/BaseScanner.java Fri Jul 23 23:12:53 2010
@@ -50,6 +50,8 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.NavigableMap;
+import java.util.TreeMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 
@@ -168,7 +170,8 @@ abstract class BaseScanner extends Chore
     // Array to hold list of split parents found.  Scan adds to list.  After
     // scan we go check if parents can be removed and that their daughters
     // are in place.
-    Map<HRegionInfo, Result> splitParents = new HashMap<HRegionInfo, Result>();
+    NavigableMap<HRegionInfo, Result> splitParents =
+      new TreeMap<HRegionInfo, Result>();
     List<byte []> emptyRows = new ArrayList<byte []>();
     int rows = 0;
     try {
@@ -307,8 +310,7 @@ abstract class BaseScanner extends Chore
         parent, rowContent, HConstants.SPLITB_QUALIFIER);
     if (!hasReferencesA && !hasReferencesB) {
       LOG.info("Deleting region " + parent.getRegionNameAsString() +
-        " (encoded=" + parent.getEncodedName() +
-        ") because daughter splits no longer hold references");
+        " because daughter splits no longer hold references");
       HRegion.deleteRegion(this.master.getFileSystem(),
         this.master.getRootDir(), parent);
       HRegion.removeRegionFromMETA(srvr, metaRegionName,