Repository: incubator-blur Updated Branches: refs/heads/master e2c876de7 -> 8a9160065
fix a few declarations Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/8a916006 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/8a916006 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/8a916006 Branch: refs/heads/master Commit: 8a91600657a6c5b10ff92a37a278fb10875c243d Parents: e2c876d Author: twilliams <[email protected]> Authored: Thu Sep 25 20:08:56 2014 -0400 Committer: twilliams <[email protected]> Committed: Thu Sep 25 20:08:56 2014 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/blur/command/TermsCommand.java | 3 ++- blur-core/src/main/java/org/apache/blur/manager/IndexManager.java | 3 ++- .../main/java/org/apache/blur/thrift/BlurControllerServer.java | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/8a916006/blur-command/src/main/java/org/apache/blur/command/TermsCommand.java ---------------------------------------------------------------------- diff --git a/blur-command/src/main/java/org/apache/blur/command/TermsCommand.java b/blur-command/src/main/java/org/apache/blur/command/TermsCommand.java index b9b62b9..2cb80ab 100644 --- a/blur-command/src/main/java/org/apache/blur/command/TermsCommand.java +++ b/blur-command/src/main/java/org/apache/blur/command/TermsCommand.java @@ -4,6 +4,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.SortedSet; import java.util.TreeSet; import org.apache.blur.utils.BlurUtil; @@ -58,7 +59,7 @@ public class TermsCommand extends Command implements ClusterReadCombiningCommand @Override public BlurArray combine(CombiningContext context, Map<? extends Location<?>, BlurArray> results) throws IOException, InterruptedException { - TreeSet<String> terms = Sets.newTreeSet(); + SortedSet<String> terms = Sets.newTreeSet(); for (BlurArray t : results.values()) { http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/8a916006/blur-core/src/main/java/org/apache/blur/manager/IndexManager.java ---------------------------------------------------------------------- diff --git a/blur-core/src/main/java/org/apache/blur/manager/IndexManager.java b/blur-core/src/main/java/org/apache/blur/manager/IndexManager.java index 0fad374..51c4561 100644 --- a/blur-core/src/main/java/org/apache/blur/manager/IndexManager.java +++ b/blur-core/src/main/java/org/apache/blur/manager/IndexManager.java @@ -34,6 +34,7 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Set; +import java.util.SortedSet; import java.util.TreeSet; import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; @@ -989,7 +990,7 @@ public class IndexManager { }).merge(new Merger<List<String>>() { @Override public List<String> merge(BlurExecutorCompletionService<List<String>> service) throws BlurException { - TreeSet<String> terms = new TreeSet<String>(); + SortedSet<String> terms = new TreeSet<String>(); while (service.getRemainingCount() > 0) { Future<List<String>> future = service.poll(_defaultParallelCallTimeout, TimeUnit.MILLISECONDS, true, table, columnFamily, columnName, startWith, size); http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/8a916006/blur-core/src/main/java/org/apache/blur/thrift/BlurControllerServer.java ---------------------------------------------------------------------- diff --git a/blur-core/src/main/java/org/apache/blur/thrift/BlurControllerServer.java b/blur-core/src/main/java/org/apache/blur/thrift/BlurControllerServer.java index ad10ac0..4cbae31 100644 --- a/blur-core/src/main/java/org/apache/blur/thrift/BlurControllerServer.java +++ b/blur-core/src/main/java/org/apache/blur/thrift/BlurControllerServer.java @@ -31,6 +31,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Random; import java.util.Set; +import java.util.SortedSet; import java.util.Timer; import java.util.TimerTask; import java.util.TreeSet; @@ -980,7 +981,7 @@ public class BlurControllerServer extends TableAdmin implements Iface { }, new Merger<List<String>>() { @Override public List<String> merge(BlurExecutorCompletionService<List<String>> service) throws BlurException { - TreeSet<String> terms = new TreeSet<String>(); + SortedSet<String> terms = new TreeSet<String>(); while (service.getRemainingCount() > 0) { Future<List<String>> future = service.poll(_defaultParallelCallTimeout, TimeUnit.MILLISECONDS, true, table, columnFamily, columnName, startWith, size);
