You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2014/08/01 15:33:21 UTC
[1/2] git commit: Make default stress batches logged
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 f5a1c374c -> 169b1cf19
Make default stress batches logged
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1921b985
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1921b985
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1921b985
Branch: refs/heads/cassandra-2.1
Commit: 1921b98599aa5190c74737c4e8a1092c63f842dc
Parents: d667556
Author: Jake Luciani <ja...@apache.org>
Authored: Fri Aug 1 09:32:31 2014 -0400
Committer: Jake Luciani <ja...@apache.org>
Committed: Fri Aug 1 09:32:31 2014 -0400
----------------------------------------------------------------------
tools/stress/src/org/apache/cassandra/stress/StressProfile.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1921b985/tools/stress/src/org/apache/cassandra/stress/StressProfile.java
----------------------------------------------------------------------
diff --git a/tools/stress/src/org/apache/cassandra/stress/StressProfile.java b/tools/stress/src/org/apache/cassandra/stress/StressProfile.java
index f24ec8c..4e09775 100644
--- a/tools/stress/src/org/apache/cassandra/stress/StressProfile.java
+++ b/tools/stress/src/org/apache/cassandra/stress/StressProfile.java
@@ -331,7 +331,7 @@ public class StressProfile implements Serializable
partitions = OptionDistribution.get(!insert.containsKey("partitions") ? "fixed(1)" : insert.remove("partitions"));
pervisit = OptionRatioDistribution.get(!insert.containsKey("pervisit") ? "fixed(1)/1" : insert.remove("pervisit"));
perbatch = OptionRatioDistribution.get(!insert.containsKey("perbatch") ? "fixed(1)/1" : insert.remove("perbatch"));
- batchType = !insert.containsKey("batchtype") ? BatchStatement.Type.UNLOGGED : BatchStatement.Type.valueOf(insert.remove("batchtype"));
+ batchType = !insert.containsKey("batchtype") ? BatchStatement.Type.LOGGED : BatchStatement.Type.valueOf(insert.remove("batchtype"));
if (!insert.isEmpty())
throw new IllegalArgumentException("Unrecognised insert option(s): " + insert);
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by ja...@apache.org.
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/169b1cf1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/169b1cf1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/169b1cf1
Branch: refs/heads/cassandra-2.1
Commit: 169b1cf19e584f106512a545f206eccee09cc7be
Parents: f5a1c37 1921b98
Author: Jake Luciani <ja...@apache.org>
Authored: Fri Aug 1 09:33:04 2014 -0400
Committer: Jake Luciani <ja...@apache.org>
Committed: Fri Aug 1 09:33:04 2014 -0400
----------------------------------------------------------------------
tools/stress/src/org/apache/cassandra/stress/StressProfile.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------