Author: slebresne
Date: Fri Oct 21 13:43:07 2011
New Revision: 1187339
URL: http://svn.apache.org/viewvc?rev=1187339&view=rev
Log:
Correctly serialize key_validation_class for avro
patch by amorton; reviewed by slebresne for CASSANDRA-3391
Modified:
cassandra/branches/cassandra-0.8/CHANGES.txt
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/CFMetaData.java
Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1187339&r1=1187338&r2=1187339&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Fri Oct 21 13:43:07 2011
@@ -27,6 +27,7 @@
* CLI `describe keyspace <ks>` to show "Row Cache Provider" (CASSANDRA-3384)
* avoid locking on update when no indexes are involved (CASSANDRA-3386)
* fix assertionError during repair with ordered partitioners (CASSANDRA-3369)
+ * correctly serialize key_validation_class for avro (CASSANDRA-3391)
0.8.7
Modified:
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/CFMetaData.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/CFMetaData.java?rev=1187339&r1=1187338&r2=1187339&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/CFMetaData.java
(original)
+++
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/CFMetaData.java
Fri Oct 21 13:43:07 2011
@@ -839,7 +839,7 @@ public final class CFMetaData
def.memtable_throughput_in_mb = cfm.memtableThroughputInMb;
def.memtable_operations_in_millions = cfm.memtableOperationsInMillions;
def.merge_shards_chance = cfm.mergeShardsChance;
- def.key_validation_class = cfm.keyValidator.getClass().getName();
+ def.key_validation_class = cfm.keyValidator.toString();
def.key_alias = cfm.keyAlias;
List<org.apache.cassandra.db.migration.avro.ColumnDef> column_meta =
new
ArrayList<org.apache.cassandra.db.migration.avro.ColumnDef>(cfm.column_metadata.size());
for (ColumnDefinition cd : cfm.column_metadata.values())
