incubator-accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject svn commit: r1294683 - in /incubator/accumulo/trunk: ./ bin/accumulo bin/config.sh src/server/ src/server/src/main/java/org/apache/accumulo/server/master/state/MergeStats.java
Date Tue, 28 Feb 2012 15:06:26 GMT
Author: vines
Date: Tue Feb 28 15:06:24 2012
New Revision: 1294683

URL: http://svn.apache.org/viewvc?rev=1294683&view=rev
Log:
Merging ACCUMULO-19 revert, and something Eric did with MergeStats, I guess


Modified:
    incubator/accumulo/trunk/   (props changed)
    incubator/accumulo/trunk/bin/accumulo
    incubator/accumulo/trunk/bin/config.sh
    incubator/accumulo/trunk/src/server/   (props changed)
    incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/master/state/MergeStats.java

Propchange: incubator/accumulo/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 28 15:06:24 2012
@@ -1,3 +1,3 @@
 /incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611,1228195,1230180,1230736,1231043,1236873,1245632
 /incubator/accumulo/branches/1.3.5rc:1209938
-/incubator/accumulo/branches/1.4:1201902-1294364
+/incubator/accumulo/branches/1.4:1201902-1294682

Modified: incubator/accumulo/trunk/bin/accumulo
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/bin/accumulo?rev=1294683&r1=1294682&r2=1294683&view=diff
==============================================================================
--- incubator/accumulo/trunk/bin/accumulo (original)
+++ incubator/accumulo/trunk/bin/accumulo Tue Feb 28 15:06:24 2012
@@ -16,8 +16,7 @@
 # limitations under the License.
 
 
-bin=`readlink "$0"`
-bin=`dirname "$bin"`
+bin=`dirname "$0"`
 bin=`cd "$bin"; pwd`
 
 . "$bin"/config.sh

Modified: incubator/accumulo/trunk/bin/config.sh
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/bin/config.sh?rev=1294683&r1=1294682&r2=1294683&view=diff
==============================================================================
--- incubator/accumulo/trunk/bin/config.sh (original)
+++ incubator/accumulo/trunk/bin/config.sh Tue Feb 28 15:06:24 2012
@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-this=`readlink "$0"`
+this="$0"
 while [ -h "$this" ]; do
     ls=`ls -ld "$this"`
     link=`expr "$ls" : '.*-> \(.*\)$'`
@@ -58,6 +58,7 @@ then
       exit 1
    fi
    HADOOP_HOME=`dirname $HADOOP_HOME`
+   HADOOP_HOME=`dirname $HADOOP_HOME`
 fi
 export HADOOP_HOME
 

Propchange: incubator/accumulo/trunk/src/server/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 28 15:06:24 2012
@@ -1,3 +1,3 @@
-/incubator/accumulo/branches/1.3.5rc/src/server:1209938
 /incubator/accumulo/branches/1.3/src/server:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611
-/incubator/accumulo/branches/1.4/src/server:1201902-1294364
+/incubator/accumulo/branches/1.3.5rc/src/server:1209938
+/incubator/accumulo/branches/1.4/src/server:1201902-1294682

Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/master/state/MergeStats.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/master/state/MergeStats.java?rev=1294683&r1=1294682&r2=1294683&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/master/state/MergeStats.java
(original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/master/state/MergeStats.java
Tue Feb 28 15:06:24 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