Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/config/CFMetaData.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9c3b967e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9c3b967e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9c3b967e
Branch: refs/heads/cassandra-2.2
Commit: 9c3b967e7186c1c3b6f1c25c627e770187020344
Parents: 6d0cf7d 5aca7d7
Author: Marcus Eriksson <marc...@apache.org>
Authored: Mon Aug 10 09:08:39 2015 +0200
Committer: Marcus Eriksson <marc...@apache.org>
Committed: Mon Aug 10 09:08:39 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
NEWS.txt | 3 +-
.../org/apache/cassandra/config/CFMetaData.java | 10 ++-
.../apache/cassandra/db/ColumnFamilyStore.java | 35 +++++++++
.../cassandra/db/ColumnFamilyStoreMBean.java | 21 +++++
.../compaction/AbstractCompactionStrategy.java | 2 +-
.../compaction/WrappingCompactionStrategy.java | 51 +++++++++---
.../db/compaction/CompactionsCQLTest.java | 82 +++++++++++++++++++-
8 files changed, 190 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c3b967e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a913fe7,462de44..772455c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
-2.1.9
+2.2.1
+ * Add checksum to saved cache files (CASSANDRA-9265)
+ * Log warning when using an aggregate without partition key (CASSANDRA-9737)
+ * Avoid grouping sstables for anticompaction with DTCS (CASSANDRA-9900)
+ * UDF / UDA execution time in trace (CASSANDRA-9723)
+ * Fix broken internode SSL (CASSANDRA-9884)
+Merged from 2.1:
+ * Add new JMX methods to change local compaction strategy (CASSANDRA-9965)
* Write hints for paxos commits (CASSANDRA-7342)
* (cqlsh) Fix timestamps before 1970 on Windows, always
use UTC for timestamp display (CASSANDRA-10000)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c3b967e/NEWS.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c3b967e/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/config/CFMetaData.java
index d8eeaf2,2c6a30c..6468973
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@@ -876,6 -1299,57 +878,12 @@@ public final class CFMetaDat
}
}
+ @Deprecated
+ public AbstractCompactionStrategy
createCompactionStrategyInstance(ColumnFamilyStore cfs)
+ {
+ return createCompactionStrategyInstance(compactionStrategyClass, cfs,
compactionStrategyOptions);
+ }
+
- // converts CFM to thrift CfDef
- public org.apache.cassandra.thrift.CfDef toThrift()
- {
- org.apache.cassandra.thrift.CfDef def = new
org.apache.cassandra.thrift.CfDef(ksName, cfName);
- def.setColumn_type(cfType.name());
-
- if (isSuper())
- {
- def.setComparator_type(comparator.subtype(0).toString());
- def.setSubcomparator_type(comparator.subtype(1).toString());
- }
- else
- {
- def.setComparator_type(comparator.toString());
- }
-
- def.setComment(Strings.nullToEmpty(comment));
- def.setRead_repair_chance(readRepairChance);
- def.setDclocal_read_repair_chance(dcLocalReadRepairChance);
- def.setGc_grace_seconds(gcGraceSeconds);
- def.setDefault_validation_class(defaultValidator == null ? null :
defaultValidator.toString());
- def.setKey_validation_class(keyValidator.toString());
- def.setMin_compaction_threshold(minCompactionThreshold);
- def.setMax_compaction_threshold(maxCompactionThreshold);
- // We only return the alias if only one is set since thrift don't
know about multiple key aliases
- if (partitionKeyColumns.size() == 1)
- def.setKey_alias(partitionKeyColumns.get(0).name.bytes);
- def.setColumn_metadata(ColumnDefinition.toThrift(columnMetadata));
- def.setCompaction_strategy(compactionStrategyClass.getName());
- def.setCompaction_strategy_options(new
HashMap<>(compactionStrategyOptions));
- def.setCompression_options(compressionParameters.asThriftOptions());
- if (bloomFilterFpChance != null)
- def.setBloom_filter_fp_chance(bloomFilterFpChance);
- def.setMin_index_interval(minIndexInterval);
- def.setMax_index_interval(maxIndexInterval);
- def.setMemtable_flush_period_in_ms(memtableFlushPeriod);
- def.setCaching(caching.toThriftCaching());
- def.setCells_per_row_to_cache(caching.toThriftCellsPerRow());
- def.setDefault_time_to_live(defaultTimeToLive);
- def.setSpeculative_retry(speculativeRetry.toString());
- def.setTriggers(TriggerDefinition.toThrift(triggers));
-
- return def;
- }
-
/**
* Returns the ColumnDefinition for {@code name}.
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c3b967e/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c3b967e/src/java/org/apache/cassandra/db/ColumnFamilyStoreMBean.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c3b967e/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c3b967e/src/java/org/apache/cassandra/db/compaction/WrappingCompactionStrategy.java
----------------------------------------------------------------------
