diff --git a/CHANGES.txt b/CHANGES.txt index 1b320fba7c..199a0ea92a 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.1.0 + * Avoid incremental compaction on Windows (CASSANDRA-7365) * Fix exception when querying a composite-keyed table with a collection index (CASSANDRA-7372) * Use node's host id in place of counter ids (CASSANDRA-7366) diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java b/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java index 4f8548ce7e..4055b4247a 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java @@ -36,6 +36,7 @@ import org.apache.cassandra.db.RowIndexEntry; import org.apache.cassandra.db.compaction.AbstractCompactedRow; import org.apache.cassandra.db.compaction.OperationType; import org.apache.cassandra.utils.CLibrary; +import org.apache.cassandra.utils.FBUtilities; /** * Wraps one or more writers as output for rewriting one or more readers: every sstable_preemptive_open_interval_in_mb @@ -158,7 +159,7 @@ public class SSTableRewriter private void maybeReopenEarly(DecoratedKey key) { - if (writer.getFilePointer() - currentlyOpenedEarlyAt > preemptiveOpenInterval) + if (FBUtilities.isUnix() && writer.getFilePointer() - currentlyOpenedEarlyAt > preemptiveOpenInterval) { if (isOffline) {