mirror of https://github.com/apache/cassandra
Merge branch 'cassandra-4.0' into cassandra-4.1
This commit is contained in:
commit
003f35ba51
|
|
@ -27,6 +27,7 @@ import java.util.ArrayList;
|
|||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.ExecutionException;
|
||||
import java.util.Objects;
|
||||
import java.util.zip.CRC32;
|
||||
import java.util.zip.CheckedInputStream;
|
||||
|
||||
|
|
@ -309,7 +310,7 @@ public class VerifyTest
|
|||
|
||||
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));
|
||||
}
|
||||
|
|
@ -442,7 +443,7 @@ public class VerifyTest
|
|||
Long correctChecksum;
|
||||
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));
|
||||
try (Verifier verifier = new Verifier(cfs, sstable, false, Verifier.options().mutateRepairStatus(false).invokeDiskFailurePolicy(true).build()))
|
||||
|
|
@ -511,7 +512,7 @@ public class VerifyTest
|
|||
Long correctChecksum;
|
||||
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));
|
||||
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))))
|
||||
{
|
||||
Long correctChecksum = file.readLong();
|
||||
long correctChecksum = Long.parseLong(Objects.requireNonNull(file.readLine()));
|
||||
|
||||
writeChecksum(++correctChecksum, sstable.descriptor.filenameFor(Component.DIGEST));
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue