merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a1015054 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a1015054 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a1015054 Branch: refs/heads/trunk Commit: a10150542c662a4cc69ce1b88f48636d1e6884f7 Parents: 87b39c8 02a9302 Author: Jonathan Ellis <[email protected]> Authored: Fri Nov 22 17:07:37 2013 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Fri Nov 22 17:07:37 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 4 ++++ .../apache/cassandra/db/compaction/LeveledManifest.java | 11 ++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a1015054/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index f54afe1,e85ba23..3fdb8e7 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,20 -1,7 +1,24 @@@ +2.1 + * allocate fixed index summary memory pool and resample cold index summaries + to use less memory (CASSANDRA-5519) + * Removed multithreaded compaction (CASSANDRA-6142) + * Parallelize fetching rows for low-cardinality indexes (CASSANDRA-1337) + * change logging from log4j to logback (CASSANDRA-5883) + * switch to LZ4 compression for internode communication (CASSANDRA-5887) + * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971) + * Remove 1.2 network compatibility code (CASSANDRA-5960) + * Remove leveled json manifest migration code (CASSANDRA-5996) + * Remove CFDefinition (CASSANDRA-6253) + * Use AtomicIntegerFieldUpdater in RefCountedMemory (CASSANDRA-6278) + * User-defined types for CQL3 (CASSANDRA-5590) + * Use of o.a.c.metrics in nodetool (CASSANDRA-5871) + * Batch read from OTC's queue and cleanup (CASSANDRA-1632) + + + 2.0.4 + * Fix setting last compacted key in the wrong level for LCS (CASSANDRA-6284) + + 2.0.3 * Fix FD leak on slice read path (CASSANDRA-6275) * Cancel read meter task when closing SSTR (CASSANDRA-6358) http://git-wip-us.apache.org/repos/asf/cassandra/blob/a1015054/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/compaction/LeveledManifest.java index 2b79493,5690bd8..76f51d1 --- a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java +++ b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java @@@ -145,13 -152,9 +150,9 @@@ public class LeveledManifes if (logger.isDebugEnabled()) logger.debug("Adding [{}]", toString(added)); - int minLevel = Integer.MAX_VALUE; for (SSTableReader ssTableReader : added) - { - minLevel = Math.min(minLevel, ssTableReader.getSSTableLevel()); add(ssTableReader); - } - lastCompactedKeys[minLevel] = SSTable.sstableOrdering.max(added).last; + lastCompactedKeys[minLevel] = SSTableReader.sstableOrdering.max(added).last; } public synchronized void repairOverlappingSSTables(int level)
