fix toString of hint destination tokens patch by brandonwilliams; reviewed by jbellis for CASSANDRA-4568
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4764a379 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4764a379 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4764a379 Branch: refs/heads/trunk Commit: 4764a379e295bdc68612359a26bf96a8833823c8 Parents: ec76baf Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Aug 28 09:25:26 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Aug 28 09:25:26 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/HintedHandOffManager.java | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4764a379/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index d025bef..6e82d11 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 1.0.12 + * fix toString of hint destination tokens (CASSANDRA-4568) * (Hadoop) fix setting key length for old-style mapred api (CASSANDRA-4534) * (Hadoop) fix iterating through a resultset consisting entirely of tombstoned rows (CASSANDRA-4466) http://git-wip-us.apache.org/repos/asf/cassandra/blob/4764a379/src/java/org/apache/cassandra/db/HintedHandOffManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/HintedHandOffManager.java b/src/java/org/apache/cassandra/db/HintedHandOffManager.java index 01b7f9f..bb5b164 100644 --- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java +++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java @@ -464,10 +464,15 @@ public class HintedHandOffManager implements HintedHandOffManagerMBean List<Row> rows = getHintsSlice(Integer.MAX_VALUE); Map<String, Integer> result = new HashMap<String, Integer>(); + Token.TokenFactory tokenFactory = StorageService.getPartitioner().getTokenFactory(); for (Row r : rows) { - if (r.cf != null) //ignore removed rows - result.put(new String(r.key.key.array()), r.cf.getColumnCount()); + if (r.cf == null) // ignore removed rows + continue; + + int count = r.cf.getColumnCount(); + if (count > 0) + result.put(tokenFactory.toString(r.key.token), count); } return result; }