Updated Branches: refs/heads/trunk 95ca3a21f -> 710609baf
merge from 1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/710609ba Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/710609ba Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/710609ba Branch: refs/heads/trunk Commit: 710609baf6c798476d990ac4046b9aea93df760d Parents: 95ca3a2 621bc0c Author: Pavel Yaskevich <[email protected]> Authored: Sat Jan 7 17:38:03 2012 +0200 Committer: Pavel Yaskevich <[email protected]> Committed: Sat Jan 7 17:38:03 2012 +0200 ---------------------------------------------------------------------- CHANGES.txt | 2 + src/java/org/apache/cassandra/cli/CliClient.java | 4 + .../cassandra/config/DatabaseDescriptor.java | 5 + .../org/apache/cassandra/cql/QueryProcessor.java | 2 +- src/java/org/apache/cassandra/cql/Relation.java | 23 +---- src/java/org/apache/cassandra/cql/WhereClause.java | 76 ++++++------- .../apache/cassandra/db/HintedHandOffManager.java | 86 ++++++++++----- .../org/apache/cassandra/service/StorageProxy.java | 10 ++ .../cassandra/service/StorageProxyMBean.java | 3 + 9 files changed, 120 insertions(+), 91 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/710609ba/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/710609ba/src/java/org/apache/cassandra/cli/CliClient.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/cli/CliClient.java index ee6b609,60ed3ef..b09561b --- a/src/java/org/apache/cassandra/cli/CliClient.java +++ b/src/java/org/apache/cassandra/cli/CliClient.java @@@ -1637,9 -1659,11 +1637,12 @@@ public class CliClien writeAttr(sb, false, "min_compaction_threshold", cfDef.min_compaction_threshold); writeAttr(sb, false, "max_compaction_threshold", cfDef.max_compaction_threshold); writeAttr(sb, false, "replicate_on_write", cfDef.replicate_on_write); - writeAttr(sb, false, "row_cache_provider", normaliseType(cfDef.row_cache_provider, "org.apache.cassandra.cache")); writeAttr(sb, false, "compaction_strategy", cfDef.compaction_strategy); + writeAttr(sb, false, "caching", cfDef.caching); + + if (cfDef.isSetBloom_filter_fp_chance()) + writeAttr(sb, false, "bloom_filter_fp_chance", cfDef.bloom_filter_fp_chance); + if (!cfDef.compaction_strategy_options.isEmpty()) { StringBuilder cOptions = new StringBuilder(); @@@ -1970,7 -1999,7 +1973,8 @@@ sessionState.out.printf(" Compaction min/max thresholds: %s/%s%n", cf_def.min_compaction_threshold, cf_def.max_compaction_threshold); sessionState.out.printf(" Read repair chance: %s%n", cf_def.read_repair_chance); sessionState.out.printf(" Replicate on write: %s%n", cf_def.replicate_on_write); + sessionState.out.printf(" Caching: %s%n", cf_def.caching); + sessionState.out.printf(" Bloom Filter FP chance: %s%n", cf_def.isSetBloom_filter_fp_chance() ? cf_def.bloom_filter_fp_chance : "default"); // if we have connection to the cfMBean established if (cfMBean != null) http://git-wip-us.apache.org/repos/asf/cassandra/blob/710609ba/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/710609ba/src/java/org/apache/cassandra/cql/QueryProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/710609ba/src/java/org/apache/cassandra/cql/WhereClause.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/710609ba/src/java/org/apache/cassandra/db/HintedHandOffManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/710609ba/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------
