natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-2.1' into trunk

This commit is contained in:
T Jake Luciani 2014-12-15 11:39:24 -05:00
parent 088ffb2b50 f0767fdf49
commit 9acf97a897
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/stress/src/org/apache/cassandra/stress/settings/Command.java
View File

@ -31,11 +31,11 @@ import com.google.common.collect.ImmutableList;
public enum Command
{
READ(false, "Standard1", "Super1",
READ(false, "standard1", "Super1",
"Multiple concurrent reads - the cluster must first be populated by a write test",
CommandCategory.BASIC
),
WRITE(true, "Standard1", "Super1",
WRITE(true, "standard1", "Super1",
"insert",
"Multiple concurrent writes against the cluster",
CommandCategory.BASIC
@ -44,12 +44,12 @@ public enum Command
"Interleaving of any basic commands, with configurable ratio and distribution - the cluster must first be populated by a write test",
CommandCategory.MIXED
),
COUNTER_WRITE(true, "Counter1", "SuperCounter1",
COUNTER_WRITE(true, "counter1", "SuperCounter1",
"counter_add",
"Multiple concurrent updates of counters.",
CommandCategory.BASIC
),
COUNTER_READ(false, "Counter1", "SuperCounter1",
COUNTER_READ(false, "counter1", "SuperCounter1",
"counter_get",
"Multiple concurrent reads of counters. The cluster must first be populated by a counterwrite test.",
CommandCategory.BASIC

6
tools/stress/src/org/apache/cassandra/stress/settings/SettingsSchema.java
View File

@ -68,7 +68,7 @@ public class SettingsSchema implements Serializable
KsDef ksdef = new KsDef();
// column family for standard columns
CfDef standardCfDef = new CfDef(keyspace, "Standard1");
CfDef standardCfDef = new CfDef(keyspace, "standard1");
Map<String, String> compressionOptions = new HashMap<>();
if (compression != null)
compressionOptions.put("sstable_compression", compression);
@ -82,7 +82,7 @@ public class SettingsSchema implements Serializable
standardCfDef.addToColumn_metadata(new ColumnDef(settings.columns.names.get(i), "BytesType"));
// column family for standard counters
CfDef counterCfDef = new CfDef(keyspace, "Counter1")
CfDef counterCfDef = new CfDef(keyspace, "counter1")
.setComparator_type(comparator)
.setDefault_validation_class("CounterColumnType")
.setCompression_options(compressionOptions);
@ -158,7 +158,7 @@ public class SettingsSchema implements Serializable
{
final OptionReplication replication = new OptionReplication();
final OptionCompaction compaction = new OptionCompaction();
final OptionSimple keyspace = new OptionSimple("keyspace=", ".*", "Keyspace1", "The keyspace name to use", false);
final OptionSimple keyspace = new OptionSimple("keyspace=", ".*", "keyspace1", "The keyspace name to use", false);
final OptionSimple compression = new OptionSimple("compression=", ".*", null, "Specify the compression to use for sstable, default:no compression", false);
@Override