This is an automated email from the ASF dual-hosted git repository. marcuse pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 69982767e571abf8b414ac2f13a29d1cb0c7fef8 Merge: b171b4ba29 203c61abaf Author: Marcus Eriksson <[email protected]> AuthorDate: Fri Dec 23 14:45:48 2022 +0100 Merge branch 'cassandra-4.1' into trunk CHANGES.txt | 1 + .../compaction/TimeWindowCompactionStrategy.java | 14 +++++++++++++ .../TimeWindowCompactionStrategyTest.java | 24 ++++++++++++++++++++++ .../org/apache/cassandra/schema/MockSchema.java | 14 +++++++++---- 4 files changed, 49 insertions(+), 4 deletions(-) diff --cc CHANGES.txt index ec620e06db,e5c97ddb54..45dbfba0f3 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -165,13 -97,6 +165,14 @@@ Merged from 3.11 * Creating of a keyspace on insufficient number of replicas should filter out gosspping-only members (CASSANDRA-17759) * Suppress CVE-2022-25857 and other snakeyaml CVEs (CASSANDRA-17907) Merged from 3.0: ++ * Avoid anticompaction mixing data from two different time windows with TWCS (CASSANDRA-17970) + * Do not spam the logs with MigrationCoordinator not being able to pull schemas (CASSANDRA-18096) + * Fix incorrect resource name in LIST PERMISSION output (CASSANDRA-17848) + * Suppress CVE-2022-41854 and similar (CASSANDRA-18083) + * Fix running Ant rat targets without git (CASSANDRA-17974) + * Harden JMX by resolving beanshooter issues (CASSANDRA-17921) + * Suppress CVE-2019-2684 (CASSANDRA-17965) + * Fix auto-completing "WITH" when creating a materialized view (CASSANDRA-17879) * Improve libjemalloc resolution in bin/cassandra (CASSANDRA-15767) * Fix restarting of services on gossipping-only member (CASSANDRA-17752) * Fix scrubber falling into infinite loop when the last partition is broken (CASSANDRA-17862) diff --cc test/unit/org/apache/cassandra/schema/MockSchema.java index 853c0b53e0,f5c9986c9e..691abede2a --- a/test/unit/org/apache/cassandra/schema/MockSchema.java +++ b/test/unit/org/apache/cassandra/schema/MockSchema.java @@@ -131,9 -126,9 +131,14 @@@ public class MockSchem return sstable(generation, size, false, generation, generation, level, cfs); } + public static SSTableReader sstableWithTimestamp(int generation, long timestamp, ColumnFamilyStore cfs) + { - return sstable(generation, 0, false, 0, 1000, 0, Integer.MAX_VALUE, timestamp, cfs); ++ return sstable(generation, 0, false, 0, 1000, 0, cfs, Integer.MAX_VALUE, timestamp); ++ } ++ + public static SSTableReader sstable(int generation, int size, boolean keepRef, long firstToken, long lastToken, int level, ColumnFamilyStore cfs) + { + return sstable(generation, size, keepRef, firstToken, lastToken, level, cfs, Integer.MAX_VALUE); } public static SSTableReader sstable(int generation, int size, boolean keepRef, long firstToken, long lastToken, ColumnFamilyStore cfs) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
