Repository: cassandra Updated Branches: refs/heads/trunk a2c05e2e3 -> 5893472e7
Add missing consistency levels to cassandra-stress Patch by Mario Lazaro; reviewed by tjake for CASSANDRA-9361 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8b5434f3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8b5434f3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8b5434f3 Branch: refs/heads/trunk Commit: 8b5434f3dffabc70230d434befa79bb4881a6fe3 Parents: 9beeba3 Author: T Jake Luciani <j...@apache.org> Authored: Tue May 12 14:53:10 2015 -0400 Committer: T Jake Luciani <j...@apache.org> Committed: Tue May 12 14:53:10 2015 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/stress/settings/SettingsCommand.java | 2 +- .../src/org/apache/cassandra/stress/util/JavaDriverClient.java | 4 ---- 3 files changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b5434f3/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 8794509..934218b 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.1.6 + * Add missing consistency levels to cassandra-stess (CASSANDRA-9361) * Fix commitlog getCompletedTasks to not increment (CASSANDRA-9339) * Fix for harmless exceptions logged as ERROR (CASSANDRA-8564) * Delete processed sstables in sstablesplit/sstableupgrade (CASSANDRA-8606) http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b5434f3/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommand.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommand.java b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommand.java index 60b4c09..bfd8529 100644 --- a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommand.java +++ b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommand.java @@ -119,7 +119,7 @@ public abstract class SettingsCommand implements Serializable { final OptionSimple noWarmup = new OptionSimple("no-warmup", "", null, "Do not warmup the process", false); final OptionSimple truncate = new OptionSimple("truncate=", "never|once|always", "never", "Truncate the table: never, before performing any work, or before each iteration", false); - final OptionSimple consistencyLevel = new OptionSimple("cl=", "ONE|QUORUM|LOCAL_QUORUM|EACH_QUORUM|ALL|ANY", "ONE", "Consistency level to use", false); + final OptionSimple consistencyLevel = new OptionSimple("cl=", "ONE|QUORUM|LOCAL_QUORUM|EACH_QUORUM|ALL|ANY|TWO|THREE|LOCAL_ONE", "LOCAL_ONE", "Consistency level to use", false); } static class Count extends Options http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b5434f3/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java b/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java index 43d9ddc..fa04dbc 100644 --- a/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java +++ b/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java @@ -178,10 +178,6 @@ public class JavaDriverClient return com.datastax.driver.core.ConsistencyLevel.LOCAL_QUORUM; case EACH_QUORUM: return com.datastax.driver.core.ConsistencyLevel.EACH_QUORUM; - case SERIAL: - return com.datastax.driver.core.ConsistencyLevel.SERIAL; - case LOCAL_SERIAL: - return com.datastax.driver.core.ConsistencyLevel.LOCAL_SERIAL; case LOCAL_ONE: return com.datastax.driver.core.ConsistencyLevel.LOCAL_ONE; }
