Repository: cassandra Updated Branches: refs/heads/trunk bc7941c9d -> f843b42e8
Fix cassandra-stress so it respects the CL passed in user mode patch by tjake; reviewed by benedict for CASSANDRA-8948 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/46460148 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/46460148 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/46460148 Branch: refs/heads/trunk Commit: 4646014851b42327402d51f7bc5edab0d2c22a8d Parents: 8eea358 Author: T Jake Luciani <j...@apache.org> Authored: Wed Mar 11 12:47:08 2015 -0400 Committer: T Jake Luciani <j...@apache.org> Committed: Wed Mar 11 12:47:08 2015 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/stress/operations/userdefined/SchemaStatement.java | 3 +++ 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/46460148/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 24a8bb7..c8a4a84 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.1.4 + * Fix cassandra-stress so it respects the CL passed in user mode (CASSANDRA-8948) * Fix rare NPE in ColumnDefinition#hasIndexOption() (CASSANDRA-8786) * cassandra-stress reports per-operation statistics, plus misc (CASSANDRA-8769) * Add SimpleDate (cql date) and Time (cql time) types (CASSANDRA-7523) http://git-wip-us.apache.org/repos/asf/cassandra/blob/46460148/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/SchemaStatement.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/SchemaStatement.java b/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/SchemaStatement.java index 75e49b4..4305151 100644 --- a/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/SchemaStatement.java +++ b/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/SchemaStatement.java @@ -35,6 +35,7 @@ import org.apache.cassandra.stress.Operation; import org.apache.cassandra.stress.generate.Row; import org.apache.cassandra.stress.settings.StressSettings; import org.apache.cassandra.stress.settings.ValidationType; +import org.apache.cassandra.stress.util.JavaDriverClient; import org.apache.cassandra.stress.util.Timer; import org.apache.cassandra.thrift.CqlResult; import org.apache.cassandra.transport.SimpleClient; @@ -62,6 +63,8 @@ public abstract class SchemaStatement extends Operation int i = 0; for (ColumnDefinitions.Definition definition : statement.getVariables()) argumentIndex[i++] = spec.partitionGenerator.indexOf(definition.getName()); + + statement.setConsistencyLevel(JavaDriverClient.from(cl)); } BoundStatement bindRow(Row row)
