diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/OptionRatioDistribution.java b/tools/stress/src/org/apache/cassandra/stress/settings/OptionRatioDistribution.java index 67cd1a9f3c..0bd1bfa472 100644 --- a/tools/stress/src/org/apache/cassandra/stress/settings/OptionRatioDistribution.java +++ b/tools/stress/src/org/apache/cassandra/stress/settings/OptionRatioDistribution.java @@ -87,7 +87,7 @@ public class OptionRatioDistribution extends Option return new DelegateFactory(delegate.get(), divisor); if (defaultSpec == null) return null; - OptionRatioDistribution sub = new OptionRatioDistribution(delegate.prefix, null, null, true); + OptionRatioDistribution sub = new OptionRatioDistribution("", null, null, true); if (!sub.accept(defaultSpec)) throw new IllegalStateException("Invalid default spec: " + defaultSpec); return sub.get(); diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsInsert.java b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsInsert.java index ac3fc7cfb3..e999e4b468 100644 --- a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsInsert.java +++ b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsInsert.java @@ -48,6 +48,8 @@ public class SettingsInsert implements Serializable this.selectRatio = options.selectRatio.get(); this.rowPopulationRatio = options.rowPopulationRatio.get(); + + this.batchType = !options.batchType.setByUser() ? null : BatchStatement.Type.valueOf(options.batchType.value()); } @@ -60,7 +62,7 @@ public class SettingsInsert implements Serializable final OptionDistribution partitions = new OptionDistribution("partitions=", null, "The number of partitions to update in a single batch", false); final OptionSimple batchType = new OptionSimple("batchtype=", "unlogged|logged|counter", null, "Specify the type of batch statement (LOGGED, UNLOGGED or COUNTER)", false); final OptionRatioDistribution selectRatio = new OptionRatioDistribution("select-ratio=", null, "The uniform probability of visiting any CQL row in the generated partition", false); - final OptionRatioDistribution rowPopulationRatio = new OptionRatioDistribution("row-population-ratio=", null, "The percent of a given rows columns to populate", false); + final OptionRatioDistribution rowPopulationRatio = new OptionRatioDistribution("row-population-ratio=", "fixed(1)/1", "The percent of a given rows columns to populate", false); @Override public List options()