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.0' into cassandra-4.1

This commit is contained in:
Stefan Miklosovic 2026-06-24 11:20:56 +02:00
parent 95088443ff 0f9f6dd6e5
commit 003f35ba51
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/db/VerifyTest.java
View File

@ -27,6 +27,7 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.Objects;
import java.util.zip.CRC32; import java.util.zip.CRC32;
import java.util.zip.CheckedInputStream; import java.util.zip.CheckedInputStream;
@ -309,7 +310,7 @@ public class VerifyTest
try (RandomAccessReader file = RandomAccessReader.open(new File(sstable.descriptor.filenameFor(Component.DIGEST)))) try (RandomAccessReader file = RandomAccessReader.open(new File(sstable.descriptor.filenameFor(Component.DIGEST))))
{ {
Long correctChecksum = file.readLong(); long correctChecksum = Long.parseLong(Objects.requireNonNull(file.readLine()));
writeChecksum(++correctChecksum, sstable.descriptor.filenameFor(Component.DIGEST)); writeChecksum(++correctChecksum, sstable.descriptor.filenameFor(Component.DIGEST));
} }
@ -442,7 +443,7 @@ public class VerifyTest
Long correctChecksum; Long correctChecksum;
try (RandomAccessReader file = RandomAccessReader.open(new File(sstable.descriptor.filenameFor(Component.DIGEST)))) try (RandomAccessReader file = RandomAccessReader.open(new File(sstable.descriptor.filenameFor(Component.DIGEST))))
{ {
correctChecksum = file.readLong(); correctChecksum = Long.parseLong(Objects.requireNonNull(file.readLine()));
} }
writeChecksum(++correctChecksum, sstable.descriptor.filenameFor(Component.DIGEST)); writeChecksum(++correctChecksum, sstable.descriptor.filenameFor(Component.DIGEST));
try (Verifier verifier = new Verifier(cfs, sstable, false, Verifier.options().mutateRepairStatus(false).invokeDiskFailurePolicy(true).build())) try (Verifier verifier = new Verifier(cfs, sstable, false, Verifier.options().mutateRepairStatus(false).invokeDiskFailurePolicy(true).build()))
@ -511,7 +512,7 @@ public class VerifyTest
Long correctChecksum; Long correctChecksum;
try (RandomAccessReader file = RandomAccessReader.open(new File(sstable.descriptor.filenameFor(Component.DIGEST)))) try (RandomAccessReader file = RandomAccessReader.open(new File(sstable.descriptor.filenameFor(Component.DIGEST))))
{ {
correctChecksum = file.readLong(); correctChecksum = Long.parseLong(Objects.requireNonNull(file.readLine()));
} }
writeChecksum(++correctChecksum, sstable.descriptor.filenameFor(Component.DIGEST)); writeChecksum(++correctChecksum, sstable.descriptor.filenameFor(Component.DIGEST));
try (Verifier verifier = new Verifier(cfs, sstable, false, Verifier.options().invokeDiskFailurePolicy(true).mutateRepairStatus(true).build())) try (Verifier verifier = new Verifier(cfs, sstable, false, Verifier.options().invokeDiskFailurePolicy(true).mutateRepairStatus(true).build()))
@ -587,7 +588,7 @@ public class VerifyTest
try (RandomAccessReader file = RandomAccessReader.open(new File(sstable.descriptor.filenameFor(Component.DIGEST)))) try (RandomAccessReader file = RandomAccessReader.open(new File(sstable.descriptor.filenameFor(Component.DIGEST))))
{ {
Long correctChecksum = file.readLong(); long correctChecksum = Long.parseLong(Objects.requireNonNull(file.readLine()));
writeChecksum(++correctChecksum, sstable.descriptor.filenameFor(Component.DIGEST)); writeChecksum(++correctChecksum, sstable.descriptor.filenameFor(Component.DIGEST));
} }