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/10b11835 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/10b11835 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/10b11835 Branch: refs/heads/trunk Commit: 10b11835ac01d769a70c408a92eacca00d06ce47 Parents: f5cf571 9218d74 Author: Robert Stupp <[email protected]> Authored: Wed Sep 16 22:00:57 2015 +0200 Committer: Robert Stupp <[email protected]> Committed: Wed Sep 16 22:00:57 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/cache/AutoSavingCache.java | 195 +++++++++++-------- .../org/apache/cassandra/cache/CacheKey.java | 14 +- .../apache/cassandra/cache/CounterCacheKey.java | 26 +-- .../org/apache/cassandra/cache/KeyCacheKey.java | 19 +- .../org/apache/cassandra/cache/OHCProvider.java | 39 +++- .../org/apache/cassandra/cache/RowCacheKey.java | 34 ++-- .../org/apache/cassandra/config/CFMetaData.java | 10 + .../cassandra/config/DatabaseDescriptor.java | 19 +- .../org/apache/cassandra/config/Schema.java | 58 +++++- .../apache/cassandra/db/ColumnFamilyStore.java | 81 +++----- src/java/org/apache/cassandra/db/Keyspace.java | 6 - .../org/apache/cassandra/db/RowIndexEntry.java | 2 +- .../db/SinglePartitionReadCommand.java | 3 +- .../io/sstable/format/SSTableReader.java | 10 +- .../io/sstable/format/big/BigTableReader.java | 2 +- .../apache/cassandra/service/CacheService.java | 54 +++-- .../cassandra/service/CassandraDaemon.java | 39 +++- .../cassandra/service/StorageService.java | 29 +-- .../org/apache/cassandra/utils/FBUtilities.java | 16 ++ .../cassandra/cache/AutoSavingCacheTest.java | 5 +- .../cassandra/cache/CacheProviderTest.java | 24 ++- .../apache/cassandra/cql3/KeyCacheCqlTest.java | 101 ++++++++++ .../apache/cassandra/db/CounterCacheTest.java | 68 ++++++- .../org/apache/cassandra/db/KeyCacheTest.java | 2 +- .../org/apache/cassandra/db/RowCacheTest.java | 41 +++- 26 files changed, 611 insertions(+), 287 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/10b11835/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/10b11835/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/10b11835/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
