This is an automated email from the ASF dual-hosted git repository.
marcuse pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from f6c1dea Merge branch 'cassandra-3.11' into trunk
new b40d79c Make sure index summary redistributions don't start when
compactions are paused
new 4b547f1 Merge branch 'cassandra-3.0' into cassandra-3.11
new f9b46ae Merge branch 'cassandra-3.11' into trunk
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGES.txt | 1 +
.../apache/cassandra/cache/AutoSavingCache.java | 5 ++
.../org/apache/cassandra/db/ColumnFamilyStore.java | 43 +++++++++++--
.../cassandra/db/compaction/CompactionInfo.java | 8 ++-
.../db/compaction/CompactionIterator.java | 5 ++
.../cassandra/db/compaction/CompactionManager.java | 26 ++++++++
.../cassandra/db/compaction/CompactionTask.java | 10 +--
.../apache/cassandra/db/compaction/Scrubber.java | 5 ++
.../apache/cassandra/db/compaction/Verifier.java | 5 ++
.../apache/cassandra/db/view/ViewBuilderTask.java | 5 ++
.../cassandra/index/SecondaryIndexBuilder.java | 5 ++
.../cassandra/io/sstable/IndexSummaryManager.java | 2 +
.../io/sstable/IndexSummaryRedistribution.java | 6 ++
.../db/compaction/CancelCompactionsTest.java | 72 +++++++++++++++++++++-
.../db/repair/PendingAntiCompactionTest.java | 15 +++++
.../io/sstable/IndexSummaryManagerTest.java | 46 +++++++++++++-
16 files changed, 246 insertions(+), 13 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
