This is an automated email from the ASF dual-hosted git repository.

marcuse pushed a change to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


    from 2d90e3c  Merge branch 'cassandra-3.0' into cassandra-3.11
     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

The 2 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    |   9 +-
 .../apache/cassandra/db/compaction/Scrubber.java   |   5 +
 .../apache/cassandra/db/compaction/Verifier.java   |   5 +
 .../org/apache/cassandra/db/view/ViewBuilder.java  |  10 +-
 .../cassandra/index/SecondaryIndexBuilder.java     |   4 +
 .../cassandra/io/sstable/IndexSummaryManager.java  |   2 +
 .../io/sstable/IndexSummaryRedistribution.java     |   6 ++
 .../db/compaction/AntiCompactionTest.java          |   2 +-
 .../db/compaction/CancelCompactionsTest.java       | 105 +++++++++++++++++++++
 .../io/sstable/IndexSummaryManagerTest.java        |  40 ++++++++
 16 files changed, 259 insertions(+), 17 deletions(-)
 create mode 100644 
test/unit/org/apache/cassandra/db/compaction/CancelCompactionsTest.java


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to