cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-3.2' into cassandra-3.3
Date Tue, 05 Jan 2016 15:56:50 GMT
Merge branch 'cassandra-3.2' into cassandra-3.3


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

Branch: refs/heads/cassandra-3.3
Commit: ea4f649773f272caddb95cd20dfc0e203425af95
Parents: acc5b63 e2c6341
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Tue Jan 5 16:55:56 2016 +0100
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Tue Jan 5 16:55:56 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 NEWS.txt                                        |   5 +
 conf/cassandra.yaml                             |  13 +-
 .../org/apache/cassandra/config/Config.java     |   2 +-
 .../cassandra/config/DatabaseDescriptor.java    |   3 -
 .../cassandra/db/BlacklistedDirectories.java    |  10 +
 .../db/BlacklistedDirectoriesMBean.java         |   9 +-
 .../apache/cassandra/db/ColumnFamilyStore.java  |  97 ++++-
 .../org/apache/cassandra/db/Directories.java    |  36 +-
 src/java/org/apache/cassandra/db/Memtable.java  | 193 +++++-----
 .../db/compaction/CompactionManager.java        |  78 +++-
 .../compaction/CompactionStrategyManager.java   | 361 +++++++++++++------
 .../cassandra/db/compaction/CompactionTask.java |   2 +-
 .../DateTieredCompactionStrategy.java           |   3 +-
 .../db/compaction/LeveledManifest.java          |   2 +-
 .../cassandra/db/compaction/OperationType.java  |   3 +-
 .../cassandra/db/compaction/Scrubber.java       |   7 +-
 .../SizeTieredCompactionStrategy.java           |   9 +-
 .../writers/CompactionAwareWriter.java          |  91 ++++-
 .../writers/DefaultCompactionWriter.java        |  17 +-
 .../writers/MajorLeveledCompactionWriter.java   |  53 +--
 .../writers/MaxSSTableSizeWriter.java           |  22 +-
 .../SplittingSizeTieredCompactionWriter.java    |  17 +-
 .../apache/cassandra/db/lifecycle/Tracker.java  |   4 +-
 .../org/apache/cassandra/db/lifecycle/View.java |   2 +-
 .../org/apache/cassandra/dht/IPartitioner.java  |  17 +
 .../cassandra/dht/Murmur3Partitioner.java       |  23 ++
 .../apache/cassandra/dht/RandomPartitioner.java |  24 ++
 src/java/org/apache/cassandra/dht/Range.java    |  17 +
 src/java/org/apache/cassandra/dht/Splitter.java | 124 +++++++
 .../io/sstable/SimpleSSTableMultiWriter.java    |   7 +-
 .../sstable/format/RangeAwareSSTableWriter.java | 205 +++++++++++
 .../cassandra/io/util/DiskAwareRunnable.java    |  17 +-
 .../cassandra/service/StorageService.java       |  70 ++++
 .../cassandra/service/StorageServiceMBean.java  |   1 +
 .../cassandra/streaming/StreamReader.java       |  11 +-
 .../cassandra/streaming/StreamSession.java      |   4 +-
 .../cassandra/streaming/StreamWriter.java       |   2 +-
 .../compress/CompressedStreamReader.java        |   3 +-
 .../compress/CompressedStreamWriter.java        |   3 +-
 .../org/apache/cassandra/tools/NodeProbe.java   |   5 +
 .../org/apache/cassandra/tools/NodeTool.java    |   3 +-
 .../cassandra/tools/SSTableOfflineRelevel.java  |  21 +-
 .../tools/nodetool/RelocateSSTables.java        |  49 +++
 .../LongLeveledCompactionStrategyTest.java      |   4 +-
 .../unit/org/apache/cassandra/db/ScrubTest.java |   6 +-
 .../db/compaction/CompactionsCQLTest.java       |   5 +-
 .../LeveledCompactionStrategyTest.java          |  36 +-
 .../cassandra/db/lifecycle/TrackerTest.java     |   6 +-
 .../apache/cassandra/db/lifecycle/ViewTest.java |   3 +-
 .../apache/cassandra/dht/LengthPartitioner.java |   6 +
 .../org/apache/cassandra/dht/SplitterTest.java  | 158 ++++++++
 52 files changed, 1509 insertions(+), 361 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea4f6497/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 46183ed,43acd43..77db7b2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
 +3.3
 +Merged from 3.0:
 + * Fix potential assertion error during compaction (CASSANDRA-10944)
 +
  3.2
+  * Make sure tokens don't exist in several data directories (CASSANDRA-6696)
   * Add requireAuthorization method to IAuthorizer (CASSANDRA-10852)
   * Move static JVM options to conf/jvm.options file (CASSANDRA-10494)
   * Fix CassandraVersion to accept x.y version string (CASSANDRA-10931)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea4f6497/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------


Mime
View raw message