cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [2/4] git commit: Hex-encode non-String keys in OPP patch by Vara Kumar and jbellis for CASSANDRA-5793
Date Tue, 30 Jul 2013 20:42:53 GMT
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/d735cfdc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d735cfdc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d735cfdc

Branch: refs/heads/trunk
Commit: d735cfdcc9aab8c196035672d69dca0183ee45d3
Parents: 94d7cb4
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Tue Jul 30 15:38:57 2013 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Tue Jul 30 15:41:49 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/d735cfdc/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 1497299..a809bc6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,7 @@
    (CASSANDRA-5824)
  * update default LCS sstable size to 160MB (CASSANDRA-5727)
  * Allow compacting 2Is via nodetool (CASSANDRA-5670)
+ * Hex-encode non-String keys in OPP (CASSANDRA-5793)
 
 
 1.2.8

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d735cfdc/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);
     }


Mime
View raw message