Merge branch 'cassandra-2.1' into trunk
Conflicts:
src/java/org/apache/cassandra/cql/AlterTableStatement.java
src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java
test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f22e775f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f22e775f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f22e775f
Branch: refs/heads/trunk
Commit: f22e775fbe1d2f08faa59045a2b3c66dd7209a23
Parents: 7e27b55 4e95953
Author: Marcus Eriksson <[email protected]>
Authored: Wed Apr 23 16:28:30 2014 +0200
Committer: Marcus Eriksson <[email protected]>
Committed: Wed Apr 23 16:28:30 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
conf/cassandra.yaml | 15 +-
.../apache/cassandra/cache/AutoSavingCache.java | 2 +-
.../cassandra/cache/RefCountedMemory.java | 15 +-
.../org/apache/cassandra/config/CFMetaData.java | 78 +++--
.../org/apache/cassandra/config/Config.java | 4 +-
.../cassandra/config/DatabaseDescriptor.java | 15 +-
.../cassandra/cql3/statements/CFPropDefs.java | 7 +-
.../apache/cassandra/db/ColumnFamilyStore.java | 13 +-
.../org/apache/cassandra/db/DataTracker.java | 15 +-
.../org/apache/cassandra/db/Directories.java | 2 +-
.../compaction/AbstractCompactionStrategy.java | 2 +-
.../db/compaction/AbstractCompactionTask.java | 4 +-
.../db/compaction/CompactionController.java | 2 +-
.../db/compaction/CompactionManager.java | 91 +++--
.../cassandra/db/compaction/CompactionTask.java | 143 +++-----
.../db/compaction/LeveledCompactionTask.java | 2 +-
.../db/compaction/SSTableSplitter.java | 7 +-
.../cassandra/db/compaction/Scrubber.java | 57 ++--
.../SizeTieredCompactionStrategy.java | 6 +-
.../cassandra/db/compaction/Upgrader.java | 43 +--
.../io/compress/CompressedSequentialWriter.java | 26 +-
.../io/compress/CompressionMetadata.java | 181 +++++-----
.../io/sstable/AbstractSSTableSimpleWriter.java | 2 +-
.../apache/cassandra/io/sstable/Descriptor.java | 49 ++-
.../cassandra/io/sstable/IndexSummary.java | 16 +-
.../io/sstable/IndexSummaryBuilder.java | 75 ++++-
.../apache/cassandra/io/sstable/SSTable.java | 2 -
.../cassandra/io/sstable/SSTableLoader.java | 2 +-
.../cassandra/io/sstable/SSTableReader.java | 119 +++++--
.../cassandra/io/sstable/SSTableRewriter.java | 330 +++++++++++++++++++
.../cassandra/io/sstable/SSTableWriter.java | 117 ++++++-
.../io/sstable/metadata/MetadataCollector.java | 18 +-
.../io/sstable/metadata/MetadataSerializer.java | 2 +-
.../io/util/BufferedPoolingSegmentedFile.java | 5 +
.../io/util/BufferedSegmentedFile.java | 5 +
.../io/util/ChecksummedSequentialWriter.java | 6 +-
.../io/util/CompressedPoolingSegmentedFile.java | 15 +-
.../io/util/CompressedSegmentedFile.java | 24 +-
.../org/apache/cassandra/io/util/FileUtils.java | 5 +
.../org/apache/cassandra/io/util/Memory.java | 32 +-
.../cassandra/io/util/MmappedSegmentedFile.java | 24 +-
.../cassandra/io/util/PoolingSegmentedFile.java | 7 +-
.../apache/cassandra/io/util/SegmentedFile.java | 14 +-
.../cassandra/io/util/SequentialWriter.java | 52 +--
.../cassandra/service/FileCacheService.java | 94 ++++--
.../cassandra/streaming/StreamLockfile.java | 13 +-
.../cassandra/tools/StandaloneScrubber.java | 11 -
.../cassandra/tools/StandaloneSplitter.java | 4 -
.../cassandra/tools/StandaloneUpgrader.java | 3 -
.../org/apache/cassandra/utils/CLibrary.java | 59 ++--
.../cassandra/utils/obs/OffHeapBitSet.java | 5 +-
.../db/compaction/LongCompactionsTest.java | 2 +-
.../cassandra/db/ColumnFamilyStoreTest.java | 63 +++-
.../apache/cassandra/db/DirectoriesTest.java | 23 +-
.../org/apache/cassandra/db/KeyCacheTest.java | 21 +-
.../unit/org/apache/cassandra/db/ScrubTest.java | 23 +-
.../CompressedRandomAccessReaderTest.java | 19 +-
.../cassandra/io/sstable/LegacySSTableTest.java | 2 +-
.../cassandra/io/sstable/SSTableUtils.java | 2 +-
.../metadata/MetadataSerializerTest.java | 5 +-
.../cassandra/io/util/DataOutputTest.java | 2 +-
.../compress/CompressedInputStreamTest.java | 2 +-
63 files changed, 1332 insertions(+), 673 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f22e775f/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f22e775f/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f22e775f/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f22e775f/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f22e775f/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
----------------------------------------------------------------------
