Updated Branches: refs/heads/trunk 5e558cd01 -> 42a39b5d6
inline variable c2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5612b936 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5612b936 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5612b936 Branch: refs/heads/trunk Commit: 5612b93611bb82342e4da73975188fe740d0d1ca Parents: 5e558cd Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed May 15 16:54:16 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed May 15 16:54:20 2013 -0500 ---------------------------------------------------------------------- .../apache/cassandra/db/CollationController.java | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5612b936/src/java/org/apache/cassandra/db/CollationController.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/CollationController.java b/src/java/org/apache/cassandra/db/CollationController.java index ea06118..2a45df5 100644 --- a/src/java/org/apache/cassandra/db/CollationController.java +++ b/src/java/org/apache/cassandra/db/CollationController.java @@ -75,7 +75,7 @@ public class CollationController private ColumnFamily collectTimeOrderedData() { logger.trace("collectTimeOrderedData"); - ColumnFamily container = factory.create(cfs.metadata, filter.filter.isReversed()); + final ColumnFamily container = factory.create(cfs.metadata, filter.filter.isReversed()); List<OnDiskAtomIterator> iterators = new ArrayList<OnDiskAtomIterator>(); Tracing.trace("Acquiring sstable references"); ColumnFamilyStore.ViewFragment view = cfs.markReferenced(filter.key); @@ -156,10 +156,9 @@ public class CollationController return null; // do a final collate. toCollate is boilerplate required to provide a CloseableIterator - final ColumnFamily c2 = container; CloseableIterator<OnDiskAtom> toCollate = new SimpleAbstractColumnIterator() { - final Iterator<Column> iter = c2.iterator(); + final Iterator<Column> iter = container.iterator(); protected OnDiskAtom computeNext() { @@ -168,7 +167,7 @@ public class CollationController public ColumnFamily getColumnFamily() { - return c2; + return container; } public DecoratedKey getKey()
