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/22 16:28:38 UTC
[cassandra] branch cassandra-4.0 updated (053806c -> d519677)
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 053806c Merge branch 'cassandra-3.11' into cassandra-4.0
new ec1195b Standalone scrub validates keys
new d519677 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:
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/compaction/Scrubber.java | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
---------------------------------------------------------------------
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 d5196770726390926920b865713773546a6c037b
Merge: 053806c ec1195b
Author: Brandon Williams <br...@apache.org>
AuthorDate: Wed Sep 22 11:25:14 2021 -0500
Merge branch 'cassandra-3.11' into cassandra-4.0
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/compaction/Scrubber.java | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --cc CHANGES.txt
index 01e0141,84f02c4..3e76c71
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,16 -1,14 +1,17 @@@
-3.11.12
+4.0.2
+ * Avoid trying to acquire 0 permits from the rate limiter when taking snapshot (CASSANDRA-16872)
+ * Upgrade Caffeine to 2.5.6 (CASSANDRA-15153)
+ * Include SASI components to snapshots (CASSANDRA-15134)
+ * Fix missed wait latencies in the output of `nodetool tpstats -F` (CASSANDRA-16938)
+ * Remove all the state pollution between tests in SSTableReaderTest (CASSANDRA-16888)
+ * Delay auth setup until after gossip has settled to avoid unavailables on startup (CASSANDRA-16783)
+ * Fix clustering order logic in CREATE MATERIALIZED VIEW (CASSANDRA-16898)
+ * org.apache.cassandra.db.rows.ArrayCell#unsharedHeapSizeExcludingData includes data twice (CASSANDRA-16900)
+ * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies (CASSANDRA-16854)
+Merged from 3.11:
+ * Add key validation to ssstablescrub (CASSANDRA-16969)
* Update Jackson from 2.9.10 to 2.12.5 (CASSANDRA-16851)
- * Include SASI components to snapshots (CASSANDRA-15134)
* Make assassinate more resilient to missing tokens (CASSANDRA-16847)
- * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies (CASSANDRA-16854)
- * Validate SASI tokenizer options before adding index to schema (CASSANDRA-15135)
- * Fixup scrub output when no data post-scrub and clear up old use of row, which really means partition (CASSANDRA-16835)
- * Fix ant-junit dependency issue (CASSANDRA-16827)
- * Reduce thread contention in CommitLogSegment and HintsBuffer (CASSANDRA-16072)
- * Avoid sending CDC column if not enabled (CASSANDRA-16770)
Merged from 3.0:
* Debian init respects CASSANDRA_HEAPDUMP_DIR (CASSANDRA-13843)
* Catch UnsatisfiedLinkError in WindowsTimer (CASSANDRA-16085)
diff --cc src/java/org/apache/cassandra/db/compaction/Scrubber.java
index 1ee7e27,c5c9d78..1e52796
--- a/src/java/org/apache/cassandra/db/compaction/Scrubber.java
+++ b/src/java/org/apache/cassandra/db/compaction/Scrubber.java
@@@ -199,7 -189,9 +199,9 @@@ public class Scrubber implements Closea
DecoratedKey key = null;
try
{
- key = sstable.decorateKey(ByteBufferUtil.readWithShortLength(dataFile));
+ ByteBuffer raw = ByteBufferUtil.readWithShortLength(dataFile);
- cfs.metadata.getKeyValidator().validate(raw);
++ cfs.metadata.getLocal().partitionKeyType.validate(raw);
+ key = sstable.decorateKey(raw);
}
catch (Throwable th)
{
@@@ -258,6 -249,7 +260,7 @@@
key = sstable.decorateKey(currentIndexKey);
try
{
- cfs.metadata.getKeyValidator().validate(key.getKey());
++ 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