From 88016504e1fe04dcdbea6638675e9300aa2f7224 Mon Sep 17 00:00:00 2001
From: Periklis Stavrou <periklis.stavrou@channelvas.com>
Date: Wed, 16 Oct 2019 13:30:20 +0300
Subject: [PATCH] Ignore sstables with only ttl deletions which are not
 currently expired.

---
 .../org/apache/cassandra/io/sstable/format/SSTableReader.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 36a1e63308..e13ec923f0 100644
--- a/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
+++ b/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
@@ -1993,8 +1993,8 @@ public abstract class SSTableReader extends SSTable implements SelfRefCounted<SS
     public boolean mayHaveTombstones()
     {
         // A sstable is guaranteed to have no tombstones if minLocalDeletionTime is still set to its default,
-        // Cell.NO_DELETION_TIME, which is bigger than any valid deletion times.
-        return getMinLocalDeletionTime() != Cell.NO_DELETION_TIME;
+        // Cell.NO_DELETION_TIME, which is bigger than any valid deletion times, or bigger than current time (for ttl only tombstones).
+        return getMinLocalDeletionTime() != Cell.NO_DELETION_TIME && getMinLocalDeletionTime() < System.currentTimeMillis()/1000;
     }
 
     public int getMinTTL()