You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2009/07/28 00:40:39 UTC
svn commit: r798316 -
/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
Author: jbellis
Date: Mon Jul 27 22:40:38 2009
New Revision: 798316
URL: http://svn.apache.org/viewvc?rev=798316&view=rev
Log:
use CSLS instead of NBHS for memtablesPendingFlush. See explanation here: http://sourceforge.net/tracker/?func=detail&aid=2828100&group_id=194172&atid=948362
patch by jbellis; reviewed by Brandon Williams for CASSANDRA-157
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.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=798316&r1=798315&r2=798316&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 Mon Jul 27 22:40:38 2009
@@ -46,7 +46,7 @@
import org.apache.commons.collections.IteratorUtils;
import org.cliffc.high_scale_lib.NonBlockingHashMap;
-import org.cliffc.high_scale_lib.NonBlockingHashSet;
+
/**
* Author : Avinash Lakshman ( alakshman@facebook.com) & Prashant Malik ( pmalik@facebook.com )
@@ -1277,7 +1277,7 @@
Set<Memtable> memtables = memtablesPendingFlush.get(columnFamilyName);
if (memtables == null)
{
- memtablesPendingFlush.putIfAbsent(columnFamilyName, new NonBlockingHashSet<Memtable>());
+ memtablesPendingFlush.putIfAbsent(columnFamilyName, new ConcurrentSkipListSet<Memtable>());
memtables = memtablesPendingFlush.get(columnFamilyName); // might not be the object we just put, if there was a race!
}
return memtables;