fix nodetool getsstables for blob PK patch by Nate McCall; reviewed by jbellis for CASSANDRA-6803
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/52cf09db Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/52cf09db Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/52cf09db Branch: refs/heads/cassandra-2.0 Commit: 52cf09dbace356bafb846cb9f1fc9df71344f61f Parents: 5030d42 Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Mar 13 13:04:14 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu Mar 13 13:04:14 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/52cf09db/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index a68e8ac..325c623 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 1.2.16 + * fix nodetool getsstables for blob PK (CASSANDRA-6803) * Add CMSClassUnloadingEnabled JVM option (CASSANDRA-6541) * Catch memtable flush exceptions during shutdown (CASSANDRA-6735) * Don't attempt cross-dc forwarding in mixed-version cluster with 1.1 @@ -21,6 +22,7 @@ * Fix bootstrapping when there is no schema (CASSANDRA-6685) * Fix truncating compression metadata (CASSANDRA-6791) + 1.2.15 * Move handling of migration event source to solve bootstrap race (CASSANDRA-6648) * Make sure compaction throughput value doesn't overflow with int math (CASSANDRA-6647) http://git-wip-us.apache.org/repos/asf/cassandra/blob/52cf09db/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java index 3841397..9e6987d 100644 --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@ -1370,7 +1370,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean public List<String> getSSTablesForKey(String key) { - DecoratedKey dk = new DecoratedKey(partitioner.getToken(ByteBuffer.wrap(key.getBytes())), ByteBuffer.wrap(key.getBytes())); + DecoratedKey dk = partitioner.decorateKey(metadata.getKeyValidator().fromString(key)); ViewFragment view = markReferenced(dk); try {