natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-4.1' into trunk

This commit is contained in:
Jon Meredith 2023-04-21 10:57:29 -06:00
parent 976b8395f9 4c13df58cb
commit 8df072e104
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -127,6 +127,8 @@
* Add new CQL function maxWritetime (CASSANDRA-17425)
* Add guardrail for ALTER TABLE ADD / DROP / REMOVE column operations (CASSANDRA-17495)
* Rename DisableFlag class to EnableFlag on guardrails (CASSANDRA-17544)
Merged from 4.0:
* Deadlock updating sstable metadata if disk boundaries need reloading (CASSANDRA-18443)
4.1.2
* Allow keystore and trustrore passwords to be nullable (CASSANDRA-18124)

3
src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java
View File

@ -865,8 +865,7 @@ public class CompactionStrategyManager implements INotificationConsumer
*/
private void handleMetadataChangedNotification(SSTableReader sstable, StatsMetadata oldMetadata)
{
AbstractCompactionStrategy acs = getCompactionStrategyFor(sstable);
acs.metadataChanged(oldMetadata, sstable);
compactionStrategyFor(sstable).metadataChanged(oldMetadata, sstable);
}
/**