You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2021/09/27 14:12:37 UTC
[cassandra] branch cassandra-4.0 updated (89f35a4 -> 80dccde)
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a change to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 89f35a4 Merge branch 'cassandra-3.11' into cassandra-4.0
new 02840c9 Don't validate index keys
new 80dccde Merge branch 'cassandra-3.11' into cassandra-4.0
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/java/org/apache/cassandra/db/compaction/Scrubber.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0
Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 80dccde3cd18dca6f406b342cd7feebcaa8129a9
Merge: 89f35a4 02840c9
Author: Brandon Williams <br...@apache.org>
AuthorDate: Mon Sep 27 09:11:00 2021 -0500
Merge branch 'cassandra-3.11' into cassandra-4.0
src/java/org/apache/cassandra/db/compaction/Scrubber.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --cc src/java/org/apache/cassandra/db/compaction/Scrubber.java
index 1e52796,79f736b..867c23b
--- a/src/java/org/apache/cassandra/db/compaction/Scrubber.java
+++ b/src/java/org/apache/cassandra/db/compaction/Scrubber.java
@@@ -200,7 -190,8 +200,8 @@@ public class Scrubber implements Closea
try
{
ByteBuffer raw = ByteBufferUtil.readWithShortLength(dataFile);
- cfs.metadata.getLocal().partitionKeyType.validate(raw);
- if (!cfs.metadata.isIndex())
- cfs.metadata.getKeyValidator().validate(raw);
++ if (!cfs.metadata.getLocal().isIndex())
++ cfs.metadata.getLocal().partitionKeyType.validate(raw);
key = sstable.decorateKey(raw);
}
catch (Throwable th)
@@@ -260,7 -250,8 +261,8 @@@
key = sstable.decorateKey(currentIndexKey);
try
{
- cfs.metadata.getLocal().partitionKeyType.validate(key.getKey());
- if (!cfs.metadata.isIndex())
- cfs.metadata.getKeyValidator().validate(key.getKey());
++ if (!cfs.metadata.getLocal().isIndex())
++ cfs.metadata.getLocal().partitionKeyType.validate(key.getKey());
dataFile.seek(dataStartFromIndex);
if (tryAppend(prevKey, key, writer))
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org