merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/71a7aeae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/71a7aeae Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/71a7aeae Branch: refs/heads/trunk Commit: 71a7aeae5d6a9c2489ad80e0be9b7422c6ac6c43 Parents: f5cc476 cc301de Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu May 23 13:16:42 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu May 23 13:16:42 2013 -0500 ---------------------------------------------------------------------- .../apache/cassandra/db/CollationController.java | 4 +--- .../db/columniterator/IndexedSliceReader.java | 2 ++ .../db/columniterator/SimpleSliceReader.java | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/71a7aeae/src/java/org/apache/cassandra/db/CollationController.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/CollationController.java index eb5192e,908df3b..4bba554 --- a/src/java/org/apache/cassandra/db/CollationController.java +++ b/src/java/org/apache/cassandra/db/CollationController.java @@@ -67,8 -76,7 +67,7 @@@ public class CollationControlle */ private ColumnFamily collectTimeOrderedData() { - logger.trace("collectTimeOrderedData"); - ColumnFamily container = ColumnFamily.create(cfs.metadata, factory, filter.filter.isReversed()); + final ColumnFamily container = ArrayBackedSortedColumns.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); http://git-wip-us.apache.org/repos/asf/cassandra/blob/71a7aeae/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/71a7aeae/src/java/org/apache/cassandra/db/columniterator/SimpleSliceReader.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/columniterator/SimpleSliceReader.java index 5711fa2,19a73df..6d7055c --- a/src/java/org/apache/cassandra/db/columniterator/SimpleSliceReader.java +++ b/src/java/org/apache/cassandra/db/columniterator/SimpleSliceReader.java @@@ -29,8 -30,11 +29,9 @@@ import org.apache.cassandra.db.* import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.io.sstable.CorruptSSTableException; import org.apache.cassandra.io.sstable.Descriptor; -import org.apache.cassandra.io.sstable.IndexHelper; import org.apache.cassandra.io.sstable.SSTableReader; import org.apache.cassandra.io.util.FileDataInput; -import org.apache.cassandra.io.util.FileMark; + import org.apache.cassandra.tracing.Tracing; import org.apache.cassandra.utils.ByteBufferUtil; class SimpleSliceReader extends AbstractIterator<OnDiskAtom> implements OnDiskAtomIterator @@@ -46,7 -52,8 +47,7 @@@ public SimpleSliceReader(SSTableReader sstable, RowIndexEntry indexEntry, FileDataInput input, ByteBuffer finishColumn) { - logger.debug("Slicing {}", sstable); + Tracing.trace("Seeking to partition beginning in data file"); - this.sstable = sstable; this.finishColumn = finishColumn; this.comparator = sstable.metadata.comparator; try
