You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2014/12/10 22:20:05 UTC

[2/6] cassandra git commit: Default DTCS base_time_seconds changed to 60 patch by Björn Hegerfors; reviewed by jbellis for CASSANDRA-8417

Default DTCS base_time_seconds changed to 60
patch by Björn Hegerfors; reviewed by jbellis for CASSANDRA-8417


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/57843095
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/57843095
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/57843095

Branch: refs/heads/cassandra-2.1
Commit: 578430952789bbc2dc7d9b17f4f4b41495d0757f
Parents: 77df557
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Dec 10 15:19:11 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Dec 10 15:19:11 2014 -0600

----------------------------------------------------------------------
 CHANGES.txt                                                        | 1 +
 .../db/compaction/DateTieredCompactionStrategyOptions.java         | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/57843095/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 3c651ff..385af01 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.0.12:
+ * Default DTCS base_time_seconds changed to 60 (CASSANDRA-8417)
  * Refuse Paxos operation with more than one pending endpoint (CASSANDRA-8346)
  * Throw correct exception when trying to bind a keyspace or table
    name (CASSANDRA-6952)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/57843095/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyOptions.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyOptions.java b/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyOptions.java
index 9fed3e0..ddc8dc7 100644
--- a/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyOptions.java
+++ b/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyOptions.java
@@ -26,7 +26,7 @@ public final class DateTieredCompactionStrategyOptions
 {
     protected static final TimeUnit DEFAULT_TIMESTAMP_RESOLUTION = TimeUnit.MICROSECONDS;
     protected static final long DEFAULT_MAX_SSTABLE_AGE_DAYS = 365;
-    protected static final long DEFAULT_BASE_TIME_SECONDS = 60 * 60;
+    protected static final long DEFAULT_BASE_TIME_SECONDS = 60;
     protected static final String TIMESTAMP_RESOLUTION_KEY = "timestamp_resolution";
     protected static final String MAX_SSTABLE_AGE_KEY = "max_sstable_age_days";
     protected static final String BASE_TIME_KEY = "base_time_seconds";