Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5006e1c8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5006e1c8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5006e1c8 Branch: refs/heads/cassandra-3.3 Commit: 5006e1c810bb4ada0b795227465733dae1ec8087 Parents: 2e19d98 968b134 Author: Marcus Eriksson <marc...@apache.org> Authored: Thu Jan 21 09:12:03 2016 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Thu Jan 21 09:12:03 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/service/ActiveRepairService.java | 9 ++++----- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5006e1c8/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5006e1c8/src/java/org/apache/cassandra/service/ActiveRepairService.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/ActiveRepairService.java index 4722156,9ac1186..46d1e2c --- a/src/java/org/apache/cassandra/service/ActiveRepairService.java +++ b/src/java/org/apache/cassandra/service/ActiveRepairService.java @@@ -426,14 -428,17 +426,17 @@@ public class ActiveRepairServic public final boolean isIncremental; private final boolean isGlobal; - public ParentRepairSession(List<ColumnFamilyStore> columnFamilyStores, Collection<Range<Token>> ranges, boolean isIncremental, boolean isGlobal, long repairedAt) + public ParentRepairSession(List<ColumnFamilyStore> columnFamilyStores, Collection<Range<Token>> ranges, boolean isIncremental, long repairedAt, boolean isGlobal) { for (ColumnFamilyStore cfs : columnFamilyStores) + { this.columnFamilyStores.put(cfs.metadata.cfId, cfs); + sstableMap.put(cfs.metadata.cfId, new HashSet<SSTableReader>()); + } this.ranges = ranges; this.repairedAt = repairedAt; - this.isGlobal = isGlobal; this.isIncremental = isIncremental; + this.isGlobal = isGlobal; } public void addSSTables(UUID cfId, Set<SSTableReader> sstables)
