Created
November 24, 2009 17:55
-
-
Save afeinberg/242064 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/contrib/ec2-testing/test/voldemort/utils/Ec2SmokeTest.java b/contrib/ec2-testing/test/voldemort/utils/Ec2SmokeTest.java | |
index 789c5c0..8900da4 100644 | |
--- a/contrib/ec2-testing/test/voldemort/utils/Ec2SmokeTest.java | |
+++ b/contrib/ec2-testing/test/voldemort/utils/Ec2SmokeTest.java | |
@@ -29,7 +29,8 @@ import static voldemort.utils.RemoteTestUtils.stopClusterQuiet; | |
import static voldemort.utils.RemoteTestUtils.toHostNames; | |
import java.io.File; | |
-import java.io.FileReader; | |
+import java.io.InputStream; | |
+import java.io.FileInputStream; | |
import java.io.Reader; | |
import java.util.List; | |
import java.util.Map; | |
@@ -267,10 +268,10 @@ public class Ec2SmokeTest { | |
+ StringUtils.join(requireds, ", ")); | |
Properties properties = new Properties(); | |
- Reader r = null; | |
+ InputStream r = null; | |
try { | |
- r = new FileReader(propertiesFileName); | |
+ r = new FileInputStream(propertiesFileName); | |
properties.load(r); | |
} finally { | |
IOUtils.closeQuietly(r); | |
diff --git a/test/integration/voldemort/performance/RemoteDataGenerator.java b/test/integration/voldemort/performance/RemoteDataGenerator.java | |
index 4d95648..7ec7de2 100644 | |
--- a/test/integration/voldemort/performance/RemoteDataGenerator.java | |
+++ b/test/integration/voldemort/performance/RemoteDataGenerator.java | |
@@ -7,18 +7,18 @@ import voldemort.client.SocketStoreClientFactory; | |
import voldemort.client.StoreClient; | |
import voldemort.client.StoreClientFactory; | |
import voldemort.utils.CmdUtils; | |
-import voldemort.utils.PseudoRandom; | |
import java.io.IOException; | |
import java.io.PrintStream; | |
import java.util.List; | |
+import java.util.Random; | |
/** | |
* @author afeinber | |
* Generate data pseudo-random data with desired parameters on a remote cluster | |
*/ | |
public class RemoteDataGenerator { | |
- private final PseudoRandom prng = new PseudoRandom(); | |
+ private final Random prng = new Random(); | |
private final String url; | |
private final String storeName; | |
private final int workers; | |
@@ -93,7 +93,7 @@ public class RemoteDataGenerator { | |
// Java Strings are two bytes per character | |
while(output.length() < size*2) { | |
- output.append(prng.random()); | |
+ output.append(prng.nextInt()); | |
} | |
return output.toString(); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment