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/2574f05b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2574f05b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2574f05b Branch: refs/heads/trunk Commit: 2574f05bb4b8384339aa1fec255585db535d4fd8 Parents: fdae99d 535c56f Author: Jonathan Ellis <jbel...@apache.org> Authored: Fri Mar 21 21:59:54 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Fri Mar 21 21:59:58 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/DataTracker.java | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2574f05b/src/java/org/apache/cassandra/db/DataTracker.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/DataTracker.java index 30bd360,a1de8e5..c8fc699 --- a/src/java/org/apache/cassandra/db/DataTracker.java +++ b/src/java/org/apache/cassandra/db/DataTracker.java @@@ -556,10 -513,16 +556,16 @@@ public class DataTracke public final Set<SSTableReader> sstables; public final SSTableIntervalTree intervalTree; - View(Memtable memtable, Set<Memtable> pendingFlush, Set<SSTableReader> sstables, Set<SSTableReader> compacting, SSTableIntervalTree intervalTree) + View(List<Memtable> liveMemtables, List<Memtable> flushingMemtables, Set<SSTableReader> sstables, Set<SSTableReader> compacting, SSTableIntervalTree intervalTree) { - assert memtable != null; - assert pendingFlush != null; ++ assert liveMemtables != null; ++ assert flushingMemtables != null; + assert sstables != null; + assert compacting != null; + assert intervalTree != null; + - this.memtable = memtable; - this.memtablesPendingFlush = pendingFlush; + this.liveMemtables = liveMemtables; + this.flushingMemtables = flushingMemtables; this.sstables = sstables; this.compacting = compacting; this.intervalTree = intervalTree;
