diff --git a/CHANGES.txt b/CHANGES.txt index 54ffe5b201..e4849d3b30 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 4.0 + * Take sstable references before calculating approximate key count (CASSANDRA-14647) * Restore snapshotting of system keyspaces on version change (CASSANDRA-14412) * Fix AbstractBTreePartition locking in java 11 (CASSANDRA-14607) * SimpleClient should pass connection properties as options (CASSANDRA-15056) diff --git a/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java b/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java index 01e30d6ee5..ca6eb8540a 100644 --- a/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java +++ b/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java @@ -26,7 +26,6 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; -import java.util.stream.Collectors; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Iterables; @@ -293,6 +292,7 @@ public abstract class SSTableReader extends SSTable implements SelfRefCounted sstables = new ArrayList<>(viewFragment1.sstables); + assertEquals(50, SSTableReader.getApproximateKeyCount(sstables)); + } + } }