Updated Branches:
refs/heads/trunk 2575275a0 -> 1aa798f0c
Merge branch 'cassandra-1.2' into trunk
Conflicts:
tools/stress/src/org/apache/cassandra/stress/Session.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1aa798f0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1aa798f0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1aa798f0
Branch: refs/heads/trunk
Commit: 1aa798f0c186c87c094797aacf35577ab11169c4
Parents: 2575275 06699d4
Author: Sylvain Lebresne <sylv...@datastax.com>
Authored: Wed Mar 6 09:09:49 2013 +0100
Committer: Sylvain Lebresne <sylv...@datastax.com>
Committed: Wed Mar 6 09:09:49 2013 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cassandra | 2 +-
.../apache/cassandra/transport/SimpleClient.java | 5 +
.../src/org/apache/cassandra/stress/Session.java | 26 ++++
.../org/apache/cassandra/stress/StressAction.java | 62 +++++++---
.../cassandra/stress/operations/CQLOperation.java | 96 +++++++++++++++
.../stress/operations/CqlCounterAdder.java | 39 +++----
.../stress/operations/CqlCounterGetter.java | 43 +++----
.../stress/operations/CqlIndexedRangeSlicer.java | 75 +++++++----
.../cassandra/stress/operations/CqlInserter.java | 39 +++----
.../stress/operations/CqlMultiGetter.java | 6 +
.../stress/operations/CqlRangeSlicer.java | 49 ++++----
.../cassandra/stress/operations/CqlReader.java | 42 +++----
.../apache/cassandra/stress/util/Operation.java | 29 ++++-
14 files changed, 344 insertions(+), 170 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1aa798f0/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1aa798f0/bin/cassandra
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1aa798f0/tools/stress/src/org/apache/cassandra/stress/Session.java
----------------------------------------------------------------------
diff --cc tools/stress/src/org/apache/cassandra/stress/Session.java
index 58181a0,d16ee78..38bb7ff
--- a/tools/stress/src/org/apache/cassandra/stress/Session.java
+++ b/tools/stress/src/org/apache/cassandra/stress/Session.java
@@@ -139,7 -140,7 +141,8 @@@ 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 final String outFileName;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1aa798f0/tools/stress/src/org/apache/cassandra/stress/StressAction.java
----------------------------------------------------------------------
