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/a2b1b8ab Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a2b1b8ab Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a2b1b8ab Branch: refs/heads/trunk Commit: a2b1b8abcbe58c86a0a16c6dbf5955d219955e59 Parents: 56d81ac aa60cde Author: blerer <benjamin.le...@datastax.com> Authored: Tue Sep 22 22:11:50 2015 +0200 Committer: blerer <benjamin.le...@datastax.com> Committed: Tue Sep 22 22:12:11 2015 +0200 ---------------------------------------------------------------------- NEWS.txt | 16 +++--- conf/logback.xml | 55 ++++++++++++++++--- .../cassandra/auth/CassandraAuthorizer.java | 2 +- .../cassandra/auth/CassandraRoleManager.java | 4 +- .../cassandra/auth/PasswordAuthenticator.java | 4 +- .../apache/cassandra/auth/PermissionsCache.java | 2 +- .../org/apache/cassandra/auth/RolesCache.java | 2 +- .../cassandra/batchlog/BatchlogManager.java | 10 ++-- .../batchlog/LegacyBatchlogMigrator.java | 8 +-- .../apache/cassandra/cache/AutoSavingCache.java | 8 +-- .../cassandra/cache/SerializingCache.java | 2 +- .../org/apache/cassandra/client/RingCache.java | 2 +- .../DebuggableScheduledThreadPoolExecutor.java | 2 +- .../DebuggableThreadPoolExecutor.java | 2 +- .../apache/cassandra/cql3/QueryProcessor.java | 6 +-- .../cql3/functions/JavaBasedUDFunction.java | 4 +- .../cassandra/cql3/functions/UDFunction.java | 2 +- .../cql3/statements/CreateIndexStatement.java | 2 +- .../apache/cassandra/db/ColumnFamilyStore.java | 44 +++++++-------- .../apache/cassandra/db/ConsistencyLevel.java | 6 +-- .../db/CounterMutationVerbHandler.java | 2 +- .../db/DefinitionsUpdateVerbHandler.java | 2 +- .../org/apache/cassandra/db/Directories.java | 8 +-- src/java/org/apache/cassandra/db/Keyspace.java | 8 +-- src/java/org/apache/cassandra/db/Memtable.java | 16 +++--- .../db/MigrationRequestVerbHandler.java | 2 +- .../cassandra/db/SchemaCheckVerbHandler.java | 2 +- .../cassandra/db/SizeEstimatesRecorder.java | 6 +-- .../org/apache/cassandra/db/SystemKeyspace.java | 4 +- .../cassandra/db/commitlog/CommitLog.java | 6 +-- .../db/commitlog/CommitLogArchiver.java | 4 +- .../db/commitlog/CommitLogReplayer.java | 22 ++++---- .../db/commitlog/CommitLogSegmentManager.java | 14 ++--- .../db/compaction/CompactionController.java | 4 +- .../db/compaction/CompactionManager.java | 30 +++++------ .../compaction/CompactionStrategyManager.java | 2 +- .../cassandra/db/compaction/CompactionTask.java | 8 +-- .../DateTieredCompactionStrategy.java | 10 ++-- .../compaction/LeveledCompactionStrategy.java | 4 +- .../db/compaction/LeveledManifest.java | 32 +++++------ .../SizeTieredCompactionStrategy.java | 4 +- .../SplittingSizeTieredCompactionWriter.java | 4 +- .../db/lifecycle/LifecycleTransaction.java | 20 +++---- .../cassandra/db/lifecycle/LogTransaction.java | 16 +++--- .../apache/cassandra/db/lifecycle/Tracker.java | 8 +-- .../org/apache/cassandra/dht/BootStrapper.java | 4 +- .../org/apache/cassandra/dht/RangeStreamer.java | 12 ++--- .../cassandra/hadoop/cql3/CqlInputFormat.java | 4 +- .../cassandra/hadoop/cql3/CqlRecordReader.java | 6 +-- ...mitedLocalNodeFirstLocalBalancingPolicy.java | 14 ++--- .../cassandra/hadoop/pig/CqlNativeStorage.java | 2 +- .../apache/cassandra/hints/HintVerbHandler.java | 2 +- .../cassandra/hints/HintsDispatchExecutor.java | 2 +- .../cassandra/index/SecondaryIndexManager.java | 6 +-- .../index/internal/CassandraIndex.java | 6 +-- .../io/sstable/IndexSummaryManager.java | 10 ++-- .../apache/cassandra/io/sstable/SSTable.java | 2 +- .../io/sstable/format/SSTableReader.java | 24 ++++----- .../io/sstable/metadata/MetadataSerializer.java | 8 +-- .../org/apache/cassandra/io/util/FileUtils.java | 8 +-- .../locator/AbstractReplicationStrategy.java | 2 +- .../locator/NetworkTopologyStrategy.java | 2 +- .../cassandra/locator/PropertyFileSnitch.java | 6 +-- .../locator/ReconnectableSnitchHelper.java | 2 +- .../apache/cassandra/locator/TokenMetadata.java | 8 +-- .../net/IncomingStreamingConnection.java | 4 +- .../cassandra/net/IncomingTcpConnection.java | 10 ++-- .../cassandra/net/MessageDeliveryTask.java | 2 +- .../apache/cassandra/net/MessagingService.java | 20 +++---- .../cassandra/net/OutboundTcpConnection.java | 12 ++--- .../cassandra/net/ResponseVerbHandler.java | 2 +- .../apache/cassandra/schema/SchemaKeyspace.java | 2 +- .../cassandra/service/DigestResolver.java | 8 +-- .../apache/cassandra/service/GCInspector.java | 4 +- .../cassandra/service/LoadBroadcaster.java | 4 +- .../apache/cassandra/service/ReadCallback.java | 4 +- .../apache/cassandra/service/StorageProxy.java | 14 ++--- .../cassandra/thrift/CassandraServer.java | 56 ++++++++++---------- .../thrift/CustomTThreadPoolServer.java | 4 +- .../cassandra/thrift/ThriftValidation.java | 4 +- .../org/apache/cassandra/tracing/Tracing.java | 2 +- .../org/apache/cassandra/transport/Message.java | 6 +-- .../cassandra/triggers/CustomClassLoader.java | 2 +- .../org/apache/cassandra/utils/CLibrary.java | 2 +- .../org/apache/cassandra/utils/Mx4jTool.java | 4 +- .../apache/cassandra/utils/OutputHandler.java | 2 +- .../org/apache/cassandra/utils/TopKSampler.java | 2 +- 87 files changed, 383 insertions(+), 338 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a2b1b8ab/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
