mirror of https://github.com/apache/cassandra
Merge branch 'cassandra-4.1' into cassandra-5.0
This commit is contained in:
commit
a3ee4c4f9a
|
|
@ -26,6 +26,7 @@ import java.nio.file.Files;
|
|||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.zip.CRC32;
|
||||
import java.util.zip.CheckedInputStream;
|
||||
|
||||
|
|
@ -324,7 +325,7 @@ public class VerifyTest
|
|||
|
||||
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));
|
||||
}
|
||||
|
|
@ -465,7 +466,7 @@ public class VerifyTest
|
|||
long correctChecksum;
|
||||
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));
|
||||
try (IVerifier verifier = sstable.getVerifier(cfs, new OutputHandler.LogOutput(), false, IVerifier.options().mutateRepairStatus(false).invokeDiskFailurePolicy(true).build()))
|
||||
|
|
@ -535,7 +536,7 @@ public class VerifyTest
|
|||
long correctChecksum;
|
||||
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));
|
||||
try (IVerifier verifier = sstable.getVerifier(cfs, new OutputHandler.LogOutput(), false, IVerifier.options().invokeDiskFailurePolicy(true).mutateRepairStatus(true).build()))
|
||||
|
|
@ -619,7 +620,7 @@ public class VerifyTest
|
|||
|
||||
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));
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue