Merge branch 'cassandra-1.1.0' into cassandra-1.1
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/cql/AlterTableStatement.java
src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java
src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dcf89bfa
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dcf89bfa
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dcf89bfa
Branch: refs/heads/trunk
Commit: dcf89bfaee9e4e28de8aa44b51a3363721956077
Parents: 36a1ea8 75fdb85
Author: Sylvain Lebresne <sylv...@datastax.com>
Authored: Tue Mar 27 17:34:10 2012 +0200
Committer: Sylvain Lebresne <sylv...@datastax.com>
Committed: Tue Mar 27 17:34:10 2012 +0200
----------------------------------------------------------------------
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/config/Avro.java | 2 +-
.../org/apache/cassandra/config/CFMetaData.java | 5 ++++-
.../apache/cassandra/cql/AlterTableStatement.java | 2 ++
src/java/org/apache/cassandra/cql/CFPropDefs.java | 5 ++++-
.../cassandra/cql/CreateColumnFamilyStatement.java | 4 +++-
src/java/org/apache/cassandra/cql3/CFPropDefs.java | 5 ++++-
.../cql3/statements/AlterTableStatement.java | 2 ++
.../statements/CreateColumnFamilyStatement.java | 4 +++-
9 files changed, 25 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/dcf89bfa/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 7a07823,e92ee3f..8cad485
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,12 @@@
+1.1.1-dev
+ * clean up and optimize DataOutputBuffer, used by CQL compression and
+ CompositeType (CASSANDRA-4072)
+ * optimize commitlog checksumming (CASSANDRA-3610)
+ * identify and blacklist corrupted SSTables from future compactions
(CASSANDRA-2261)
+ * Move CfDef and KsDef validation out of thrift (CASSANDRA-4037)
+
+ 1.1-dev
+ * Adds caching and bloomFilterFpChange to CQL options (CASSANDRA-4042)
1.1-beta2
* rename loaded sstables to avoid conflicts with local snapshots
http://git-wip-us.apache.org/repos/asf/cassandra/blob/dcf89bfa/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/dcf89bfa/src/java/org/apache/cassandra/cql/AlterTableStatement.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql/AlterTableStatement.java
index fcaf19c,b8b2e6f..46493b9
--- a/src/java/org/apache/cassandra/cql/AlterTableStatement.java
+++ b/src/java/org/apache/cassandra/cql/AlterTableStatement.java
@@@ -181,12 -181,14 +181,14 @@@ public class AlterTableStatemen
}
}
- cfDef.read_repair_chance =
cfProps.getPropertyDouble(CFPropDefs.KW_READREPAIRCHANCE,
cfDef.read_repair_chance);
- cfDef.dclocal_read_repair_chance =
cfProps.getPropertyDouble(CFPropDefs.KW_DCLOCALREADREPAIRCHANCE,
cfDef.dclocal_read_repair_chance);
- cfDef.gc_grace_seconds =
cfProps.getPropertyInt(CFPropDefs.KW_GCGRACESECONDS, cfDef.gc_grace_seconds);
- cfDef.replicate_on_write =
cfProps.getPropertyBoolean(CFPropDefs.KW_REPLICATEONWRITE,
cfDef.replicate_on_write);
- cfDef.min_compaction_threshold =
cfProps.getPropertyInt(CFPropDefs.KW_MINCOMPACTIONTHRESHOLD,
cfDef.min_compaction_threshold);
- cfDef.max_compaction_threshold =
cfProps.getPropertyInt(CFPropDefs.KW_MAXCOMPACTIONTHRESHOLD,
cfDef.max_compaction_threshold);
- cfDef.caching = cfProps.getPropertyString(CFPropDefs.KW_CACHING,
cfDef.caching);
- cfDef.bloom_filter_fp_chance =
cfProps.getPropertyDouble(CFPropDefs.KW_BF_FP_CHANCE,
cfDef.bloom_filter_fp_chance);
+
cfm.readRepairChance(cfProps.getPropertyDouble(CFPropDefs.KW_READREPAIRCHANCE,
cfm.getReadRepairChance()));
+
cfm.dcLocalReadRepairChance(cfProps.getPropertyDouble(CFPropDefs.KW_DCLOCALREADREPAIRCHANCE,
cfm.getDcLocalReadRepair()));
+
cfm.gcGraceSeconds(cfProps.getPropertyInt(CFPropDefs.KW_GCGRACESECONDS,
cfm.getGcGraceSeconds()));
+
cfm.replicateOnWrite(cfProps.getPropertyBoolean(CFPropDefs.KW_REPLICATEONWRITE,
cfm.getReplicateOnWrite()));
+
cfm.minCompactionThreshold(cfProps.getPropertyInt(CFPropDefs.KW_MINCOMPACTIONTHRESHOLD,
cfm.getMinCompactionThreshold()));
+
cfm.maxCompactionThreshold(cfProps.getPropertyInt(CFPropDefs.KW_MAXCOMPACTIONTHRESHOLD,
cfm.getMaxCompactionThreshold()));
++
cfm.caching(CFMetaData.Caching.fromString(cfProps.getPropertyString(CFPropDefs.KW_CACHING,
cfm.getCaching().toString())));
++
cfm.bloomFilterFpChance(cfProps.getPropertyDouble(CFPropDefs.KW_BF_FP_CHANCE,
cfm.getBloomFilterFpChance()));
if (!cfProps.compactionStrategyOptions.isEmpty())
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/dcf89bfa/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java
index 3fc4499,85d5ee4..edeb260
--- a/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java
+++ b/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java
@@@ -182,7 -188,10 +182,9 @@@ public class CreateColumnFamilyStatemen
.keyAlias(keyAlias)
.compactionStrategyClass(cfProps.compactionStrategyClass)
.compactionStrategyOptions(cfProps.compactionStrategyOptions)
-
.compressionParameters(CompressionParameters.create(cfProps.compressionParameters));
+
.compressionParameters(CompressionParameters.create(cfProps.compressionParameters))
+
.caching(CFMetaData.Caching.fromString(getPropertyString(CFPropDefs.KW_CACHING,
CFMetaData.DEFAULT_CACHING_STRATEGY.toString())))
-
.bloomFilterFpChance(getPropertyDouble(CFPropDefs.KW_BF_FP_CHANCE,
CFMetaData.DEFAULT_BF_FP_CHANCE))
- .validate();
++
.bloomFilterFpChance(getPropertyDouble(CFPropDefs.KW_BF_FP_CHANCE,
CFMetaData.DEFAULT_BF_FP_CHANCE));
}
catch (ConfigurationException e)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/dcf89bfa/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
index 06129e0,5fd9786..8dc19a8
--- a/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
@@@ -142,15 -141,17 +142,17 @@@ public class AlterTableStatement extend
{
if (cfProps.hasProperty(CFPropDefs.KW_COMMENT))
{
- cfDef.comment = cfProps.get(CFPropDefs.KW_COMMENT);
+ cfm.comment(cfProps.get(CFPropDefs.KW_COMMENT));
}
- cfDef.read_repair_chance =
cfProps.getDouble(CFPropDefs.KW_READREPAIRCHANCE, cfDef.read_repair_chance);
- cfDef.dclocal_read_repair_chance =
cfProps.getDouble(CFPropDefs.KW_DCLOCALREADREPAIRCHANCE,
cfDef.dclocal_read_repair_chance);
- cfDef.gc_grace_seconds = cfProps.getInt(CFPropDefs.KW_GCGRACESECONDS,
cfDef.gc_grace_seconds);
- cfDef.replicate_on_write =
cfProps.getBoolean(CFPropDefs.KW_REPLICATEONWRITE, cfDef.replicate_on_write);
- cfDef.min_compaction_threshold =
cfProps.getInt(CFPropDefs.KW_MINCOMPACTIONTHRESHOLD,
cfDef.min_compaction_threshold);
- cfDef.max_compaction_threshold =
cfProps.getInt(CFPropDefs.KW_MAXCOMPACTIONTHRESHOLD,
cfDef.max_compaction_threshold);
- cfDef.caching = cfProps.getString(CFPropDefs.KW_CACHING,
cfDef.caching);
- cfDef.bloom_filter_fp_chance =
cfProps.getDouble(CFPropDefs.KW_BF_FP_CHANCE, cfDef.bloom_filter_fp_chance);
+
cfm.readRepairChance(cfProps.getDouble(CFPropDefs.KW_READREPAIRCHANCE,
cfm.getReadRepairChance()));
+
cfm.dcLocalReadRepairChance(cfProps.getDouble(CFPropDefs.KW_DCLOCALREADREPAIRCHANCE,
cfm.getDcLocalReadRepair()));
+ cfm.gcGraceSeconds(cfProps.getInt(CFPropDefs.KW_GCGRACESECONDS,
cfm.getGcGraceSeconds()));
+
cfm.replicateOnWrite(cfProps.getBoolean(CFPropDefs.KW_REPLICATEONWRITE,
cfm.getReplicateOnWrite()));
+
cfm.minCompactionThreshold(cfProps.getInt(CFPropDefs.KW_MINCOMPACTIONTHRESHOLD,
cfm.getMinCompactionThreshold()));
+
cfm.maxCompactionThreshold(cfProps.getInt(CFPropDefs.KW_MAXCOMPACTIONTHRESHOLD,
cfm.getMaxCompactionThreshold()));
++
cfm.caching(CFMetaData.Caching.fromString(cfProps.getString(CFPropDefs.KW_CACHING,
cfm.getCaching().toString())));
++ cfm.bloomFilterFpChance(cfProps.getDouble(CFPropDefs.KW_BF_FP_CHANCE,
cfm.getBloomFilterFpChance()));
if (!cfProps.compactionStrategyOptions.isEmpty())
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/dcf89bfa/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
----------------------------------------------------------------------
diff --cc
src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
index 5ad532b,da9f4da..0eeee8e
---
a/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
+++
b/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
@@@ -114,7 -116,10 +114,9 @@@ public class CreateColumnFamilyStatemen
.columnAliases(columnAliases)
.valueAlias(valueAlias)
.compactionStrategyOptions(properties.compactionStrategyOptions)
-
.compressionParameters(CompressionParameters.create(properties.compressionParameters));
+
.compressionParameters(CompressionParameters.create(properties.compressionParameters))
+
.caching(CFMetaData.Caching.fromString(properties.getString(CFPropDefs.KW_CACHING,
CFMetaData.DEFAULT_CACHING_STRATEGY.toString())))
-
.bloomFilterFpChance(properties.getDouble(CFPropDefs.KW_BF_FP_CHANCE,
CFMetaData.DEFAULT_BF_FP_CHANCE))
- .validate();
++
.bloomFilterFpChance(properties.getDouble(CFPropDefs.KW_BF_FP_CHANCE,
CFMetaData.DEFAULT_BF_FP_CHANCE));
}
catch (ConfigurationException e)
{
