Merge branch 'cassandra-2.2' into trunk
Conflicts:
build.xml
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d91eb011
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d91eb011
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d91eb011
Branch: refs/heads/trunk
Commit: d91eb0116950fa5fc7a1a4cf93e090d476536ea3
Parents: 5746f60 7aafe05
Author: T Jake Luciani <[email protected]>
Authored: Wed May 27 17:56:48 2015 -0400
Committer: T Jake Luciani <[email protected]>
Committed: Wed May 27 17:56:48 2015 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
build.xml | 40 +++-
eclipse_compiler.properties | 88 ++++++++
.../apache/cassandra/cache/AutoSavingCache.java | 1 +
.../cassandra/cache/SerializingCache.java | 5 +
.../apache/cassandra/db/BatchlogManager.java | 7 +-
.../org/apache/cassandra/db/ColumnFamily.java | 8 +-
.../apache/cassandra/db/ColumnFamilyStore.java | 31 +--
src/java/org/apache/cassandra/db/Memtable.java | 30 +--
.../cassandra/db/MutationVerbHandler.java | 24 +-
.../apache/cassandra/db/RangeSliceReply.java | 5 +-
.../cassandra/db/SizeEstimatesRecorder.java | 17 +-
.../org/apache/cassandra/db/SystemKeyspace.java | 8 +-
.../cassandra/db/commitlog/CommitLog.java | 8 +-
.../db/commitlog/CommitLogArchiver.java | 10 +-
.../db/commitlog/CommitLogReplayer.java | 16 +-
.../db/commitlog/CommitLogSegment.java | 1 +
.../compaction/AbstractCompactionStrategy.java | 1 +
.../db/compaction/CompactionManager.java | 222 +++++++++++--------
.../cassandra/db/compaction/CompactionTask.java | 71 +++---
.../DateTieredCompactionStrategy.java | 3 +
.../db/compaction/LazilyCompactedRow.java | 15 +-
.../compaction/LeveledCompactionStrategy.java | 2 +
.../cassandra/db/compaction/Scrubber.java | 3 +
.../SizeTieredCompactionStrategy.java | 3 +
.../cassandra/db/compaction/Upgrader.java | 12 +-
.../compaction/WrappingCompactionStrategy.java | 1 +
.../writers/DefaultCompactionWriter.java | 2 +
.../writers/MajorLeveledCompactionWriter.java | 3 +
.../writers/MaxSSTableSizeWriter.java | 3 +
.../SplittingSizeTieredCompactionWriter.java | 3 +
.../cassandra/db/marshal/CompositeType.java | 3 +-
.../apache/cassandra/gms/FailureDetector.java | 8 +-
.../hadoop/AbstractColumnFamilyInputFormat.java | 15 +-
.../hadoop/ColumnFamilyInputFormat.java | 1 +
.../hadoop/ColumnFamilyOutputFormat.java | 1 +
.../hadoop/ColumnFamilyRecordReader.java | 1 +
.../hadoop/ColumnFamilyRecordWriter.java | 1 +
.../apache/cassandra/hadoop/ConfigHelper.java | 1 +
.../cassandra/hadoop/cql3/CqlConfigHelper.java | 11 +-
.../cassandra/hadoop/cql3/CqlRecordWriter.java | 48 ++--
.../cassandra/hadoop/pig/CqlNativeStorage.java | 21 +-
.../io/compress/CompressionMetadata.java | 65 +++---
.../cassandra/io/sstable/CQLSSTableWriter.java | 1 +
.../cassandra/io/sstable/IndexSummary.java | 14 +-
.../io/sstable/IndexSummaryBuilder.java | 1 +
.../io/sstable/IndexSummaryManager.java | 1 +
.../apache/cassandra/io/sstable/SSTable.java | 8 +-
.../cassandra/io/sstable/SSTableLoader.java | 5 +-
.../io/sstable/format/SSTableReader.java | 62 +++---
.../io/sstable/format/big/BigTableReader.java | 22 +-
.../io/sstable/format/big/BigTableWriter.java | 8 +-
.../format/big/SSTableNamesIterator.java | 2 +
.../io/util/DataIntegrityMetadata.java | 8 +-
.../cassandra/io/util/DataOutputBuffer.java | 2 +-
.../cassandra/io/util/PoolingSegmentedFile.java | 1 +
.../cassandra/io/util/RandomAccessReader.java | 4 +
.../cassandra/io/util/SafeMemoryWriter.java | 2 +-
.../cassandra/locator/CloudstackSnitch.java | 13 +-
.../cassandra/locator/PropertyFileSnitch.java | 8 +-
.../apache/cassandra/net/MessagingService.java | 5 +
.../cassandra/net/OutboundTcpConnection.java | 1 +
.../apache/cassandra/security/SSLFactory.java | 1 +
.../cassandra/service/ActiveRepairService.java | 2 +
.../cassandra/service/FileCacheService.java | 1 +
.../apache/cassandra/service/StorageProxy.java | 3 +-
.../cassandra/service/pager/PagingState.java | 3 +-
.../cassandra/streaming/ConnectionHandler.java | 5 +
.../cassandra/streaming/StreamReader.java | 1 +
.../cassandra/streaming/StreamWriter.java | 25 +--
.../compress/CompressedStreamReader.java | 1 +
.../compress/CompressedStreamWriter.java | 18 +-
.../streaming/messages/IncomingFileMessage.java | 1 +
.../streaming/messages/StreamInitMessage.java | 8 +-
.../thrift/CustomTNonBlockingServer.java | 2 +
.../thrift/CustomTThreadPoolServer.java | 15 +-
.../cassandra/thrift/SSLTransportFactory.java | 1 +
.../thrift/TCustomNonblockingServerSocket.java | 1 +
.../cassandra/thrift/TCustomServerSocket.java | 1 +
.../thrift/TFramedTransportFactory.java | 1 +
.../cassandra/thrift/THsHaDisruptorServer.java | 1 +
.../apache/cassandra/tools/SSTableExport.java | 15 +-
.../apache/cassandra/tools/SSTableImport.java | 97 ++++----
.../cassandra/tools/StandaloneScrubber.java | 7 +-
.../cassandra/tools/StandaloneVerifier.java | 8 +-
.../cassandra/utils/BloomFilterSerializer.java | 1 +
.../org/apache/cassandra/utils/FBUtilities.java | 14 +-
.../apache/cassandra/utils/FilterFactory.java | 1 +
.../utils/NativeSSTableLoaderClient.java | 4 +-
.../apache/cassandra/utils/concurrent/Ref.java | 2 +-
.../apache/cassandra/utils/concurrent/Refs.java | 6 +
.../cassandra/utils/obs/OffHeapBitSet.java | 1 +
92 files changed, 704 insertions(+), 531 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d91eb011/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 4d0725c,ad2845f..ebaf169
--- 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
+ * Static Analysis to warn on unsafe use of Autocloseable instances
(CASSANDRA-9431)
* Update commitlog archiving examples now that commitlog segments are
not recycled (CASSANDRA-9350)
* Extend Transactional API to sstable lifecycle management (CASSANDRA-8568)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d91eb011/build.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d91eb011/src/java/org/apache/cassandra/db/SystemKeyspace.java
----------------------------------------------------------------------
