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 2016/12/12 14:25:27 UTC
[1/3] cassandra git commit: Add timeUnit Days for cassandra-stress
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.X 3b84de4da -> c0e7110f9
refs/heads/trunk 31501cc8b -> 9c0fa054a
Add timeUnit Days for cassandra-stress
patch by Jay Zhuang; reviewed by jasobrown for CASSANDRA-13029
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c0e7110f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c0e7110f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c0e7110f
Branch: refs/heads/cassandra-3.X
Commit: c0e7110f97d8fc03b0f2fcc991c4ab0650937b92
Parents: 3b84de4
Author: Jay Zhuang <ja...@yahoo.com>
Authored: Mon Dec 12 06:20:57 2016 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Mon Dec 12 06:22:37 2016 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/stress/settings/SettingsCommand.java | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0e7110f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index dfb849d..c4f4c1f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.12
+ * Add timeUnit Days for cassandra-stress (CASSANDRA-13029)
* Add mutation size and batch metrics (CASSANDRA-12649)
* Add method to get size of endpoints to TokenMetadata (CASSANDRA-12999)
* Fix primary index calculation for SASI (CASSANDRA-12910)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0e7110f/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 c3a171e..1416b8b 100644
--- a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommand.java
+++ b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommand.java
@@ -96,6 +96,9 @@ public abstract class SettingsCommand implements Serializable
case 'h':
this.durationUnits = TimeUnit.HOURS;
break;
+ case 'd':
+ this.durationUnits = TimeUnit.DAYS;
+ break;
default:
throw new IllegalStateException();
}
@@ -135,7 +138,7 @@ public abstract class SettingsCommand implements Serializable
static class Duration extends Options
{
- final OptionSimple duration = new OptionSimple("duration=", "[0-9]+[smh]", null, "Time to run in (in seconds, minutes or hours)", true);
+ final OptionSimple duration = new OptionSimple("duration=", "[0-9]+[smhd]", null, "Time to run in (in seconds, minutes, hours or days)", true);
@Override
public List<? extends Option> options()
{
[2/3] cassandra git commit: Add timeUnit Days for cassandra-stress
Posted by ja...@apache.org.
Add timeUnit Days for cassandra-stress
patch by Jay Zhuang; reviewed by jasobrown for CASSANDRA-13029
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c0e7110f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c0e7110f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c0e7110f
Branch: refs/heads/trunk
Commit: c0e7110f97d8fc03b0f2fcc991c4ab0650937b92
Parents: 3b84de4
Author: Jay Zhuang <ja...@yahoo.com>
Authored: Mon Dec 12 06:20:57 2016 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Mon Dec 12 06:22:37 2016 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/stress/settings/SettingsCommand.java | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0e7110f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index dfb849d..c4f4c1f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.12
+ * Add timeUnit Days for cassandra-stress (CASSANDRA-13029)
* Add mutation size and batch metrics (CASSANDRA-12649)
* Add method to get size of endpoints to TokenMetadata (CASSANDRA-12999)
* Fix primary index calculation for SASI (CASSANDRA-12910)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0e7110f/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 c3a171e..1416b8b 100644
--- a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommand.java
+++ b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommand.java
@@ -96,6 +96,9 @@ public abstract class SettingsCommand implements Serializable
case 'h':
this.durationUnits = TimeUnit.HOURS;
break;
+ case 'd':
+ this.durationUnits = TimeUnit.DAYS;
+ break;
default:
throw new IllegalStateException();
}
@@ -135,7 +138,7 @@ public abstract class SettingsCommand implements Serializable
static class Duration extends Options
{
- final OptionSimple duration = new OptionSimple("duration=", "[0-9]+[smh]", null, "Time to run in (in seconds, minutes or hours)", true);
+ final OptionSimple duration = new OptionSimple("duration=", "[0-9]+[smhd]", null, "Time to run in (in seconds, minutes, hours or days)", true);
@Override
public List<? extends Option> options()
{
[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
Posted by ja...@apache.org.
Merge branch 'cassandra-3.X' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9c0fa054
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9c0fa054
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9c0fa054
Branch: refs/heads/trunk
Commit: 9c0fa054a2cc2bfb470f6d6547ae0701dd32528f
Parents: 31501cc c0e7110
Author: Jason Brown <ja...@gmail.com>
Authored: Mon Dec 12 06:23:22 2016 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Mon Dec 12 06:24:52 2016 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/stress/settings/SettingsCommand.java | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c0fa054/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index fa2bf93,c4f4c1f..6e57ea7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
+4.0
+ * Remove pre-3.0 compatibility code for 4.0 (CASSANDRA-12716)
+ * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
+ * Add (automate) Nodetool Documentation (CASSANDRA-12672)
+ * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
+ * Reject invalid replication settings when creating or altering a keyspace (CASSANDRA-12681)
+ * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter (CASSANDRA-12422)
+
+
3.12
+ * Add timeUnit Days for cassandra-stress (CASSANDRA-13029)
* Add mutation size and batch metrics (CASSANDRA-12649)
* Add method to get size of endpoints to TokenMetadata (CASSANDRA-12999)
* Fix primary index calculation for SASI (CASSANDRA-12910)