From b8ed255fde2cfa4a4c1cebed658f7cb817f1129d Mon Sep 17 00:00:00 2001 From: Stefan Podkowinski Date: Wed, 7 Dec 2016 21:41:39 +0100 Subject: [PATCH] Ignore Cell.NO_DELETION_TIME for tombstone histograms patch by Stefan Podkowinski; reviewed by jasobrown for CASSANDRA-13040 --- CHANGES.txt | 1 + .../cassandra/io/sstable/metadata/MetadataCollector.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index 4d8bb3a152..38660a0807 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.0.11 + * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME (CASSANDRA-13040) * Nodetool compactionstats fails with NullPointerException (CASSANDRA-13021) * Thread local pools never cleaned up (CASSANDRA-13033) * Set RPC_READY to false when draining or if a node is marked as shutdown (CASSANDRA-12781) diff --git a/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java b/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java index 1ff2ca8ad2..4a676233bf 100644 --- a/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java +++ b/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java @@ -208,7 +208,8 @@ public class MetadataCollector implements PartitionStatisticsCollector private void updateLocalDeletionTime(int newLocalDeletionTime) { localDeletionTimeTracker.update(newLocalDeletionTime); - estimatedTombstoneDropTime.update(newLocalDeletionTime); + if (newLocalDeletionTime != Cell.NO_DELETION_TIME) + estimatedTombstoneDropTime.update(newLocalDeletionTime); } private void updateTTL(int newTTL)