This is an automated email from the ASF dual-hosted git repository.
edimitrova pushed a change to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from dc82d48 Merge branch 'cassandra-3.0' into cassandra-3.11
add efde6a7 Refuse DROP COMPACT STORAGE if some 2.x sstables are in use
patch by Sylvain Lebresne; review changes and tests by Ekaterina Dimitrova;
reviewed by Benjamin Lerer and Brandon Williams for CASSANDRA-15897
add b654000 Merge branch 'cassandra-3.0' into cassandra-3.11
No new revisions were added by this update.
Summary of changes:
.circleci/config.yml | 22 +-
CHANGES.txt | 1 +
build.xml | 11 +
.../cql3/statements/AlterTableStatement.java | 133 ++++++++--
.../org/apache/cassandra/db/ColumnFamilyStore.java | 4 +
.../db/compaction/CompactionStrategyManager.java | 3 +-
.../org/apache/cassandra/db/lifecycle/Tracker.java | 43 ++--
.../org/apache/cassandra/gms/ApplicationState.java | 23 +-
src/java/org/apache/cassandra/gms/Gossiper.java | 18 ++
.../org/apache/cassandra/gms/VersionedValue.java | 11 +
.../apache/cassandra/io/sstable/Descriptor.java | 1 +
.../io/sstable/format/VersionAndType.java | 93 +++++++
...n.java => InitialSSTableAddedNotification.java} | 11 +-
.../cassandra/service/SSTablesGlobalTracker.java | 284 +++++++++++++++++++++
.../SSTablesVersionsInUseChangeNotification.java | 50 ++++
.../apache/cassandra/service/StorageService.java | 19 ++
.../upgrade/CompactStorage2to3UpgradeTest.java | 73 +++---
.../upgrade/DropCompactStorageTest.java | 72 ++++++
.../apache/cassandra/db/lifecycle/TrackerTest.java | 31 ++-
.../io/sstable/format/VersionAndTypeTest.java | 51 ++++
.../service/SSTablesGlobalTrackerTest.java | 158 ++++++++++++
21 files changed, 1007 insertions(+), 105 deletions(-)
create mode 100644
src/java/org/apache/cassandra/io/sstable/format/VersionAndType.java
copy
src/java/org/apache/cassandra/notifications/{SSTableAddedNotification.java =>
InitialSSTableAddedNotification.java} (69%)
create mode 100644
src/java/org/apache/cassandra/service/SSTablesGlobalTracker.java
create mode 100644
src/java/org/apache/cassandra/service/SSTablesVersionsInUseChangeNotification.java
create mode 100644
test/distributed/org/apache/cassandra/distributed/upgrade/DropCompactStorageTest.java
create mode 100644
test/unit/org/apache/cassandra/io/sstable/format/VersionAndTypeTest.java
create mode 100644
test/unit/org/apache/cassandra/service/SSTablesGlobalTrackerTest.java
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
