Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d4fc9d0b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d4fc9d0b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d4fc9d0b Branch: refs/heads/trunk Commit: d4fc9d0b0a352d46490e2c92335876c945cd575d Parents: 11bddad 6982aaa Author: Marcus Eriksson <marc...@apache.org> Authored: Mon Feb 8 09:04:10 2016 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Mon Feb 8 09:04:10 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ .../db/compaction/DateTieredCompactionStrategy.java | 10 ++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4fc9d0b/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 48321f1,12198e4..0fb8f34 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,45 -1,10 +1,48 @@@ -2.2.6 +3.0.4 + * Hadoop integration is incompatible with Cassandra Driver 3.0.0 (CASSANDRA-11001) +Merged from 2.2.6 * Gossiper#isEnabled is not thread safe (CASSANDRA-11116) - * Fix paging on DISTINCT queries repeats result when first row in partition changes (CASSANDRA-10010) + Merged from 2.1: + * Avoid major compaction mixing repaired and unrepaired sstables in DTCS (CASSANDRA-11113) + +3.0.3 + * Remove double initialization of newly added tables (CASSANDRA-11027) + * Filter keys searcher results by target range (CASSANDRA-11104) + * Fix deserialization of legacy read commands (CASSANDRA-11087) + * Fix incorrect computation of deletion time in sstable metadata (CASSANDRA-11102) + * Avoid memory leak when collecting sstable metadata (CASSANDRA-11026) + * Mutations do not block for completion under view lock contention (CASSANDRA-10779) + * Invalidate legacy schema tables when unloading them (CASSANDRA-11071) + * (cqlsh) handle INSERT and UPDATE statements with LWT conditions correctly + (CASSANDRA-11003) + * Fix DISTINCT queries in mixed version clusters (CASSANDRA-10762) + * Migrate build status for indexes along with legacy schema (CASSANDRA-11046) + * Ensure SSTables for legacy KEYS indexes can be read (CASSANDRA-11045) + * Added support for IBM zSystems architecture (CASSANDRA-11054) + * Update CQL documentation (CASSANDRA-10899) + * Check the column name, not cell name, for dropped columns when reading + legacy sstables (CASSANDRA-11018) + * Don't attempt to index clustering values of static rows (CASSANDRA-11021) + * Remove checksum files after replaying hints (CASSANDRA-10947) + * Support passing base table metadata to custom 2i validation (CASSANDRA-10924) + * Ensure stale index entries are purged during reads (CASSANDRA-11013) + * Fix AssertionError when removing from list using UPDATE (CASSANDRA-10954) + * Fix UnsupportedOperationException when reading old sstable with range + tombstone (CASSANDRA-10743) + * MV should use the maximum timestamp of the primary key (CASSANDRA-10910) + * Fix potential assertion error during compaction (CASSANDRA-10944) + * Fix counting of received sstables in streaming (CASSANDRA-10949) + * Implement hints compression (CASSANDRA-9428) + * Fix potential assertion error when reading static columns (CASSANDRA-10903) + * Avoid NoSuchElementException when executing empty batch (CASSANDRA-10711) + * Avoid building PartitionUpdate in toString (CASSANDRA-10897) + * Reduce heap spent when receiving many SSTables (CASSANDRA-10797) + * Add back support for 3rd party auth providers to bulk loader (CASSANDRA-10873) + * Eliminate the dependency on jgrapht for UDT resolution (CASSANDRA-10653) + * (Hadoop) Close Clusters and Sessions in Hadoop Input/Output classes (CASSANDRA-10837) + * Fix sstableloader not working with upper case keyspace name (CASSANDRA-10806) +Merged from 2.2: 2.2.5 * maxPurgeableTimestamp needs to check memtables too (CASSANDRA-9949) * Apply change to compaction throughput in real time (CASSANDRA-10025) http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4fc9d0b/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java index 50f9b71,8c59e1a..1addd0d --- a/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java +++ b/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java @@@ -390,11 -389,13 +390,13 @@@ public class DateTieredCompactionStrate @SuppressWarnings("resource") public synchronized Collection<AbstractCompactionTask> getMaximalTask(int gcBefore, boolean splitOutput) { - LifecycleTransaction modifier = cfs.markAllCompacting(OperationType.COMPACTION); - if (modifier == null) + Iterable<SSTableReader> filteredSSTables = filterSuspectSSTables(sstables); + if (Iterables.isEmpty(filteredSSTables)) return null; - - return Collections.<AbstractCompactionTask>singleton(new CompactionTask(cfs, modifier, gcBefore)); + LifecycleTransaction txn = cfs.getTracker().tryModify(filteredSSTables, OperationType.COMPACTION); + if (txn == null) + return null; - return Collections.<AbstractCompactionTask>singleton(new CompactionTask(cfs, txn, gcBefore, false)); ++ return Collections.<AbstractCompactionTask>singleton(new CompactionTask(cfs, txn, gcBefore)); } @Override
