accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ktur...@apache.org
Subject svn commit: r1236938 - /incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/state/MergeStats.java
Date Sat, 28 Jan 2012 00:23:24 GMT
Author: kturner
Date: Sat Jan 28 00:23:23 2012
New Revision: 1236938

URL: http://svn.apache.org/viewvc?rev=1236938&view=rev
Log:
ACCUMULO-315 fixed some bugs in merge consistency check

Modified:
    incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/state/MergeStats.java

Modified: incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/state/MergeStats.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/state/MergeStats.java?rev=1236938&r1=1236937&r2=1236938&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/state/MergeStats.java
(original)
+++ incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/state/MergeStats.java
Sat Jan 28 00:23:23 2012
@@ -159,11 +159,14 @@ public class MergeStats {
     Text pr = null;
     for (Entry<Key,Value> entry : scanner) {
       TabletLocationState tls = MetaDataTableScanner.createTabletLocationState(entry.getKey(),
entry.getValue());
+      if (!tls.extent.getTableId().equals(tableId)) {
+        break;
+      }
       verify.update(tls.extent, tls.getState(master.onlineTabletServers()), tls.chopped);
-      if (pr != null && !tls.extent.getPrevEndRow().equals(pr))
+      if (pr != null && (tls.extent.getPrevEndRow() == null || !tls.extent.getPrevEndRow().equals(pr)))
         return false;
       pr = tls.extent.getEndRow();
-      if (tls.extent.getPrevEndRow().compareTo(extent.getEndRow()) > 0) {
+      if (tls.extent.getPrevEndRow() != null && extent.getEndRow() != null &&
tls.extent.getPrevEndRow().compareTo(extent.getEndRow()) > 0) {
         break;
       }
     }



Mime
View raw message