incubator-accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bil...@apache.org
Subject svn commit: r1186426 - in /incubator/accumulo: branches/1.3/src/server/src/main/java/org/apache/accumulo/server/master/ branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/ branches/1.3/test/system/auto/simple/ branches/1.3...
Date Wed, 19 Oct 2011 19:34:26 GMT
Author: billie
Date: Wed Oct 19 19:34:25 2011
New Revision: 1186426

URL: http://svn.apache.org/viewvc?rev=1186426&view=rev
Log:
ACCUMULO-51 changed all to libthrift

Modified:
    incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java
    incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java
    incubator/accumulo/branches/1.3/test/system/auto/simple/mapreduce.py
    incubator/accumulo/branches/1.3/test/system/bench/lib/Benchmark.py
    incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java
    incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java
    incubator/accumulo/trunk/test/system/bench/lib/Benchmark.py

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java?rev=1186426&r1=1186425&r2=1186426&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java
(original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java
Wed Oct 19 19:34:25 2011
@@ -142,7 +142,7 @@ public class CoordinateRecoveryTask impl
             List<String> jars = new ArrayList<String>();
             jars.addAll(jarsLike("accumulo-core"));
             jars.addAll(jarsLike("zookeeper"));
-            jars.addAll(jarsLike("thrift"));
+            jars.addAll(jarsLike("libthrift"));
             sortJob = LogSort.startSort(true, new String[] { "-libjars", StringUtil.join(jars,
","), "-r",
                     reducers.toString(), "-q", queue, "-p", pool, logFile.unsortedFileName(),
result });
         }

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java?rev=1186426&r1=1186425&r2=1186426&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java
(original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java
Wed Oct 19 19:34:25 2011
@@ -141,7 +141,7 @@ public class State {
 		for (int i=0; i < files.length; i++) {
 			String f = files[i];
 			if (f.matches("^accumulo-core-.+jar$") || f.matches("^accumulo-server-.+jar$") || 
-					f.matches("^cloudtrace-.+jar$") || f.matches("^thrift-.+jar$")) {
+					f.matches("^cloudtrace-.+jar$") || f.matches("^libthrift-.+jar$")) {
 				if (retval == null) {
 					retval = String.format("%s/%s", libdir.getAbsolutePath(), f);
 				} else {

Modified: incubator/accumulo/branches/1.3/test/system/auto/simple/mapreduce.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/test/system/auto/simple/mapreduce.py?rev=1186426&r1=1186425&r2=1186426&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/test/system/auto/simple/mapreduce.py (original)
+++ incubator/accumulo/branches/1.3/test/system/auto/simple/mapreduce.py Wed Oct 19 19:34:25
2011
@@ -65,7 +65,7 @@ class MapReduceTest(TestUtilsMixin,unitt
     
     def runTest(self):
         #These Environment variables are need to run this test it will fail if they are not
in the environment
-        thriftjar = globac(os.path.join('lib','thrift*.jar'))
+        thriftjar = globac(os.path.join('lib','libthrift*.jar'))
         acexamples = globac(os.path.join('lib','accumulo-examples*[!javadoc].jar'))
         accore = globac(os.path.join('lib','accumulo-core*[!javadoc].jar'))
         acstart = globac(os.path.join('lib','accumulo-start*[!javadoc].jar'))

Modified: incubator/accumulo/branches/1.3/test/system/bench/lib/Benchmark.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/test/system/bench/lib/Benchmark.py?rev=1186426&r1=1186425&r2=1186426&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/test/system/bench/lib/Benchmark.py (original)
+++ incubator/accumulo/branches/1.3/test/system/bench/lib/Benchmark.py Wed Oct 19 19:34:25
2011
@@ -105,7 +105,7 @@ class Benchmark(unittest.TestCase):
     def getjars(self, delim=','):
         accumulo_core_jar = self.findjar(accumulo('lib', 'accumulo-core*.jar'))
         accumulo_start_jar = self.findjar(accumulo('lib', 'accumulo-start*.jar'))
-        accumulo_thrift_jar = self.findjar(accumulo('lib', 'thrift*.jar'))
+        accumulo_thrift_jar = self.findjar(accumulo('lib', 'libthrift*.jar'))
         accumulo_zookeeper_jar = self.findjar(os.path.join(os.getenv('ZOOKEEPER_HOME'), 'zookeeper*.jar'))
         return delim.join([accumulo_core_jar, accumulo_thrift_jar, accumulo_zookeeper_jar,
accumulo_start_jar])
        

Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java?rev=1186426&r1=1186425&r2=1186426&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java
(original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java
Wed Oct 19 19:34:25 2011
@@ -150,7 +150,7 @@ public class CoordinateRecoveryTask impl
             List<String> jars = new ArrayList<String>();
             jars.addAll(jarsLike("accumulo-core"));
             jars.addAll(jarsLike("zookeeper"));
-            jars.addAll(jarsLike("thrift"));
+            jars.addAll(jarsLike("libthrift"));
             sortJob = LogSort.startSort(true, new String[] { "-libjars", StringUtil.join(jars,
","), "-r",
                     reducers.toString(), "-q", queue, "-p", pool, logFile.unsortedFileName(),
result });
         }

Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java?rev=1186426&r1=1186425&r2=1186426&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java
(original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java
Wed Oct 19 19:34:25 2011
@@ -141,7 +141,7 @@ public class State {
 		for (int i=0; i < files.length; i++) {
 			String f = files[i];
 			if (f.matches("^accumulo-core-.+jar$") || f.matches("^accumulo-server-.+jar$") || 
-					f.matches("^cloudtrace-.+jar$") || f.matches("^thrift-.+jar$")) {
+					f.matches("^cloudtrace-.+jar$") || f.matches("^libthrift-.+jar$")) {
 				if (retval == null) {
 					retval = String.format("%s/%s", libdir.getAbsolutePath(), f);
 				} else {

Modified: incubator/accumulo/trunk/test/system/bench/lib/Benchmark.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/bench/lib/Benchmark.py?rev=1186426&r1=1186425&r2=1186426&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/bench/lib/Benchmark.py (original)
+++ incubator/accumulo/trunk/test/system/bench/lib/Benchmark.py Wed Oct 19 19:34:25 2011
@@ -105,7 +105,7 @@ class Benchmark(unittest.TestCase):
     def getjars(self, delim=','):
         accumulo_core_jar = self.findjar(accumulo('lib', 'accumulo-core*.jar'))
         accumulo_start_jar = self.findjar(accumulo('lib', 'accumulo-start*.jar'))
-        accumulo_thrift_jar = self.findjar(accumulo('lib', 'thrift*.jar'))
+        accumulo_thrift_jar = self.findjar(accumulo('lib', 'libthrift*.jar'))
         accumulo_zookeeper_jar = self.findjar(os.path.join(os.getenv('ZOOKEEPER_HOME'), 'zookeeper*.jar'))
         return delim.join([accumulo_core_jar, accumulo_thrift_jar, accumulo_zookeeper_jar,
accumulo_start_jar])
        



Mime
View raw message