This is an automated email from the ASF dual-hosted git repository.
edimitrova pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 0e990d7 Merge branch 'cassandra-3.11' into trunk
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
new c7432e9 Merge branch 'cassandra-3.11' into trunk
The 1 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 +
build.xml | 2 +-
.../statements/schema/AlterTableStatement.java | 93 ++++++-
.../org/apache/cassandra/db/ColumnFamilyStore.java | 4 +
.../db/compaction/CompactionStrategyManager.java | 5 +-
.../org/apache/cassandra/db/lifecycle/Tracker.java | 61 +++--
.../org/apache/cassandra/gms/ApplicationState.java | 17 ++
.../cassandra/gms/GossipDigestAckVerbHandler.java | 2 +-
src/java/org/apache/cassandra/gms/Gossiper.java | 42 ++-
.../org/apache/cassandra/gms/VersionedValue.java | 12 +-
.../apache/cassandra/io/sstable/Descriptor.java | 7 +
.../cassandra/io/sstable/format/Version.java | 1 -
.../io/sstable/format/VersionAndType.java | 93 +++++++
...n.java => InitialSSTableAddedNotification.java} | 13 +-
src/java/org/apache/cassandra/schema/Schema.java | 3 +-
.../cassandra/schema/SchemaTransformation.java | 4 +-
.../cassandra/service/SSTablesGlobalTracker.java | 284 +++++++++++++++++++++
.../SSTablesVersionsInUseChangeNotification.java | 50 ++++
.../apache/cassandra/service/StartupChecks.java | 5 +-
.../apache/cassandra/service/StorageService.java | 19 ++
.../upgrade/CompactStorage3to4UpgradeTest.java | 4 +
.../validation/operations/CompactTableTest.java | 1 -
.../apache/cassandra/db/lifecycle/TrackerTest.java | 31 ++-
.../io/sstable/format/VersionAndTypeTest.java | 51 ++++
.../service/SSTablesGlobalTrackerTest.java | 158 ++++++++++++
25 files changed, 891 insertions(+), 72 deletions(-)
create mode 100644
src/java/org/apache/cassandra/io/sstable/format/VersionAndType.java
copy
src/java/org/apache/cassandra/notifications/{SSTableDeletingNotification.java
=> InitialSSTableAddedNotification.java} (65%)
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/unit/org/apache/cassandra/io/sstable/format/VersionAndTypeTest.java
create mode 100644
test/unit/org/apache/cassandra/service/SSTablesGlobalTrackerTest.java
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
