You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2013/07/20 21:36:37 UTC
[1/2] git commit:
src/java/org/apache/cassandra/tools/SSTableExport.java patch by clohfink
reviewed by dbrosius for cassandra-5781
Updated Branches:
refs/heads/trunk 0cc0d8ded -> e70490564
src/java/org/apache/cassandra/tools/SSTableExport.java
patch by clohfink reviewed by dbrosius for cassandra-5781
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/089f92b1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/089f92b1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/089f92b1
Branch: refs/heads/trunk
Commit: 089f92b1a04cbcc7d391ea7e61d90df56174ad73
Parents: 27efded
Author: Dave Brosius <db...@apache.org>
Authored: Sat Jul 20 15:12:54 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Sat Jul 20 15:12:54 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/089f92b1/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index f8a3f09..23f19d4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -22,6 +22,7 @@
* Fix minor bug in Range.intersects(Bound) (CASSANDRA-5771)
* cqlsh: handle disabled compression in DESCRIBE output (CASSANDRA-5766)
* Ensure all UP events are notified on the native protocol (CASSANDRA-5769)
+ * Fix formatting of sstable2json with multiple -k arguments (CASSANDRA-5781)
1.2.6
http://git-wip-us.apache.org/repos/asf/cassandra/blob/089f92b1/src/java/org/apache/cassandra/tools/SSTableExport.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/SSTableExport.java b/src/java/org/apache/cassandra/tools/SSTableExport.java
index d3fca4c..05fe9f6 100644
--- a/src/java/org/apache/cassandra/tools/SSTableExport.java
+++ b/src/java/org/apache/cassandra/tools/SSTableExport.java
@@ -355,12 +355,11 @@ public class SSTableExport
if (!row.getKey().equals(decoratedKey))
continue;
- serializeRow(row, decoratedKey, outs);
-
if (i != 0)
outs.println(",");
-
i++;
+
+ serializeRow(row, decoratedKey, outs);
}
outs.println("\n]");
[2/2] git commit: Merge branch 'cassandra-1.2' into trunk
Posted by db...@apache.org.
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 <db...@apache.org>
Authored: Sat Jul 20 15:34:58 2013 -0400
Committer: Dave Brosius <db...@apache.org>
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]");