accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1294669 - /incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/state/MergeStats.java
Date Tue, 28 Feb 2012 14:24:30 GMT
Author: ecn
Date: Tue Feb 28 14:24:30 2012
New Revision: 1294669

URL: http://svn.apache.org/viewvc?rev=1294669&view=rev
Log:
ACCUMULO-424: make the verify check for chopped+clean the same as the main merge state transition

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=1294669&r1=1294668&r2=1294669&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
Tue Feb 28 14:24:30 2012
@@ -184,7 +184,7 @@ public class MergeStats {
         break;
       }
 
-      if (!tls.walogs.isEmpty() && verify.getMergeInfo().overlaps(tls.extent)) {
+      if (!tls.walogs.isEmpty() && verify.getMergeInfo().needsToBeChopped(tls.extent))
{
         return false;
       }
 



Mime
View raw message