svn commit: r1030117 - in /cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db: ColumnFamilyStore.java Memtable.java

[jbellis]

Author: jbellis
Date: Tue Nov  2 16:41:54 2010
New Revision: 1030117

URL: http://svn.apache.org/viewvc?rev=1030117&view=rev
Log:
revert r1028360; see CASSANDRA-1675

Modified:
    
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
    
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/Memtable.java

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=1030117&r1=1030116&r2=1030117&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
 (original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
 Tue Nov  2 16:41:54 2010
@@ -682,11 +682,7 @@ public class ColumnFamilyStore implement
     public void forceFlushIfExpired()
     {
         if (memtable.isExpired())
-        {
-            logger.info("Memtable for {} has reached memtable_flush_after_mins 
{}, enqueueing flush",
-                        memtable.cfs.getColumnFamilyName(), 
memtable.cfs.getMemtableFlushAfterMins());
             forceFlush();
-        }
     }
 
     public Future<?> forceFlush()

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/Memtable.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/Memtable.java?rev=1030117&r1=1030116&r2=1030117&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/Memtable.java 
(original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/Memtable.java 
Tue Nov  2 16:41:54 2010
@@ -99,20 +99,7 @@ public class Memtable implements Compara
 
     boolean isThresholdViolated()
     {
-        if (currentThroughput.get() >= THRESHOLD)
-        {
-            logger.info("Memtable for CF {} has reached 
memtable_throughput_in_mb {}, enqueueing flush",
-                        cfs.getColumnFamilyName(), THRESHOLD);
-            return true;
-        }
-        if (currentOperations.get() >= THRESHOLD_COUNT)
-        {
-            logger.info("Memtable for CF {} has reached 
memtable_operations_in_millions {}, enqueueing flush",
-                        cfs.getColumnFamilyName(), THRESHOLD_COUNT);
-            return true;
-        }
-        // default case, threshold is not violated.
-        return false;
+        return currentThroughput.get() >= this.THRESHOLD || 
currentOperations.get() >= this.THRESHOLD_COUNT;
     }
 
     boolean isFrozen()