diff --git a/CHANGES.txt b/CHANGES.txt index 964de54588..6c0f2da927 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.1.3 + * Add missing ConsistencyLevels to cassandra-stress (CASSANDRA-8253) * Add auth support to cassandra-stress (CASSANDRA-7985) * Fix ArrayIndexOutOfBoundsException when generating error message for some CQL syntax errors (CASSANDRA-8455) 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 8751dbff37..e8b45ec044 100644 --- a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommand.java +++ b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommand.java @@ -107,7 +107,7 @@ public abstract class SettingsCommand implements Serializable static abstract class Options extends GroupedOptions { final OptionSimple noWarmup = new OptionSimple("no-warmup", "", null, "Do not warmup the process", 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|SERIAL|LOCAL_SERIAL|LOCAL_ONE", "ONE", "Consistency level to use", false); } static class Count extends Options 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 7aa7257825..43d9ddcacb 100644 --- a/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java +++ b/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java @@ -178,6 +178,12 @@ 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; } throw new AssertionError(); }