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 2014/01/04 03:33:07 UTC
git commit: reorder imports
Updated Branches:
refs/heads/trunk 1c38fbf9d -> 25777e1f4
reorder imports
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/25777e1f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/25777e1f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/25777e1f
Branch: refs/heads/trunk
Commit: 25777e1f462e153a5670a107eeb65fb186bf9530
Parents: 1c38fbf
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Jan 3 20:33:02 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Jan 3 20:33:02 2014 -0600
----------------------------------------------------------------------
.../apache/cassandra/db/AtomicBTreeColumns.java | 19 +++++++-------
.../apache/cassandra/utils/LongBTreeTest.java | 26 +++++++++++---------
2 files changed, 25 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/25777e1f/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java b/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
index 8d37356..6fe8758 100644
--- a/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
+++ b/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
@@ -17,8 +17,16 @@
*/
package org.apache.cassandra.db;
-import com.google.common.base.*;
-import com.google.common.collect.*;
+import java.util.AbstractCollection;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
+
+import com.google.common.base.Function;
+import com.google.common.base.Functions;
+import com.google.common.collect.Iterators;
import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.db.composites.CellName;
@@ -30,13 +38,6 @@ import org.apache.cassandra.utils.btree.BTree;
import org.apache.cassandra.utils.btree.BTreeSet;
import org.apache.cassandra.utils.btree.ReplaceFunction;
-import java.util.AbstractCollection;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
-
import static org.apache.cassandra.db.index.SecondaryIndexManager.Updater;
/**
http://git-wip-us.apache.org/repos/asf/cassandra/blob/25777e1f/test/long/org/apache/cassandra/utils/LongBTreeTest.java
----------------------------------------------------------------------
diff --git a/test/long/org/apache/cassandra/utils/LongBTreeTest.java b/test/long/org/apache/cassandra/utils/LongBTreeTest.java
index 577977d..9f31743 100644
--- a/test/long/org/apache/cassandra/utils/LongBTreeTest.java
+++ b/test/long/org/apache/cassandra/utils/LongBTreeTest.java
@@ -1,16 +1,5 @@
package org.apache.cassandra.utils;
-import com.google.common.util.concurrent.*;
-import com.yammer.metrics.Metrics;
-import com.yammer.metrics.core.Timer;
-import com.yammer.metrics.core.TimerContext;
-import com.yammer.metrics.stats.Snapshot;
-import edu.stanford.ppl.concurrent.SnapTreeMap;
-import org.apache.cassandra.concurrent.NamedThreadFactory;
-import org.apache.cassandra.utils.btree.BTree;
-import org.apache.cassandra.utils.btree.BTreeSet;
-import org.junit.*;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
@@ -26,6 +15,21 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListenableFutureTask;
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.yammer.metrics.Metrics;
+import com.yammer.metrics.core.Timer;
+import com.yammer.metrics.core.TimerContext;
+import com.yammer.metrics.stats.Snapshot;
+import edu.stanford.ppl.concurrent.SnapTreeMap;
+import org.apache.cassandra.concurrent.NamedThreadFactory;
+import org.apache.cassandra.utils.btree.BTree;
+import org.apache.cassandra.utils.btree.BTreeSet;
+
// TODO : should probably lower fan-factor for tests to make them more intensive
public class LongBTreeTest
{