merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e0ea4fbe Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e0ea4fbe Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e0ea4fbe Branch: refs/heads/cassandra-2.2 Commit: e0ea4fbee8d09a48977d5de0be73088bcf18e712 Parents: 4e26911 04287d4 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue May 26 13:14:07 2015 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue May 26 13:14:07 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/CacheService.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e0ea4fbe/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index a4430c0,0bff87b..cea6135 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,34 -1,5 +1,35 @@@ -2.0.16: +2.1.6 + * (cqlsh) Better float precision by default (CASSANDRA-9224) + * Improve estimated row count (CASSANDRA-9107) + * Optimize range tombstone memory footprint (CASSANDRA-8603) + * Use configured gcgs in anticompaction (CASSANDRA-9397) + * Warn on misuse of unlogged batches (CASSANDRA-9282) + * Failure detector detects and ignores local pauses (CASSANDRA-9183) + * Add utility class to support for rate limiting a given log statement (CASSANDRA-9029) + * Add missing consistency levels to cassandra-stess (CASSANDRA-9361) + * Fix commitlog getCompletedTasks to not increment (CASSANDRA-9339) + * Fix for harmless exceptions logged as ERROR (CASSANDRA-8564) + * Delete processed sstables in sstablesplit/sstableupgrade (CASSANDRA-8606) + * Improve sstable exclusion from partition tombstones (CASSANDRA-9298) + * Validate the indexed column rather than the cell's contents for 2i (CASSANDRA-9057) + * Add support for top-k custom 2i queries (CASSANDRA-8717) + * Fix error when dropping table during compaction (CASSANDRA-9251) + * cassandra-stress supports validation operations over user profiles (CASSANDRA-8773) + * Add support for rate limiting log messages (CASSANDRA-9029) + * Log the partition key with tombstone warnings (CASSANDRA-8561) + * Reduce runWithCompactionsDisabled poll interval to 1ms (CASSANDRA-9271) + * Fix PITR commitlog replay (CASSANDRA-9195) + * GCInspector logs very different times (CASSANDRA-9124) + * Fix deleting from an empty list (CASSANDRA-9198) + * Update tuple and collection types that use a user-defined type when that UDT + is modified (CASSANDRA-9148, CASSANDRA-9192) + * Use higher timeout for prepair and snapshot in repair (CASSANDRA-9261) + * Fix anticompaction blocking ANTI_ENTROPY stage (CASSANDRA-9151) + * Repair waits for anticompaction to finish (CASSANDRA-9097) + * Fix streaming not holding ref when stream error (CASSANDRA-9295) + * Fix canonical view returning early opened SSTables (CASSANDRA-9396) +Merged from 2.0: + * Fix counting cache serialization in request metrics (CASSANDRA-9466) * (cqlsh) Add LOGIN command to switch users (CASSANDRA-7212) * Clone SliceQueryFilter in AbstractReadCommand implementations (CASSANDRA-8940) * Push correct protocol notification for DROP INDEX (CASSANDRA-9310) http://git-wip-us.apache.org/repos/asf/cassandra/blob/e0ea4fbe/src/java/org/apache/cassandra/service/CacheService.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/CacheService.java index 48c0941,cf0db97..a43d6d5 --- a/src/java/org/apache/cassandra/service/CacheService.java +++ b/src/java/org/apache/cassandra/service/CacheService.java @@@ -460,22 -331,18 +460,22 @@@ public class CacheService implements Ca } } - public class KeyCacheSerializer implements CacheSerializer<KeyCacheKey, RowIndexEntry> + public static class KeyCacheSerializer implements CacheSerializer<KeyCacheKey, RowIndexEntry> { - public void serialize(KeyCacheKey key, DataOutput out) throws IOException + public void serialize(KeyCacheKey key, DataOutputPlus out) throws IOException { - RowIndexEntry entry = CacheService.instance.keyCache.get(key); + RowIndexEntry entry = CacheService.instance.keyCache.getInternal(key); if (entry == null) return; + + CFMetaData cfm = Schema.instance.getCFMetaData(key.cfId); + if (cfm == null) + return; // the table no longer exists. + ByteBufferUtil.writeWithLength(key.key, out); - Descriptor desc = key.desc; - out.writeInt(desc.generation); + out.writeInt(key.desc.generation); out.writeBoolean(true); - RowIndexEntry.serializer.serialize(entry, out); + cfm.comparator.rowIndexEntrySerializer().serialize(entry, out); } public Future<Pair<KeyCacheKey, RowIndexEntry>> deserialize(DataInputStream input, ColumnFamilyStore cfs) throws IOException
