Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/becee6ae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/becee6ae Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/becee6ae Branch: refs/heads/trunk Commit: becee6ae4a04f76d5998de1814c9d6e0164d998d Parents: 7d2a96e b31845c Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue Aug 4 12:16:04 2015 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Tue Aug 4 12:16:04 2015 +0300 ---------------------------------------------------------------------- NEWS.txt | 8 +- .../apache/cassandra/cache/CachingOptions.java | 291 ---------- .../org/apache/cassandra/config/CFMetaData.java | 540 +++++------------ src/java/org/apache/cassandra/cql3/Cql.g | 12 +- .../AlterMaterializedViewStatement.java | 16 +- .../cql3/statements/AlterTableStatement.java | 19 +- .../cassandra/cql3/statements/CFPropDefs.java | 222 ------- .../cassandra/cql3/statements/CFProperties.java | 4 +- .../cql3/statements/CreateTableStatement.java | 56 +- .../cql3/statements/KeyspaceAttributes.java | 36 +- .../cql3/statements/TableAttributes.java | 153 +++++ .../apache/cassandra/db/ColumnFamilyStore.java | 71 +-- .../cassandra/db/HintedHandOffManager.java | 2 +- .../org/apache/cassandra/db/LivenessInfo.java | 2 +- src/java/org/apache/cassandra/db/Memtable.java | 2 +- .../apache/cassandra/db/RowUpdateBuilder.java | 2 +- .../db/SinglePartitionReadCommand.java | 4 +- .../org/apache/cassandra/db/SystemKeyspace.java | 21 +- .../cassandra/db/commitlog/CommitLog.java | 4 +- .../db/commitlog/CommitLogArchiver.java | 5 +- .../db/commitlog/CommitLogReplayer.java | 4 +- .../db/compaction/CompactionManager.java | 4 +- .../compaction/CompactionStrategyManager.java | 36 +- .../DateTieredCompactionStrategy.java | 12 +- .../cassandra/db/compaction/Scrubber.java | 2 +- .../SizeTieredCompactionStrategy.java | 14 +- .../cassandra/db/compaction/Upgrader.java | 2 +- .../apache/cassandra/db/rows/BufferCell.java | 4 +- .../cassandra/db/view/MaterializedView.java | 5 +- .../dht/OrderPreservingPartitioner.java | 2 +- .../apache/cassandra/hadoop/ConfigHelper.java | 6 +- .../io/compress/CompressedSequentialWriter.java | 4 +- .../io/compress/CompressionMetadata.java | 15 +- .../io/compress/CompressionParameters.java | 564 ------------------ .../cassandra/io/compress/LZ4Compressor.java | 3 +- .../io/sstable/IndexSummaryManager.java | 4 +- .../io/sstable/format/SSTableReader.java | 26 +- .../io/sstable/format/SSTableWriter.java | 6 +- .../io/sstable/format/big/BigTableWriter.java | 6 +- .../cassandra/io/util/SequentialWriter.java | 4 +- .../apache/cassandra/schema/CachingParams.java | 196 +++++++ .../cassandra/schema/CompactionParams.java | 304 ++++++++++ .../cassandra/schema/CompressionParams.java | 579 +++++++++++++++++++ .../apache/cassandra/schema/KeyspaceParams.java | 95 +-- .../cassandra/schema/LegacySchemaMigrator.java | 122 ++-- .../cassandra/schema/ReplicationParams.java | 106 ++++ .../apache/cassandra/schema/SchemaKeyspace.java | 142 ++--- .../cassandra/schema/SpeculativeRetryParam.java | 160 +++++ .../apache/cassandra/schema/TableParams.java | 338 +++++++++++ .../cassandra/service/AbstractReadExecutor.java | 9 +- .../apache/cassandra/service/CacheService.java | 2 +- .../cassandra/service/StorageService.java | 2 +- .../streaming/compress/CompressionInfo.java | 12 +- .../cassandra/thrift/CassandraServer.java | 7 +- .../cassandra/thrift/ThriftConversion.java | 181 ++++-- .../org/apache/cassandra/utils/FBUtilities.java | 8 +- .../utils/NativeSSTableLoaderClient.java | 2 +- .../db/compaction/LongCompactionsTest.java | 10 +- .../LongLeveledCompactionStrategyTest.java | 4 +- test/unit/org/apache/cassandra/MockSchema.java | 4 +- .../unit/org/apache/cassandra/SchemaLoader.java | 50 +- .../apache/cassandra/config/CFMetaDataTest.java | 4 +- .../validation/entities/SecondaryIndexTest.java | 2 +- .../miscellaneous/CrcCheckChanceTest.java | 12 +- .../validation/miscellaneous/OverflowTest.java | 8 +- .../cql3/validation/operations/AlterTest.java | 14 +- .../SelectOrderedPartitionerTest.java | 2 +- .../apache/cassandra/db/HintedHandOffTest.java | 2 - .../apache/cassandra/db/RangeTombstoneTest.java | 5 - .../apache/cassandra/db/RowCacheCQLTest.java | 2 +- .../org/apache/cassandra/db/RowCacheTest.java | 7 +- .../unit/org/apache/cassandra/db/ScrubTest.java | 2 +- .../org/apache/cassandra/db/VerifyTest.java | 12 +- .../db/commitlog/CommitLogUpgradeTest.java | 2 +- .../db/compaction/AntiCompactionTest.java | 1 - .../compaction/BlacklistingCompactionsTest.java | 4 +- .../db/compaction/CompactionsPurgeTest.java | 7 +- .../db/compaction/CompactionsTest.java | 11 +- .../LeveledCompactionStrategyTest.java | 9 +- .../db/compaction/OneCompactionTest.java | 9 +- .../SizeTieredCompactionStrategyTest.java | 5 +- .../db/view/MaterializedViewUtilsTest.java | 6 +- .../CompressedRandomAccessReaderTest.java | 12 +- .../CompressedSequentialWriterTest.java | 17 +- .../io/sstable/IndexSummaryManagerTest.java | 49 +- .../cassandra/io/sstable/SSTableReaderTest.java | 6 +- .../org/apache/cassandra/schema/DefsTest.java | 23 +- .../schema/LegacySchemaMigratorTest.java | 61 +- .../cassandra/schema/SchemaKeyspaceTest.java | 6 +- .../service/StorageServiceServerTest.java | 13 +- .../compression/CompressedInputStreamTest.java | 5 +- 91 files changed, 2625 insertions(+), 2219 deletions(-) ----------------------------------------------------------------------