You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/05/02 19:18:40 UTC
[1/2] git commit: fix tests
Updated Branches:
refs/heads/trunk b6be6835d -> 976c388ef
fix tests
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/57c75a7c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/57c75a7c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/57c75a7c
Branch: refs/heads/trunk
Commit: 57c75a7c296c1952704b8347eb8ce6f1d3d3704b
Parents: b6be683
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu May 2 12:18:23 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu May 2 12:18:23 2013 -0500
----------------------------------------------------------------------
.../apache/cassandra/tools/SSTableExportTest.java | 25 ---------------
1 files changed, 0 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/57c75a7c/test/unit/org/apache/cassandra/tools/SSTableExportTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/tools/SSTableExportTest.java b/test/unit/org/apache/cassandra/tools/SSTableExportTest.java
index 975051f..0db0c07 100644
--- a/test/unit/org/apache/cassandra/tools/SSTableExportTest.java
+++ b/test/unit/org/apache/cassandra/tools/SSTableExportTest.java
@@ -335,29 +335,4 @@ public class SSTableExportTest extends SchemaLoader
assertEquals("column value did not match", ByteBufferUtil.bytes("val1"), hexToBytes((String) col2.get(1)));
}
-
- @Test(expected=IOException.class)
- public void testBrokenPipeEnumerateKeys() throws IOException
- {
- SSTableWriter writer = getDummyWriter();
- writer.closeAndOpenReader();
- SSTableExport.enumeratekeys(Descriptor.fromFilename(writer.getFilename()), dummyStream);
- }
-
- @Test(expected=IOException.class)
- public void testBrokenPipeExport1() throws IOException
- {
- SSTableWriter writer = getDummyWriter();
- SSTableExport.export(writer.closeAndOpenReader(), dummyStream, new String[0]);
- }
-
- @Test(expected=IOException.class)
- public void testBrokenPipeExport2() throws IOException
- {
- SSTableWriter writer = getDummyWriter();
- writer.closeAndOpenReader();
- SSTableExport.export(Descriptor.fromFilename(writer.getFilename()), dummyStream,
- new ArrayList<String>(Arrays.asList("colA")), new String[]{"colA"});
- }
-
}
[2/2] git commit: r/m dead code
Posted by jb...@apache.org.
r/m dead code
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/976c388e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/976c388e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/976c388e
Branch: refs/heads/trunk
Commit: 976c388ef1bb927d05b8e7e2f8f026804ba39aa4
Parents: 57c75a7
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu May 2 12:18:38 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu May 2 12:18:38 2013 -0500
----------------------------------------------------------------------
.../org/apache/cassandra/tools/SSTableExport.java | 11 -----------
1 files changed, 0 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/976c388e/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 e86b733..4b91dd8 100644
--- a/src/java/org/apache/cassandra/tools/SSTableExport.java
+++ b/src/java/org/apache/cassandra/tools/SSTableExport.java
@@ -144,17 +144,6 @@ public class SSTableExport
}
}
- private static void serializeColumns(Iterator<Column> columns, PrintStream out, AbstractType<?> comparator, CFMetaData cfMetaData)
- {
- while (columns.hasNext())
- {
- writeJSON(out, serializeColumn(columns.next(), comparator, cfMetaData));
-
- if (columns.hasNext())
- out.print(", ");
- }
- }
-
private static List<Object> serializeAtom(OnDiskAtom atom, AbstractType<?> comparator, CFMetaData cfMetaData)
{
if (atom instanceof Column)