cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jasobr...@apache.org
Subject [01/10] cassandra git commit: Ignore Cell.NO_DELETION_TIME for tombstone histograms
Date Tue, 13 Dec 2016 13:13:58 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 5d8f6c64c -> b8ed255fd
  refs/heads/cassandra-3.11 773dfc43c -> 30e154d3d
  refs/heads/cassandra-3.X ee0b74385 -> 55adebe66
  refs/heads/trunk 8b9f5e5f1 -> 4489ee8d8


Ignore Cell.NO_DELETION_TIME for tombstone histograms

patch by Stefan Podkowinski; reviewed by jasobrown for CASSANDRA-13040


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b8ed255f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b8ed255f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b8ed255f

Branch: refs/heads/cassandra-3.0
Commit: b8ed255fde2cfa4a4c1cebed658f7cb817f1129d
Parents: 5d8f6c6
Author: Stefan Podkowinski <s.podkowinski@gmail.com>
Authored: Wed Dec 7 21:41:39 2016 +0100
Committer: Jason Brown <jasedbrown@gmail.com>
Committed: Tue Dec 13 05:06:01 2016 -0800

----------------------------------------------------------------------
 CHANGES.txt                                                       | 1 +
 .../apache/cassandra/io/sstable/metadata/MetadataCollector.java   | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8ed255f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4d8bb3a..38660a0 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8ed255f/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java
----------------------------------------------------------------------
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 1ff2ca8..4a67623 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)


Mime
View raw message