merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6362b946 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6362b946 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6362b946 Branch: refs/heads/trunk Commit: 6362b9461a9234a767e821b7f30825da952668cb Parents: d280349 d2f43e4 Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Jul 29 14:19:29 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Jul 29 14:19:29 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../db/compaction/LeveledCompactionStrategy.java | 14 ++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6362b946/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index deb0333,9a348f1..78d829a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,12 -1,9 +1,14 @@@ -1.2.9 +2.0.0-rc1 + * fix potential spurious wakeup in AsyncOneResponse (CASSANDRA-5690) + * fix schema-related trigger issues (CASSANDRA-5774) + * Better validation when accessing CQL3 table from thrift (CASSANDRA-5138) + * Fix assertion error during repair (CASSANDRA-5801) + * Fix range tombstone bug (CASSANDRA-5805) + * DC-local CAS (CASSANDRA-5797) + * Add a native_protocol_version column to the system.local table (CASSANRDA-5819) +Merged from 1.2: + * update default LCS sstable size to 160MB (CASSANDRA-5727) - - -1.2.8 + * Fix reading DeletionTime from 1.1-format sstables (CASSANDRA-5814) * cqlsh: add collections support to COPY (CASSANDRA-5698) * retry important messages for any IOException (CASSANDRA-5804) * Allow empty IN relations in SELECT/UPDATE/DELETE statements (CASSANDRA-5626) http://git-wip-us.apache.org/repos/asf/cassandra/blob/6362b946/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java index d29dead,f9d8964..292220d --- a/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java +++ b/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java @@@ -52,16 -52,17 +52,18 @@@ public class LeveledCompactionStrategy public LeveledCompactionStrategy(ColumnFamilyStore cfs, Map<String, String> options) { super(cfs, options); - int configuredMaxSSTableSize = 5; + int configuredMaxSSTableSize = 160; + SizeTieredCompactionStrategyOptions localOptions = new SizeTieredCompactionStrategyOptions(options); if (options != null) { - String value = options.containsKey(SSTABLE_SIZE_OPTION) ? options.get(SSTABLE_SIZE_OPTION) : "5"; - configuredMaxSSTableSize = Integer.parseInt(value); - if (configuredMaxSSTableSize >= 1000) + if (options.containsKey(SSTABLE_SIZE_OPTION)) { - // Yes, people have done this - logger.warn("Max sstable size of {}MB is configured; having a unit of compaction this large is probably a bad idea", configuredMaxSSTableSize); + configuredMaxSSTableSize = Integer.parseInt(options.get(SSTABLE_SIZE_OPTION)); + if (configuredMaxSSTableSize >= 1000) + { + // Yes, people have done this + logger.warn("Max sstable size of {}MB is configured; having a unit of compaction this large is probably a bad idea", configuredMaxSSTableSize); + } } } maxSSTableSizeInMB = configuredMaxSSTableSize;
