You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by xe...@apache.org on 2012/01/03 16:53:47 UTC
git commit: Fixed avro after CASSANDRA-3667 new parameter introduction
Updated Branches:
refs/heads/trunk b9813ed38 -> 2a7786e45
Fixed avro after CASSANDRA-3667 new parameter introduction
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2a7786e4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2a7786e4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2a7786e4
Branch: refs/heads/trunk
Commit: 2a7786e452caa57d650f3aa8a0b509108bbc900e
Parents: b9813ed
Author: Pavel Yaskevich <po...@gmail.com>
Authored: Tue Jan 3 18:51:20 2012 +0200
Committer: Pavel Yaskevich <po...@gmail.com>
Committed: Tue Jan 3 18:51:20 2012 +0200
----------------------------------------------------------------------
src/avro/internode.genavro | 2 +-
.../org/apache/cassandra/config/CFMetaData.java | 14 +++++++++++++-
2 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a7786e4/src/avro/internode.genavro
----------------------------------------------------------------------
diff --git a/src/avro/internode.genavro b/src/avro/internode.genavro
index d1ea002..c36a83f 100644
--- a/src/avro/internode.genavro
+++ b/src/avro/internode.genavro
@@ -66,7 +66,7 @@ protocol InterNode {
union { null, map<string> } compaction_strategy_options = null;
union { null, map<string> } compression_options = null;
union { null, double } bloom_filter_fp_chance = null;
- string caching = "keys_only";
+ union { null, string } caching = null;
}
@aliases(["org.apache.cassandra.config.avro.KsDef"])
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a7786e4/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/CFMetaData.java b/src/java/org/apache/cassandra/config/CFMetaData.java
index 7a3c266..f86abd9 100644
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@ -388,6 +388,17 @@ public final class CFMetaData
throw new RuntimeException(e);
}
+ Caching caching;
+
+ try
+ {
+ caching = Caching.fromString(cf.caching.toString());
+ }
+ catch (ConfigurationException e)
+ {
+ throw new RuntimeException(e);
+ }
+
return newCFMD.comment(cf.comment.toString())
.readRepairChance(cf.read_repair_chance)
.replicateOnWrite(cf.replicate_on_write)
@@ -396,7 +407,8 @@ public final class CFMetaData
.keyValidator(keyValidator)
.columnMetadata(column_metadata)
.compressionParameters(cp)
- .bloomFilterFpChance(cf.bloom_filter_fp_chance);
+ .bloomFilterFpChance(cf.bloom_filter_fp_chance)
+ .caching(caching);
}
public String getComment()