You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2012/01/04 04:15:28 UTC
[1/11] git commit: merge from 1.0
Updated Branches:
refs/heads/3624 [created] aca3d26c6
refs/heads/cassandra-1.0 52e671a31 -> 1a3a52642
refs/heads/trunk e75c53ea1 -> 18ce201a0
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/18ce201a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/18ce201a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/18ce201a
Branch: refs/heads/trunk
Commit: 18ce201a0787f4b837cd8840a292535a9115a47a
Parents: e75c53e 1a3a526
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Jan 3 21:14:47 2012 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Jan 3 21:14:47 2012 -0600
----------------------------------------------------------------------
CHANGES.txt | 4 +
.../db/compaction/CompactionIterable.java | 2 +-
.../cassandra/db/compaction/PrecompactedRow.java | 10 +-
.../compaction/SizeTieredCompactionStrategy.java | 10 +-
.../cassandra/streaming/IncomingStreamReader.java | 9 +-
.../cassandra/service/ConsistencyLevelTest.java | 191 ---------------
6 files changed, 24 insertions(+), 202 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/18ce201a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 3be6393,287fed8..15c829a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,47 -1,5 +1,48 @@@
+1.1-dev
+ * avoid returning internal Cassandra classes over JMX (CASSANDRA-2805)
+ * add row-level isolation via SnapTree (CASSANDRA-2893)
+ * Optimize key count estimation when opening sstable on startup
+ (CASSANDRA-2988)
+ * multi-dc replication optimization supporting CL > ONE (CASSANDRA-3577)
+ * add command to stop compactions (CASSANDRA-1740, 3566, 3582)
+ * multithreaded streaming (CASSANDRA-3494)
+ * removed in-tree redhat spec (CASSANDRA-3567)
+ * "defragment" rows for name-based queries under STCS, again (CASSANDRA-2503)
+ * Recycle commitlog segments for improved performance
+ (CASSANDRA-3411, 3543, 3557, 3615)
+ * update size-tiered compaction to prioritize small tiers (CASSANDRA-2407)
+ * add message expiration logic to OutboundTcpConnection (CASSANDRA-3005)
+ * off-heap cache to use sun.misc.Unsafe instead of JNA (CASSANDRA-3271)
+ * EACH_QUORUM is only supported for writes (CASSANDRA-3272)
+ * replace compactionlock use in schema migration by checking CFS.isValid
+ (CASSANDRA-3116)
+ * recognize that "SELECT first ... *" isn't really "SELECT *" (CASSANDRA-3445)
+ * Use faster bytes comparison (CASSANDRA-3434)
+ * Bulk loader is no longer a fat client, (HADOOP) bulk load output format
+ (CASSANDRA-3045)
+ * remove assumption that keys and token are in bijection
+ (CASSANDRA-1034, 3574, 3604)
+ * always remove endpoints from delevery queue in HH (CASSANDRA-3546)
+ * fix race between cf flush and its 2ndary indexes flush (CASSANDRA-3547)
+ * fix potential race in AES when a repair fails (CASSANDRA-3548)
+ * Remove columns shadowed by a deleted container even when we cannot purge
+ (CASSANDRA-3538)
+ * Improve memtable slice iteration performance (CASSANDRA-3545)
+ * more efficient allocation of small bloom filters (CASSANDRA-3618)
+ * Use separate writer thread in SSTableSimpleUnsortedWriter (CASSANDRA-3619)
+ * fsync the directory after new sstable or commitlog segment are created (CASSANDRA-3250)
+ * fix minor issues reported by FindBugs (CASSANDRA-3658)
+ * global key/row caches (CASSANDRA-3143)
+ * optimize memtable iteration during range scan (CASSANDRA-3638)
+ * introduce 'crc_check_chance' in CompressionParameters to support
+ a checksum percentage checking chance similarly to read-repair (CASSANDRA-3611)
+ * a way to deactivate global key/row cache on per-CF basis (CASSANDRA-3667)
+ * fix LeveledCompactionStrategy broken because of generation pre-allocation
+ in LeveledManifest (CASSANDRA-3691)
+
+
1.0.7
+ * retry failed stream on IOException (CASSANDRA-3686)
* allow configuring bloom_filter_fp_chance (CASSANDRA-3497)
* attempt hint delivery every ten minutes, or when failure detector
notifies us that a node is back up, whichever comes first. hint
http://git-wip-us.apache.org/repos/asf/cassandra/blob/18ce201a/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/18ce201a/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java
index 171692e,6f6adbc..95db17d
--- a/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java
+++ b/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java
@@@ -40,13 -40,15 +40,15 @@@ public class SizeTieredCompactionStrate
public SizeTieredCompactionStrategy(ColumnFamilyStore cfs, Map<String, String> options)
{
- super(cfs, options);
- this.estimatedRemainingTasks = 0;
- String optionValue = options.get(MIN_SSTABLE_SIZE_KEY);
- minSSTableSize = (null != optionValue) ? Long.parseLong(optionValue) : DEFAULT_MIN_SSTABLE_SIZE;
+ super(cfs, options);
+ this.estimatedRemainingTasks = 0;
+ String optionValue = options.get(MIN_SSTABLE_SIZE_KEY);
+ minSSTableSize = (null != optionValue) ? Long.parseLong(optionValue) : DEFAULT_MIN_SSTABLE_SIZE;
+ cfs.setMaximumCompactionThreshold(cfs.metadata.getMaxCompactionThreshold());
+ cfs.setMinimumCompactionThreshold(cfs.metadata.getMinCompactionThreshold());
}
- public List<AbstractCompactionTask> getBackgroundTasks(final int gcBefore)
+ public AbstractCompactionTask getNextBackgroundTask(final int gcBefore)
{
if (cfs.isCompactionDisabled())
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/18ce201a/src/java/org/apache/cassandra/streaming/IncomingStreamReader.java
----------------------------------------------------------------------