Author: jbellis Date: Thu Sep 15 03:38:49 2011 New Revision: 1170945 URL: http://svn.apache.org/viewvc?rev=1170945&view=rev Log: r/m unused memtablesToFlush code patch by Yang Yang; reviewed by jbellis for CASSANDRA-3210
Modified: cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/Table.java Modified: cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/Table.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/Table.java?rev=1170945&r1=1170944&r2=1170945&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/Table.java (original) +++ cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/Table.java Thu Sep 15 03:38:49 2011 @@ -396,7 +396,6 @@ public class Table */ public void apply(RowMutation mutation, boolean writeCommitLog) throws IOException { - List<Memtable> memtablesToFlush = Collections.emptyList(); if (logger.isDebugEnabled()) logger.debug("applying mutation of row {}", ByteBufferUtil.bytesToHex(mutation.key())); @@ -465,10 +464,6 @@ public class Table switchLock.readLock().unlock(); } - // flush memtables that got filled up outside the readlock (maybeSwitchMemtable acquires writeLock). - // usually mTF will be empty and this will be a no-op. - for (Memtable memtable : memtablesToFlush) - memtable.cfs.maybeSwitchMemtable(memtable, writeCommitLog); } private static void ignoreObsoleteMutations(ColumnFamily cf, SortedSet<ByteBuffer> mutatedIndexedColumns, ColumnFamily oldIndexedColumns)