Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B6584100C8 for ; Fri, 19 Dec 2014 15:45:51 +0000 (UTC) Received: (qmail 88252 invoked by uid 500); 19 Dec 2014 15:45:46 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 88219 invoked by uid 500); 19 Dec 2014 15:45:46 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 88199 invoked by uid 99); 19 Dec 2014 15:45:46 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Dec 2014 15:45:46 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 11E51A2F55B; Fri, 19 Dec 2014 15:45:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: benedict@apache.org To: commits@cassandra.apache.org Date: Fri, 19 Dec 2014 15:45:46 -0000 Message-Id: <885b9e149c564f2aa0b2fdfe3c1cc298@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [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 Authored: Fri Dec 19 15:43:38 2014 +0000 Committer: Benedict Elliott Smith 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())