You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by be...@apache.org on 2014/12/19 16:45:46 UTC
[1/2] cassandra git commit: fix imports
Repository: cassandra
Updated Branches:
refs/heads/trunk 9a51c3c3a -> 82a97f52e
fix imports
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/58529c77
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/58529c77
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/58529c77
Branch: refs/heads/trunk
Commit: 58529c77f4a2159fbfbe696c619787c327c80763
Parents: 871f003
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Fri Dec 19 15:43:38 2014 +0000
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Fri Dec 19 15:43:38 2014 +0000
----------------------------------------------------------------------
.../org/apache/cassandra/io/sstable/SSTableRewriterTest.java | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/58529c77/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
index 392936d..88bb8dc 100644
--- a/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
@@ -30,11 +30,7 @@ import org.junit.Test;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
-import org.apache.cassandra.db.ArrayBackedSortedColumns;
-import org.apache.cassandra.db.ColumnFamilyStore;
-import org.apache.cassandra.db.DecoratedKey;
-import org.apache.cassandra.db.Keyspace;
-import org.apache.cassandra.db.Mutation;
+import org.apache.cassandra.db.*;
import org.apache.cassandra.db.compaction.AbstractCompactedRow;
import org.apache.cassandra.db.compaction.AbstractCompactionStrategy;
import org.apache.cassandra.db.compaction.CompactionController;
@@ -643,7 +639,7 @@ public class SSTableRewriterTest extends SchemaLoader
SSTableWriter w = getWriter(cfs, s.descriptor.directory);
rewriter.switchWriter(w);
int keyCount = 0;
- try (ICompactionScanner scanner = compacting.iterator().next().getScanner();
+ try (ISSTableScanner scanner = compacting.iterator().next().getScanner();
CompactionController controller = new CompactionController(cfs, compacting, 0))
{
while (scanner.hasNext())
[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by be...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Conflicts:
test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/82a97f52
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/82a97f52
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/82a97f52
Branch: refs/heads/trunk
Commit: 82a97f52eaeb0ecdaed96cab09d9e9d082a8dfcd
Parents: 9a51c3c 58529c7
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Fri Dec 19 15:45:33 2014 +0000
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Fri Dec 19 15:45:33 2014 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------