Merge branch 'cassandra-1.2' into trunk
Conflicts:
tools/stress/src/org/apache/cassandra/stress/StressAction.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/be0523a2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/be0523a2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/be0523a2
Branch: refs/heads/trunk
Commit: be0523a240f65517e22c66f70609fca64e7c83dd
Parents: 22be25b 2f72f8b
Author: Jason Brown <[email protected]>
Authored: Thu May 30 14:15:24 2013 -0700
Committer: Jason Brown <[email protected]>
Committed: Thu May 30 14:15:24 2013 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../src/org/apache/cassandra/stress/Session.java | 12 ++++++++++--
.../org/apache/cassandra/stress/StressAction.java | 10 ++++++++--
3 files changed, 19 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/be0523a2/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/be0523a2/tools/stress/src/org/apache/cassandra/stress/Session.java
----------------------------------------------------------------------
diff --cc tools/stress/src/org/apache/cassandra/stress/Session.java
index 7fca986,d527278..f19d61e
--- a/tools/stress/src/org/apache/cassandra/stress/Session.java
+++ b/tools/stress/src/org/apache/cassandra/stress/Session.java
@@@ -141,8 -139,8 +140,9 @@@ public class Session implements Seriali
private boolean enable_cql = false;
private boolean use_prepared = false;
private boolean trace = false;
+ private boolean captureStatistics = true;
public boolean use_native_protocol = false;
+ private double maxOpsPerSecond = Double.MAX_VALUE;
private final String outFileName;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/be0523a2/tools/stress/src/org/apache/cassandra/stress/StressAction.java
----------------------------------------------------------------------
diff --cc tools/stress/src/org/apache/cassandra/stress/StressAction.java
index 13ac611,9adf92f..ea84647
--- a/tools/stress/src/org/apache/cassandra/stress/StressAction.java
+++ b/tools/stress/src/org/apache/cassandra/stress/StressAction.java
@@@ -20,9 -20,8 +20,10 @@@ package org.apache.cassandra.stress
import java.io.PrintStream;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.TimeUnit;
+import com.google.common.util.concurrent.Uninterruptibles;
+ import com.google.common.util.concurrent.RateLimiter;
import com.yammer.metrics.stats.Snapshot;
import org.apache.cassandra.stress.operations.*;
import org.apache.cassandra.stress.util.CassandraClient;
