This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit e6a937c934bf9aa738dfa8d6daa4ced48daf8859 Merge: 8d8c6fbc37 35d6e6ce9c Author: Stefan Miklosovic <[email protected]> AuthorDate: Mon Mar 25 14:21:25 2024 +0100 Merge branch 'cassandra-5.0' into trunk CHANGES.txt | 1 + .../apache/cassandra/hints/HintsDescriptor.java | 24 +++- .../org/apache/cassandra/hints/HintsStore.java | 12 +- .../org/apache/cassandra/hints/HintsWriter.java | 13 ++- .../org/apache/cassandra/service/StorageProxy.java | 14 ++- .../distributed/test/HintsMaxSizeTest.java | 128 +++++++++++++++++++++ .../org/apache/cassandra/hints/AlteredHints.java | 3 + .../apache/cassandra/hints/HintsCatalogTest.java | 17 +-- .../apache/cassandra/hints/HintsReaderTest.java | 5 + .../org/apache/cassandra/hints/HintsStoreTest.java | 3 + .../apache/cassandra/hints/HintsUpgradeTest.java | 3 + 11 files changed, 197 insertions(+), 26 deletions(-) diff --cc CHANGES.txt index e92cd81496,e879141be7..5a0ce4117d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -54,9 -28,10 +54,10 @@@ Merged from 5.0 * Fix resource cleanup after SAI query timeouts (CASSANDRA-19177) * Suppress CVE-2023-6481 (CASSANDRA-19184) Merged from 4.1: + * Do not go to disk for reading hints file sizes (CASSANDRA-19477) * Fix system_views.settings to handle array types (CASSANDRA-19475) - * Memoize Cassandra verion and add a backoff interval for failed schema pulls (CASSANDRA-18902) * Fix StackOverflowError on ALTER after many previous schema changes (CASSANDRA-19166) + * Memoize Cassandra verion (CASSANDRA-18902) Merged from 4.0: * Push LocalSessions info logs to debug (CASSANDRA-18335) * Filter remote DC replicas out when constructing the initial replica plan for the local read repair (CASSANDRA-19120) diff --cc test/unit/org/apache/cassandra/hints/HintsReaderTest.java index 77c45c6a12,56154fd950..94be7b2b8e --- a/test/unit/org/apache/cassandra/hints/HintsReaderTest.java +++ b/test/unit/org/apache/cassandra/hints/HintsReaderTest.java @@@ -28,9 -28,9 +28,11 @@@ import java.util.concurrent.TimeUnit import java.util.function.Function; import com.google.common.collect.Iterables; + +import org.apache.cassandra.exceptions.CoordinatorBehindException; import org.apache.cassandra.io.util.File; + + import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; diff --cc test/unit/org/apache/cassandra/hints/HintsUpgradeTest.java index 3d8c443121,78b8f56b50..fd44a96317 --- a/test/unit/org/apache/cassandra/hints/HintsUpgradeTest.java +++ b/test/unit/org/apache/cassandra/hints/HintsUpgradeTest.java @@@ -44,11 -43,12 +44,13 @@@ import org.apache.cassandra.schema.Sche import org.apache.cassandra.schema.TableId; import org.apache.cassandra.schema.TableMetadata; + import static org.hamcrest.Matchers.greaterThan; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; + import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; +@Ignore("TODO: TCM") public class HintsUpgradeTest { static --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
