Updated Branches: refs/heads/trunk ef29c82e8 -> cb981e624
Hex-encode non-String keys in OPP patch by Vara Kumar and jbellis for CASSANDRA-5793 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2ccbe3c6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2ccbe3c6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2ccbe3c6 Branch: refs/heads/trunk Commit: 2ccbe3c6f547511e79454b79cbef682ef8a6973a Parents: 97bc9c7 Author: Jonathan Ellis <[email protected]> Authored: Tue Jul 30 15:38:57 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Tue Jul 30 15:38:57 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/dht/OrderPreservingPartitioner.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ccbe3c6/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 8578855..c20c0fe 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -3,6 +3,7 @@ * (Hadoop) fix quoting in CqlPagingRecordReader and CqlRecordWriter (CASSANDRA-5824) * update default LCS sstable size to 160MB (CASSANDRA-5727) + * Hex-encode non-String keys in OPP (CASSANDRA-5793) 1.2.8 http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ccbe3c6/src/java/org/apache/cassandra/dht/OrderPreservingPartitioner.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/dht/OrderPreservingPartitioner.java b/src/java/org/apache/cassandra/dht/OrderPreservingPartitioner.java index 9445ab0..3384713 100644 --- a/src/java/org/apache/cassandra/dht/OrderPreservingPartitioner.java +++ b/src/java/org/apache/cassandra/dht/OrderPreservingPartitioner.java @@ -169,7 +169,7 @@ public class OrderPreservingPartitioner extends AbstractPartitioner<StringToken> } catch (CharacterCodingException e) { - throw new RuntimeException("The provided key was not UTF8 encoded.", e); + skey = ByteBufferUtil.bytesToHex(key); } return new StringToken(skey); }
