Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
src/java/org/apache/cassandra/db/compaction/WrappingCompactionStrategy.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/325aeb76
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/325aeb76
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/325aeb76
Branch: refs/heads/cassandra-2.2
Commit: 325aeb76b9e94b4b108e5608871e4b096f7d8f1c
Parents: a96b207 dce303b
Author: Marcus Eriksson <marc...@apache.org>
Authored: Wed Jul 29 16:05:05 2015 +0200
Committer: Marcus Eriksson <marc...@apache.org>
Committed: Wed Jul 29 16:05:05 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../compaction/AbstractCompactionStrategy.java | 2 +-
.../DateTieredCompactionStrategy.java | 5 +---
.../compaction/LeveledCompactionStrategy.java | 3 --
.../SizeTieredCompactionStrategy.java | 6 ----
.../compaction/WrappingCompactionStrategy.java | 30 +++++++++++++++++++-
6 files changed, 32 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/325aeb76/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 4717fca,4ef77ed..ec12cb8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,19 -1,7 +1,20 @@@
-2.1.9
+2.2.1
+ * UDF / UDA execution time in trace (CASSANDRA-9723)
+ * Remove repair snapshot leftover on startup (CASSANDRA-7357)
+ * Use random nodes for batch log when only 2 racks (CASSANDRA-8735)
+Merged from 2.1:
+ * Fix handling of enable/disable autocompaction (CASSANDRA-9899)
- * Commit log segment recycling is disabled by default (CASSANDRA-9896)
* Add consistency level to tracing ouput (CASSANDRA-9827)
+Merged from 2.0:
+ * Log when messages are dropped due to cross_node_timeout (CASSANDRA-9793)
+ * Don't track hotness when opening from snapshot for validation
(CASSANDRA-9382)
+
+2.2.0
+ * Fix cqlsh copy methods and other windows specific issues (CASSANDRA-9795)
+ * Don't wrap byte arrays in SequentialWriter (CASSANDRA-9797)
+ * sum() and avg() functions missing for smallint and tinyint types
(CASSANDRA-9671)
+ * Revert CASSANDRA-9542 (allow native functions in UDA) (CASSANDRA-9771)
+Merged from 2.1:
* Fix MarshalException when upgrading superColumn family (CASSANDRA-9582)
* Fix broken logging for "empty" flushes in Memtable (CASSANDRA-9837)
* Handle corrupt files on startup (CASSANDRA-9686)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/325aeb76/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/325aeb76/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java
----------------------------------------------------------------------
diff --cc
src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java
index 43f998a,dec0cef..0d06f67
---
a/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java
+++
b/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java
@@@ -56,12 -55,8 +56,9 @@@ public class DateTieredCompactionStrate
}
@Override
+ @SuppressWarnings("resource")
public synchronized AbstractCompactionTask getNextBackgroundTask(int
gcBefore)
{
- if (!isEnabled())
- return null;
-
while (true)
{
List<SSTableReader> latestBucket =
getNextBackgroundSSTables(gcBefore);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/325aeb76/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
----------------------------------------------------------------------
diff --cc
src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
index 9eb58ff,8afe6b6..9a88164
--- a/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
+++ b/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
@@@ -88,12 -85,16 +88,9 @@@ public class LeveledCompactionStrategy
* the only difference between background and maximal in LCS is that
maximal is still allowed
* (by explicit user request) even when compaction is disabled.
*/
+ @SuppressWarnings("resource")
public synchronized AbstractCompactionTask getNextBackgroundTask(int
gcBefore)
{
- if (!isEnabled())
- Collection<AbstractCompactionTask> tasks = getMaximalTask(gcBefore);
- if (tasks == null || tasks.size() == 0)
-- return null;
- return tasks.iterator().next();
- }
--
- public Collection<AbstractCompactionTask> getMaximalTask(int gcBefore)
- {
while (true)
{
OperationType op;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/325aeb76/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java
----------------------------------------------------------------------
diff --cc
src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java
index 74a9757,1f4acdb..4ba2378
---
a/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java
+++
b/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java
@@@ -175,12 -172,8 +172,9 @@@ public class SizeTieredCompactionStrate
return sstr.getReadMeter() == null ? 0.0 :
sstr.getReadMeter().twoHourRate() / sstr.estimatedKeys();
}
+ @SuppressWarnings("resource")
public synchronized AbstractCompactionTask getNextBackgroundTask(int
gcBefore)
{
- if (!isEnabled())
- return null;
-
while (true)
{
List<SSTableReader> hottestBucket =
getNextBackgroundSSTables(gcBefore);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/325aeb76/src/java/org/apache/cassandra/db/compaction/WrappingCompactionStrategy.java
----------------------------------------------------------------------
diff --cc
src/java/org/apache/cassandra/db/compaction/WrappingCompactionStrategy.java
index adda0c9,e01b4c6..ffe65d7
---
a/src/java/org/apache/cassandra/db/compaction/WrappingCompactionStrategy.java
+++
b/src/java/org/apache/cassandra/db/compaction/WrappingCompactionStrategy.java
@@@ -344,7 -350,28 +350,29 @@@ public final class WrappingCompactionSt
}
@Override
+ public void enable()
+ {
+ if (repaired != null)
+ repaired.enable();
+ if (unrepaired != null)
+ unrepaired.enable();
+ // enable this last to make sure the strategies are ready to get
calls.
+ super.enable();
+ }
+
+ @Override
+ public void disable()
+ {
+ // disable this first avoid asking disabled strategies for compaction
tasks
+ super.disable();
+ if (repaired != null)
+ repaired.disable();
+ if (unrepaired != null)
+ unrepaired.disable();
+ }
+
+ @Override
+ @SuppressWarnings("resource")
public synchronized ScannerList getScanners(Collection<SSTableReader>
sstables, Range<Token> range)
{
List<SSTableReader> repairedSSTables = new ArrayList<>();
