Merge branch 'master' of git@github.com:voldemort/voldemort

voldemort · Jun 26, 2009 · 3d1c22f · 3d1c22f
2 parents a49144e + bbd884a
commit 3d1c22f
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 15 deletions.
diff --git a/.classpath b/.classpath
@@ -17,7 +17,6 @@
 	<classpathentry kind="lib" path="lib/commons-httpclient-3.1.jar"/>
 	<classpathentry kind="lib" path="lib/colt-1.2.0.jar"/>
 	<classpathentry kind="lib" path="lib/libthrift-20080411p1.jar"/>
-	<classpathentry kind="lib" path="lib/google-collect-snapshot-20090211.jar"/>
 	<classpathentry kind="lib" path="contrib/mongodb/lib/mongo-xjdm.jar"/>
 	<classpathentry kind="lib" path="lib/je-3.3.82.jar"/>
 	<classpathentry kind="lib" path="contrib/hadoop-store-builder/lib/commons-cli-2.0-SNAPSHOT.jar"/>
@@ -39,5 +38,6 @@
 	<classpathentry kind="lib" path="lib/xercesImpl-2.9.1.jar"/>
 	<classpathentry kind="lib" path="lib/commons-logging-1.1.1.jar"/>
 	<classpathentry kind="lib" path="lib/commons-pool-1.5.1.jar"/>
+	<classpathentry kind="lib" path="lib/google-collect-1.0-rc2.jar"/>
 	<classpathentry kind="output" path="classes"/>
 </classpath>
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 classes
 dist
+*~
diff --git a/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/HadoopStoreJobRunner.java b/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/HadoopStoreJobRunner.java
@@ -33,7 +33,7 @@
 import voldemort.xml.ClusterMapper;
 import voldemort.xml.StoreDefinitionsMapper;
 
-import com.google.common.base.Join;
+import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableCollection;
 
 /**
@@ -97,7 +97,7 @@ public int run(String[] args) throws Exception {
                                                "storename",
                                                "chunksize");
         if(missing.size() > 0) {
-            System.err.println("Missing required arguments: " + Join.join(", ", missing) + "\n");
+            System.err.println("Missing required arguments: " + Joiner.on(", ").join(missing) + "\n");
             printUsage(parser, null);
             System.exit(1);
         }

diff --git a/lib/google-collect-1.0-rc2.jar b/lib/google-collect-1.0-rc2.jar
diff --git a/lib/google-collect-snapshot-20090211.jar b/lib/google-collect-snapshot-20090211.jar
diff --git a/src/java/voldemort/store/readonly/JsonStoreBuilder.java b/src/java/voldemort/store/readonly/JsonStoreBuilder.java
@@ -51,7 +51,7 @@
 import voldemort.xml.ClusterMapper;
 import voldemort.xml.StoreDefinitionsMapper;
 
-import com.google.common.base.Join;
+import com.google.common.base.Joiner;
 import com.google.common.collect.AbstractIterator;
 
 /**
@@ -154,7 +154,7 @@ public static void main(String[] args) throws IOException {
                                                "input",
                                                "output");
         if(missing.size() > 0) {
-            System.err.println("Missing required arguments: " + Join.join(", ", missing));
+            System.err.println("Missing required arguments: " + Joiner.on(", ").join(missing));
             parser.printHelpOn(System.err);
             System.exit(1);
         }

diff --git a/src/java/voldemort/store/readonly/StoreSwapper.java b/src/java/voldemort/store/readonly/StoreSwapper.java
@@ -32,7 +32,7 @@
 import voldemort.utils.Time;
 import voldemort.xml.ClusterMapper;
 
-import com.google.common.base.Join;
+import com.google.common.base.Joiner;
 
 /**
  * A helper class to invoke the FETCH and SWAP operations on a remote store via
@@ -166,7 +166,7 @@ public static void main(String[] args) throws Exception {
 
         Set<String> missing = CmdUtils.missing(options, "cluster", "name", "file");
         if(missing.size() > 0) {
-            System.err.println("Missing required arguments: " + Join.join(", ", missing));
+            System.err.println("Missing required arguments: " + Joiner.on(", ").join(missing));
             parser.printHelpOn(System.err);
             System.exit(1);
         }

diff --git a/src/java/voldemort/store/routed/ReadRepairer.java b/src/java/voldemort/store/routed/ReadRepairer.java
@@ -60,7 +60,7 @@ public List<NodeValue<K, V>> getRepairs(List<NodeValue<K, V>> nodeValues) {
         // A Map of Version=>NodeValues that contains the current best estimate
         // of the set of current versions
         // and the nodes containing them
-        Multimap<Version, NodeValue<K, V>> concurrents = new HashMultimap<Version, NodeValue<K, V>>();
+        Multimap<Version, NodeValue<K, V>> concurrents = HashMultimap.create();
         concurrents.put(nodeValues.get(0).getVersion(), nodeValues.get(0));
 
         // check each value against the current set of most current versions

diff --git a/test/integration/voldemort/performance/MysqlBench.java b/test/integration/voldemort/performance/MysqlBench.java
@@ -35,7 +35,7 @@
 import voldemort.utils.CmdUtils;
 import voldemort.utils.Utils;
 
-import com.google.common.base.Join;
+import com.google.common.base.Joiner;
 
 /**
  * A simple MySQL benchmark
@@ -77,7 +77,7 @@ public static void main(String[] args) throws Exception {
 
         Set<String> missing = CmdUtils.missing(options, "table", "requests", "db");
         if(missing.size() > 0)
-            Utils.croak("Missing required arguments: " + Join.join(", ", missing));
+            Utils.croak("Missing required arguments: " + Joiner.on(", ").join(missing));
 
         String host = CmdUtils.valueOf(options, "host", "localhost");
         String table = (String) options.valueOf("table");
@@ -235,4 +235,4 @@ public void doOperation(int index) throws Exception {
             readTest.printStats();
         }
     }
-}
+}
diff --git a/test/integration/voldemort/performance/ReadOnlyStorePerformanceTest.java b/test/integration/voldemort/performance/ReadOnlyStorePerformanceTest.java
@@ -42,7 +42,7 @@
 import voldemort.versioning.ObsoleteVersionException;
 import voldemort.versioning.Versioned;
 
-import com.google.common.base.Join;
+import com.google.common.base.Joiner;
 
 public class ReadOnlyStorePerformanceTest {
 
@@ -66,7 +66,7 @@ public static void main(String[] args) throws FileNotFoundException, IOException
 
         Set<String> missing = CmdUtils.missing(options, "requests", "store-dir");
         if(missing.size() > 0) {
-            System.err.println("Missing required arguments: " + Join.join(", ", missing));
+            System.err.println("Missing required arguments: " + Joiner.on(", ").join(missing));
             parser.printHelpOn(System.err);
             System.exit(1);
         }

diff --git a/test/unit/voldemort/routing/ConsistentRoutingStrategyTest.java b/test/unit/voldemort/routing/ConsistentRoutingStrategyTest.java
@@ -122,8 +122,8 @@ public void testLoadBalancing(int numNodes,
             assertEquals(tagsPerNode, router.getPartitionsByNode(n).size());
 
         // do some requests and test the load balancing
-        Multiset<Integer> masters = new HashMultiset<Integer>();
+        Multiset<Integer> masters = HashMultiset.create();
-        Multiset<Integer> counts = new HashMultiset<Integer>();
+        Multiset<Integer> counts = HashMultiset.create();
         byte[] key = new byte[16];
         for(int i = 0; i < numRequests; i++) {
             random.nextBytes(key);