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:04 UTC
[1/6] cassandra git commit: Default DTCS base_time_seconds changed to 60 patch by Björn Hegerfors; reviewed by jbellis for CASSANDRA-8417
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 77df5578a -> 578430952
refs/heads/cassandra-2.1 29259cb22 -> 27c67ad85
refs/heads/trunk c64ac4188 -> 6ce8b3fcb
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.0
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";
[5/6] cassandra git commit: merge from 2.0
Posted by jb...@apache.org.
merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/27c67ad8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/27c67ad8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/27c67ad8
Branch: refs/heads/cassandra-2.1
Commit: 27c67ad851651cb49c9d1cae7d478b831e372aaf
Parents: 29259cb 5784309
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Dec 10 15:19:48 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Dec 10 15:19:48 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/27c67ad8/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2e74a15,385af01..25e0f47
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,5 +1,25 @@@
-2.0.12:
+2.1.3
+ * Remove tmplink files for offline compactions (CASSANDRA-8321)
+ * Reduce maxHintsInProgress (CASSANDRA-8415)
+ * BTree updates may call provided update function twice (CASSANDRA-8018)
+ * Release sstable references after anticompaction (CASSANDRA-8386)
+ * Handle abort() in SSTableRewriter properly (CASSANDRA-8320)
+ * Fix high size calculations for prepared statements (CASSANDRA-8231)
+ * Centralize shared executors (CASSANDRA-8055)
+ * Fix filtering for CONTAINS (KEY) relations on frozen collection
+ clustering columns when the query is restricted to a single
+ partition (CASSANDRA-8203)
+ * Do more aggressive entire-sstable TTL expiry checks (CASSANDRA-8243)
+ * Add more log info if readMeter is null (CASSANDRA-8238)
+ * add check of the system wall clock time at startup (CASSANDRA-8305)
+ * Support for frozen collections (CASSANDRA-7859)
+ * Fix overflow on histogram computation (CASSANDRA-8028)
+ * Have paxos reuse the timestamp generation of normal queries (CASSANDRA-7801)
+ * Fix incremental repair not remove parent session on remote (CASSANDRA-8291)
+ * Improve JBOD disk utilization (CASSANDRA-7386)
+ * Log failed host when preparing incremental repair (CASSANDRA-8228)
+Merged from 2.0:
+ * 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)
[6/6] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by jb...@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/6ce8b3fc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6ce8b3fc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6ce8b3fc
Branch: refs/heads/trunk
Commit: 6ce8b3fcbbd5f6638ee635fbc395541afdb5eef8
Parents: c64ac41 27c67ad
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Dec 10 15:19:54 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Dec 10 15:19:54 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/6ce8b3fc/CHANGES.txt
----------------------------------------------------------------------
[2/6] cassandra git commit: Default DTCS base_time_seconds changed to 60 patch by Björn Hegerfors; reviewed by jbellis for CASSANDRA-8417
Posted by jb...@apache.org.
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";
[3/6] cassandra git commit: Default DTCS base_time_seconds changed to 60 patch by Björn Hegerfors; reviewed by jbellis for CASSANDRA-8417
Posted by jb...@apache.org.
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/trunk
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";
[4/6] cassandra git commit: merge from 2.0
Posted by jb...@apache.org.
merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/27c67ad8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/27c67ad8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/27c67ad8
Branch: refs/heads/trunk
Commit: 27c67ad851651cb49c9d1cae7d478b831e372aaf
Parents: 29259cb 5784309
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Dec 10 15:19:48 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Dec 10 15:19:48 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/27c67ad8/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2e74a15,385af01..25e0f47
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,5 +1,25 @@@
-2.0.12:
+2.1.3
+ * Remove tmplink files for offline compactions (CASSANDRA-8321)
+ * Reduce maxHintsInProgress (CASSANDRA-8415)
+ * BTree updates may call provided update function twice (CASSANDRA-8018)
+ * Release sstable references after anticompaction (CASSANDRA-8386)
+ * Handle abort() in SSTableRewriter properly (CASSANDRA-8320)
+ * Fix high size calculations for prepared statements (CASSANDRA-8231)
+ * Centralize shared executors (CASSANDRA-8055)
+ * Fix filtering for CONTAINS (KEY) relations on frozen collection
+ clustering columns when the query is restricted to a single
+ partition (CASSANDRA-8203)
+ * Do more aggressive entire-sstable TTL expiry checks (CASSANDRA-8243)
+ * Add more log info if readMeter is null (CASSANDRA-8238)
+ * add check of the system wall clock time at startup (CASSANDRA-8305)
+ * Support for frozen collections (CASSANDRA-7859)
+ * Fix overflow on histogram computation (CASSANDRA-8028)
+ * Have paxos reuse the timestamp generation of normal queries (CASSANDRA-7801)
+ * Fix incremental repair not remove parent session on remote (CASSANDRA-8291)
+ * Improve JBOD disk utilization (CASSANDRA-7386)
+ * Log failed host when preparing incremental repair (CASSANDRA-8228)
+Merged from 2.0:
+ * 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)