Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e7049056 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e7049056 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e7049056 Branch: refs/heads/trunk Commit: e704905641261e9e44ff138c588896002240acc5 Parents: 0cc0d8d 089f92b Author: Dave Brosius <[email protected]> Authored: Sat Jul 20 15:34:58 2013 -0400 Committer: Dave Brosius <[email protected]> Committed: Sat Jul 20 15:34:58 2013 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/tools/SSTableExport.java | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7049056/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7049056/src/java/org/apache/cassandra/tools/SSTableExport.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/tools/SSTableExport.java index 3e51d17,05fe9f6..1568b00 --- a/src/java/org/apache/cassandra/tools/SSTableExport.java +++ b/src/java/org/apache/cassandra/tools/SSTableExport.java @@@ -303,26 -346,20 +303,25 @@@ public class SSTableExpor lastKey = decoratedKey; - scanner.seekTo(decoratedKey); - - if (!scanner.hasNext()) + RowIndexEntry entry = sstable.getPosition(decoratedKey, SSTableReader.Operator.EQ); + if (entry == null) continue; - SSTableIdentityIterator row = (SSTableIdentityIterator) scanner.next(); - if (!row.getKey().equals(decoratedKey)) - continue; + dfile.seek(entry.position); + ByteBufferUtil.readWithShortLength(dfile); // row key + if (sstable.descriptor.version.hasRowSizeAndColumnCount) + dfile.readLong(); // row size + DeletionInfo deletionInfo = new DeletionInfo(DeletionTime.serializer.deserialize(dfile)); + int columnCount = sstable.descriptor.version.hasRowSizeAndColumnCount ? dfile.readInt() : Integer.MAX_VALUE; + + Iterator<OnDiskAtom> atomIterator = sstable.metadata.getOnDiskIterator(dfile, columnCount, sstable.descriptor.version); + - serializeRow(deletionInfo, atomIterator, sstable.metadata, decoratedKey, outs); ++ checkStream(outs); if (i != 0) outs.println(","); - - checkStream(outs); i++; - - serializeRow(row, decoratedKey, outs); ++ serializeRow(deletionInfo, atomIterator, sstable.metadata, decoratedKey, outs); } outs.println("\n]");
