natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove unnecessary List creation in getSliceFrom and move close() cleanup for to the finally block. patch by Jun Rao; reviewed by jbellis for CASSANDRA-201 

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@779322 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Ellis 2009-05-27 21:41:04 +00:00
parent 7acfcb0e45
commit edacc67c26
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/java/org/apache/cassandra/db/ColumnFamilyStore.java
View File

@ -1580,11 +1580,11 @@ public final class ColumnFamilyStore implements ColumnFamilyStoreMBean
throws IOException, ExecutionException, InterruptedException
{
lock_.readLock().lock();
List<ColumnIterator> iterators = new ArrayList<ColumnIterator>();
try
{
final ColumnFamily returnCF;
ColumnIterator iter;
List<ColumnIterator> iterators = new ArrayList<ColumnIterator>();
/* add the current memtable */
memtableLock_.readLock().lock();
@ -1637,9 +1637,7 @@ public final class ColumnFamilyStore implements ColumnFamilyStoreMBean
Iterator collated = IteratorUtils.collatedIterator(comparator, iterators);
if (!collated.hasNext())
return new ColumnFamily(cfName, DatabaseDescriptor.getColumnFamilyType(cfName));
List<IColumn> L = new ArrayList();
CollectionUtils.addAll(L, collated);
ReducingIterator<IColumn> reduced = new ReducingIterator<IColumn>(L.iterator())
ReducingIterator<IColumn> reduced = new ReducingIterator<IColumn>(collated)
{
ColumnFamily curCF = returnCF.cloneMeShallow();
@ -1675,14 +1673,23 @@ public final class ColumnFamilyStore implements ColumnFamilyStoreMBean
returnCF.addColumn(column);
}
/* close remaining cursors */
for (ColumnIterator ci : iterators)
ci.close();
return removeDeleted(returnCF);
}
finally
{
/* close all cursors */
for (ColumnIterator ci : iterators)
{
try
{
ci.close();
}
catch (Throwable th)
{
logger_.error(th);
}
}
lock_.readLock().unlock();
}
}