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/07/02 18:50:44 UTC
[cassandra] branch cassandra-3.11 updated: Enable tombstone
compactions when UNCHECKED_TOMBSTONE_COMPACTION_OPTION is set
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-3.11 by this push:
new fd9a282 Enable tombstone compactions when UNCHECKED_TOMBSTONE_COMPACTION_OPTION is set
fd9a282 is described below
commit fd9a2820a1ceb1812fce4f4cc71abc0324d5908f
Author: Brandon Williams <br...@apache.org>
AuthorDate: Fri Jul 2 10:09:31 2021 -0500
Enable tombstone compactions when UNCHECKED_TOMBSTONE_COMPACTION_OPTION is set
Patch by Alexander Ivakov and brandonwilliams, reviewed by marcuse for
CASSANDRA-14496
---
CHANGES.txt | 1 +
.../db/compaction/TimeWindowCompactionStrategy.java | 13 +++++++++----
.../db/compaction/TimeWindowCompactionStrategyTest.java | 10 ++++++++++
3 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index a4bf5f5..28ea6e1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.11.11
+ * Enable tombstone compactions when unchecked_tombstone_compaction is set in TWCS (CASSANDRA-14496)
* Read only the required SSTables for single partition queries (CASSANDRA-16737)
* Fix LeveledCompactionStrategy compacts last level throw an ArrayIndexOutOfBoundsException (CASSANDRA-15669)
* Maps $CASSANDRA_LOG_DIR to cassandra.logdir java property when executing nodetool (CASSANDRA-16199)
diff --git a/src/java/org/apache/cassandra/db/compaction/TimeWindowCompactionStrategy.java b/src/java/org/apache/cassandra/db/compaction/TimeWindowCompactionStrategy.java
index 6186826..74e5f9d 100644
--- a/src/java/org/apache/cassandra/db/compaction/TimeWindowCompactionStrategy.java
+++ b/src/java/org/apache/cassandra/db/compaction/TimeWindowCompactionStrategy.java
@@ -19,9 +19,11 @@
package org.apache.cassandra.db.compaction;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
+import java.util.Objects;
import java.util.TreeSet;
import java.util.concurrent.TimeUnit;
import java.util.HashSet;
@@ -59,13 +61,16 @@ public class TimeWindowCompactionStrategy extends AbstractCompactionStrategy
super(cfs, options);
this.estimatedRemainingTasks = 0;
this.options = new TimeWindowCompactionStrategyOptions(options);
- if (!options.containsKey(AbstractCompactionStrategy.TOMBSTONE_COMPACTION_INTERVAL_OPTION) && !options.containsKey(AbstractCompactionStrategy.TOMBSTONE_THRESHOLD_OPTION))
+ String[] tsOpts = { UNCHECKED_TOMBSTONE_COMPACTION_OPTION, TOMBSTONE_COMPACTION_INTERVAL_OPTION, TOMBSTONE_THRESHOLD_OPTION };
+ if (Arrays.stream(tsOpts).map(o -> options.get(o)).filter(Objects::nonNull).anyMatch(v -> !v.equals("false")))
{
- disableTombstoneCompactions = true;
- logger.debug("Disabling tombstone compactions for TWCS");
+ logger.debug("Enabling tombstone compactions for TWCS");
}
else
- logger.debug("Enabling tombstone compactions for TWCS");
+ {
+ logger.debug("Disabling tombstone compactions for TWCS");
+ disableTombstoneCompactions = true;
+ }
}
@Override
diff --git a/test/unit/org/apache/cassandra/db/compaction/TimeWindowCompactionStrategyTest.java b/test/unit/org/apache/cassandra/db/compaction/TimeWindowCompactionStrategyTest.java
index d427852..ee7952b 100644
--- a/test/unit/org/apache/cassandra/db/compaction/TimeWindowCompactionStrategyTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/TimeWindowCompactionStrategyTest.java
@@ -34,6 +34,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.fail;
import org.apache.cassandra.SchemaLoader;
@@ -124,6 +125,15 @@ public class TimeWindowCompactionStrategyTest extends SchemaLoader
{
options.put(TimeWindowCompactionStrategyOptions.UNSAFE_AGGRESSIVE_SSTABLE_EXPIRATION_KEY, "true");
}
+
+ options.put(AbstractCompactionStrategy.UNCHECKED_TOMBSTONE_COMPACTION_OPTION, "true");
+ Keyspace keyspace = Keyspace.open(KEYSPACE1);
+ ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(CF_STANDARD1);
+ TimeWindowCompactionStrategy twcs = new TimeWindowCompactionStrategy(cfs, options);
+ assertFalse(twcs.disableTombstoneCompactions);
+ options.put(AbstractCompactionStrategy.UNCHECKED_TOMBSTONE_COMPACTION_OPTION, "false");
+ twcs = new TimeWindowCompactionStrategy(cfs, options);
+ assertTrue(twcs.disableTombstoneCompactions);
options.put("bad_option", "1.0");
unvalidated = validateOptions(options);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org