You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2014/12/15 17:39:38 UTC
[1/2] cassandra git commit: avoid mixed case ks/table names in stress
(ninja)
Repository: cassandra
Updated Branches:
refs/heads/trunk 088ffb2b5 -> 9acf97a89
avoid mixed case ks/table names in stress (ninja)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f0767fdf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f0767fdf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f0767fdf
Branch: refs/heads/trunk
Commit: f0767fdf49f900cb80b9def504d7a72828425402
Parents: a78451e
Author: T Jake Luciani <ja...@apache.org>
Authored: Mon Dec 15 11:39:00 2014 -0500
Committer: T Jake Luciani <ja...@apache.org>
Committed: Mon Dec 15 11:39:00 2014 -0500
----------------------------------------------------------------------
.../src/org/apache/cassandra/stress/settings/Command.java | 8 ++++----
.../org/apache/cassandra/stress/settings/SettingsSchema.java | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0767fdf/tools/stress/src/org/apache/cassandra/stress/settings/Command.java
----------------------------------------------------------------------
diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/Command.java b/tools/stress/src/org/apache/cassandra/stress/settings/Command.java
index 1572946..9a93e34 100644
--- a/tools/stress/src/org/apache/cassandra/stress/settings/Command.java
+++ b/tools/stress/src/org/apache/cassandra/stress/settings/Command.java
@@ -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
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0767fdf/tools/stress/src/org/apache/cassandra/stress/settings/SettingsSchema.java
----------------------------------------------------------------------
diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsSchema.java b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsSchema.java
index 342dd0b..93a9bd7 100644
--- a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsSchema.java
+++ b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsSchema.java
@@ -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
[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by ja...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9acf97a8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9acf97a8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9acf97a8
Branch: refs/heads/trunk
Commit: 9acf97a897272d5d5ea211ec2488a3d014eb3756
Parents: 088ffb2 f0767fd
Author: T Jake Luciani <ja...@apache.org>
Authored: Mon Dec 15 11:39:24 2014 -0500
Committer: T Jake Luciani <ja...@apache.org>
Committed: Mon Dec 15 11:39:24 2014 -0500
----------------------------------------------------------------------
.../src/org/apache/cassandra/stress/settings/Command.java | 8 ++++----
.../org/apache/cassandra/stress/settings/SettingsSchema.java | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------