Author: xedin
Date: Sun Oct 30 18:56:25 2011
New Revision: 1195218
URL: http://svn.apache.org/viewvc?rev=1195218&view=rev
Log:
CFMetaData.convertToThrift method to set RowCacheProvider
patch by Marcus Eriksson; reviewed by Pavel Yaskevich for CASSANDRA-3405
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=1195218&r1=1195217&r2=1195218&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Sun Oct 30 18:56:25 2011
@@ -34,7 +34,7 @@
* remove incorrect optimization from slice read path (CASSANDRA-3390)
* Fix race in AntiEntropyService (CASSANDRA-3400)
* fix updating CF row_cache_provider (CASSANDRA-3414)
-
+ * CFMetaData.convertToThrift method to set RowCacheProvider (CASSANDRA-3405)
0.8.7
* Kill server on wrapped OOME such as from FileChannel.map (CASSANDRA-3201)
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=1195218&r1=1195217&r2=1195218&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
Sun Oct 30 18:56:25 2011
@@ -796,6 +796,7 @@ public final class CFMetaData
def.setMemtable_operations_in_millions(cfm.memtableOperationsInMillions);
def.setMerge_shards_chance(cfm.mergeShardsChance);
def.setKey_alias(cfm.getKeyName());
+
def.setRow_cache_provider(cfm.getRowCacheProvider().getClass().getName());
List<org.apache.cassandra.thrift.ColumnDef> column_meta = new
ArrayList< org.apache.cassandra.thrift.ColumnDef>(cfm.column_metadata.size());
for (ColumnDefinition cd : cfm.column_metadata.values())
{
