cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bened...@apache.org
Subject [7/7] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Date Fri, 22 May 2015 08:46:38 GMT
Merge branch 'cassandra-2.2' into trunk


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

Branch: refs/heads/trunk
Commit: d96a02a12e20bc2e0b096904ebe7a1d68532d2f3
Parents: 15d424e e5a76bd
Author: Benedict Elliott Smith <benedict@apache.org>
Authored: Fri May 22 09:44:46 2015 +0100
Committer: Benedict Elliott Smith <benedict@apache.org>
Committed: Fri May 22 09:44:46 2015 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 .../apache/cassandra/db/ColumnFamilyStore.java  | 249 ++++--
 .../org/apache/cassandra/db/DataTracker.java    | 793 -------------------
 .../cassandra/db/HintedHandOffManager.java      |   2 +-
 src/java/org/apache/cassandra/db/Keyspace.java  |  15 +-
 src/java/org/apache/cassandra/db/Memtable.java  |  22 +-
 .../compaction/AbstractCompactionStrategy.java  |   7 +-
 .../db/compaction/AbstractCompactionTask.java   |  19 +-
 .../db/compaction/CompactionController.java     |   4 +-
 .../db/compaction/CompactionManager.java        | 182 +++--
 .../cassandra/db/compaction/CompactionTask.java |  54 +-
 .../DateTieredCompactionStrategy.java           |  17 +-
 .../compaction/LeveledCompactionStrategy.java   |  23 +-
 .../db/compaction/LeveledCompactionTask.java    |  11 +-
 .../db/compaction/LeveledManifest.java          |  11 +-
 .../db/compaction/SSTableSplitter.java          |  13 +-
 .../cassandra/db/compaction/Scrubber.java       |  21 +-
 .../SizeTieredCompactionStrategy.java           |  30 +-
 .../cassandra/db/compaction/Upgrader.java       |  15 +-
 .../compaction/WrappingCompactionStrategy.java  |   2 +-
 .../writers/CompactionAwareWriter.java          |  11 +-
 .../writers/DefaultCompactionWriter.java        |  11 +-
 .../writers/MajorLeveledCompactionWriter.java   |  11 +-
 .../writers/MaxSSTableSizeWriter.java           |  10 +-
 .../SplittingSizeTieredCompactionWriter.java    |  14 +-
 .../AbstractSimplePerColumnSecondaryIndex.java  |   4 +-
 .../db/index/SecondaryIndexManager.java         |   2 +-
 .../apache/cassandra/db/lifecycle/Helpers.java  | 241 ++++++
 .../db/lifecycle/LifecycleTransaction.java      | 511 ++++++++++++
 .../db/lifecycle/SSTableIntervalTree.java       |  40 +
 .../apache/cassandra/db/lifecycle/Tracker.java  | 468 +++++++++++
 .../org/apache/cassandra/db/lifecycle/View.java | 252 ++++++
 .../io/compress/CompressionMetadata.java        |   2 +-
 .../io/sstable/IndexSummaryManager.java         | 106 ++-
 .../io/sstable/SSTableDeletingTask.java         |  27 +-
 .../cassandra/io/sstable/SSTableRewriter.java   | 295 ++-----
 .../io/sstable/format/SSTableReader.java        | 100 ++-
 .../io/sstable/format/big/BigTableWriter.java   |   6 +-
 .../cassandra/io/util/SequentialWriter.java     |   2 +-
 .../cassandra/metrics/ColumnFamilyMetrics.java  |  18 +-
 .../cassandra/streaming/StreamSession.java      |   7 +-
 .../cassandra/tools/StandaloneScrubber.java     |  12 +-
 .../cassandra/tools/StandaloneSplitter.java     |   7 +-
 .../cassandra/tools/StandaloneUpgrader.java     |   6 +-
 .../cassandra/utils/concurrent/Blocker.java     |  63 ++
 .../utils/concurrent/Transactional.java         |  31 +-
 .../db/compaction/LongCompactionsTest.java      |  10 +-
 test/unit/org/apache/cassandra/MockSchema.java  | 167 ++++
 test/unit/org/apache/cassandra/Util.java        |  27 +-
 .../org/apache/cassandra/db/KeyCacheTest.java   |   3 +-
 .../unit/org/apache/cassandra/db/ScrubTest.java |  58 +-
 .../db/compaction/AntiCompactionTest.java       |  51 +-
 .../compaction/CompactionAwareWriterTest.java   |  45 +-
 .../DateTieredCompactionStrategyTest.java       |   6 +-
 .../cassandra/db/lifecycle/HelpersTest.java     | 158 ++++
 .../db/lifecycle/LifecycleTransactionTest.java  | 412 ++++++++++
 .../cassandra/db/lifecycle/TrackerTest.java     | 342 ++++++++
 .../apache/cassandra/db/lifecycle/ViewTest.java | 202 +++++
 .../io/sstable/IndexSummaryManagerTest.java     | 123 ++-
 .../cassandra/io/sstable/SSTableReaderTest.java |  11 +-
 .../io/sstable/SSTableRewriterTest.java         | 250 +++---
 61 files changed, 3902 insertions(+), 1711 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d96a02a1/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 0d95a3b,ca87385..523ec84
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
 +3.0:
 + * Decommissioned nodes will not rejoin the cluster (CASSANDRA-8801)
 + * Change gossip stabilization to use endpoit size (CASSANDRA-9401)
 +
 +
  2.2
+  * Extend Transactional API to sstable lifecycle management (CASSANDRA-8568)
   * (cqlsh) Add support for native protocol 4 (CASSANDRA-9399)
   * Ensure that UDF and UDAs are keyspace-isolated (CASSANDRA-9409)
   * Revert CASSANDRA-7807 (tracing completion client notifications) (CASSANDRA-9429)


Mime
View raw message