Author: jbellis
Date: Tue Feb 9 17:53:48 2010
New Revision: 908133
URL: http://svn.apache.org/viewvc?rev=908133&view=rev
Log:
rename switchMemtable to maybeSwitchMemtable to indicate that it will only be
switched/flushed once. patch by jbellis
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=908133&r1=908132&r2=908133&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
Tue Feb 9 17:53:48 2010
@@ -355,7 +355,8 @@
columnFamily_, SSTable.TEMPFILE_MARKER,
fileIndexGenerator_.incrementAndGet());
}
- Future<?> switchMemtable(Memtable oldMemtable, final boolean
writeCommitLog) throws IOException
+ /** flush the given memtable and swap in a new one for its CFS, if it
hasn't been frozen already. threadsafe. */
+ Future<?> maybeSwitchMemtable(Memtable oldMemtable, final boolean
writeCommitLog) throws IOException
{
/**
* If we can get the writelock, that means no new updates can come in
and
@@ -419,7 +420,7 @@
if (memtable_.isClean())
return null;
- return switchMemtable(memtable_, true);
+ return maybeSwitchMemtable(memtable_, true);
}
public void forceBlockingFlush() throws IOException, ExecutionException,
InterruptedException
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java?rev=908133&r1=908132&r2=908133&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java
(original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java Tue
Feb 9 17:53:48 2010
@@ -429,7 +429,7 @@
// flush memtables that got filled up. usually mTF will be empty and
this will be a no-op
for (Map.Entry<ColumnFamilyStore, Memtable> entry :
memtablesToFlush.entrySet())
- entry.getKey().switchMemtable(entry.getValue(), writeCommitLog);
+ entry.getKey().maybeSwitchMemtable(entry.getValue(),
writeCommitLog);
}
public List<Future<?>> flush() throws IOException
