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

Merge branch 'cassandra-6.0' into trunk

This commit is contained in:
Stefan Miklosovic 2026-06-24 11:26:16 +02:00
parent aaae5b6417 0673d743aa
commit 0324f01de2
No known key found for this signature in database
GPG Key ID: 32F35CB2F546D93E
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/unit/org/apache/cassandra/io/sstable/VerifyTest.java
View File

@ -26,6 +26,7 @@ import java.nio.file.Files;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Objects;
import java.util.zip.CRC32; import java.util.zip.CRC32;
import java.util.zip.CheckedInputStream; import java.util.zip.CheckedInputStream;
@ -332,7 +333,7 @@ public class VerifyTest
try (RandomAccessReader file = RandomAccessReader.open(sstable.descriptor.fileFor(Components.DIGEST))) try (RandomAccessReader file = RandomAccessReader.open(sstable.descriptor.fileFor(Components.DIGEST)))
{ {
long correctChecksum = file.readLong(); long correctChecksum = Long.parseLong(Objects.requireNonNull(file.readLine()));
writeChecksum(++correctChecksum, sstable.descriptor.fileFor(Components.DIGEST)); writeChecksum(++correctChecksum, sstable.descriptor.fileFor(Components.DIGEST));
} }
@ -473,7 +474,7 @@ public class VerifyTest
long correctChecksum; long correctChecksum;
try (RandomAccessReader file = RandomAccessReader.open(sstable.descriptor.fileFor(Components.DIGEST))) try (RandomAccessReader file = RandomAccessReader.open(sstable.descriptor.fileFor(Components.DIGEST)))
{ {
correctChecksum = file.readLong(); correctChecksum = Long.parseLong(Objects.requireNonNull(file.readLine()));
} }
writeChecksum(++correctChecksum, sstable.descriptor.fileFor(Components.DIGEST)); writeChecksum(++correctChecksum, sstable.descriptor.fileFor(Components.DIGEST));
try (IVerifier verifier = getVerifier(sstable, cfs, IVerifier.options().mutateRepairStatus(false).invokeDiskFailurePolicy(true))) try (IVerifier verifier = getVerifier(sstable, cfs, IVerifier.options().mutateRepairStatus(false).invokeDiskFailurePolicy(true)))
@ -539,7 +540,7 @@ public class VerifyTest
long correctChecksum; long correctChecksum;
try (RandomAccessReader file = RandomAccessReader.open(sstable.descriptor.fileFor(Components.DIGEST))) try (RandomAccessReader file = RandomAccessReader.open(sstable.descriptor.fileFor(Components.DIGEST)))
{ {
correctChecksum = file.readLong(); correctChecksum = Long.parseLong(Objects.requireNonNull(file.readLine()));
} }
writeChecksum(++correctChecksum, sstable.descriptor.fileFor(Components.DIGEST)); writeChecksum(++correctChecksum, sstable.descriptor.fileFor(Components.DIGEST));
try (IVerifier verifier = getVerifier(sstable, cfs, IVerifier.options().invokeDiskFailurePolicy(true).mutateRepairStatus(true))) try (IVerifier verifier = getVerifier(sstable, cfs, IVerifier.options().invokeDiskFailurePolicy(true).mutateRepairStatus(true)))
@ -623,7 +624,7 @@ public class VerifyTest
try (RandomAccessReader file = RandomAccessReader.open(sstable.descriptor.fileFor(Components.DIGEST))) try (RandomAccessReader file = RandomAccessReader.open(sstable.descriptor.fileFor(Components.DIGEST)))
{ {
long correctChecksum = file.readLong(); long correctChecksum = Long.parseLong(Objects.requireNonNull(file.readLine()));
writeChecksum(++correctChecksum, sstable.descriptor.fileFor(Components.DIGEST)); writeChecksum(++correctChecksum, sstable.descriptor.fileFor(Components.DIGEST));
} }