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 48f6a318796c02ba8e2f22b078958200ba37c9a6
Merge: dd4e3fa6df d1101eeccc
Author: Stefan Miklosovic <smikloso...@apache.org>
AuthorDate: Thu May 2 10:48:01 2024 +0200
Merge branch 'cassandra-5.0' into trunk
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/Directories.java | 55 ++++++++++++++----
.../org/apache/cassandra/db/SSTableImporter.java | 4 +-
test/unit/org/apache/cassandra/db/ImportTest.java | 66 ++++++++++++++++++++--
4 files changed, 109 insertions(+), 17 deletions(-)
diff --cc CHANGES.txt
index 19eb240b42,87fb75b057..40a5161ff5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -74,9 -37,11 +74,10 @@@ Merged from 4.1
* Fix hints delivery for a node going down repeatedly (CASSANDRA-19495)
* 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:
+ * Make nodetool import congruent with the documentation by not relying on
the folder structure of the imported SSTable files (CASSANDRA-19401)
* IR may leak SSTables with pending repair when coming from streaming
(CASSANDRA-19182)
* Streaming exception race creates corrupt transaction log files that
prevent restart (CASSANDRA-18736)
* Fix CQL tojson timestamp output on negative timestamp values before
Gregorian calendar reform in 1582 (CASSANDRA-19566)
diff --cc test/unit/org/apache/cassandra/db/ImportTest.java
index f6383b5ef8,b5e6355106..4d7a9efe31
--- a/test/unit/org/apache/cassandra/db/ImportTest.java
+++ b/test/unit/org/apache/cassandra/db/ImportTest.java
@@@ -71,7 -70,12 +71,14 @@@ import static org.junit.Assert.assertTr
public class ImportTest extends CQLTester
{
- @After
- public void afterTest()
+
++ @Override
++ public void afterTest() throws Throwable
+ {
++ super.afterTest();
+ SSTableReader.resetTidying();
+ }
+
@Test
public void basicImportByMovingTest() throws Throwable
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
