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

Merge branch 'cassandra-3.11' into cassandra-4.0

This commit is contained in:
Brandon Williams 2021-09-27 09:11:00 -05:00
parent 89f35a49a0 02840c9006
commit 80dccde3cd
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/java/org/apache/cassandra/db/compaction/Scrubber.java
View File

@ -200,7 +200,8 @@ public class Scrubber implements Closeable
try
{
ByteBuffer raw = ByteBufferUtil.readWithShortLength(dataFile);
cfs.metadata.getLocal().partitionKeyType.validate(raw);
if (!cfs.metadata.getLocal().isIndex())
cfs.metadata.getLocal().partitionKeyType.validate(raw);
key = sstable.decorateKey(raw);
}
catch (Throwable th)
@ -260,7 +261,8 @@ public class Scrubber implements Closeable
key = sstable.decorateKey(currentIndexKey);
try
{
cfs.metadata.getLocal().partitionKeyType.validate(key.getKey());
if (!cfs.metadata.getLocal().isIndex())
cfs.metadata.getLocal().partitionKeyType.validate(key.getKey());
dataFile.seek(dataStartFromIndex);
if (tryAppend(prevKey, key, writer))