From 9afc2097ef8e806b9916e623815202b0f43d1cfc Mon Sep 17 00:00:00 2001
From: Aleksey Yeschenko <aleksey@apache.org>
Date: Tue, 17 Jun 2014 17:59:26 -0700
Subject: [PATCH] Handle empty CFs in Memtable#maybeUpdateLiveRatio()

patch by Christian Spriegel; reviewed by Aleksey Yeschenko for
CASSANDRA-7401
---
 CHANGES.txt                                    | 1 +
 src/java/org/apache/cassandra/db/Memtable.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 6a5018622d..8af4b3e152 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.0.9
+ * Handle empty CFs in Memtable#maybeUpdateLiveRatio() (CASSANDRA-7401)
  * Fix native protocol CAS batches (CASSANDRA-7337)
  * Add per-CF range read request latency metrics (CASSANDRA-7338)
  * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323)
diff --git a/src/java/org/apache/cassandra/db/Memtable.java b/src/java/org/apache/cassandra/db/Memtable.java
index ea79e9c5d3..bcef0ecb7f 100644
--- a/src/java/org/apache/cassandra/db/Memtable.java
+++ b/src/java/org/apache/cassandra/db/Memtable.java
@@ -180,7 +180,7 @@ public class Memtable
         {
             long last = liveRatioComputedAt.get();
             long operations = currentOperations.get();
-            if (operations < 2 * last)
+            if (operations <= 2L * last)
                 break;
             if (liveRatioComputedAt.compareAndSet(last, operations))
             {