Repository: tajo Updated Branches: refs/heads/branch-0.11.1 e3443c6df -> b9f2d4ef9
TAJO-1950: Query master uses too much memory during range shuffle. (fix compilation error) Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/b9f2d4ef Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/b9f2d4ef Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/b9f2d4ef Branch: refs/heads/branch-0.11.1 Commit: b9f2d4ef9b38cd0a4c0b7a04667e2b1e23bf873b Parents: e3443c6 Author: Jihoon Son <[email protected]> Authored: Tue Dec 29 22:04:04 2015 +0900 Committer: Jihoon Son <[email protected]> Committed: Tue Dec 29 22:04:04 2015 +0900 ---------------------------------------------------------------------- .../src/main/java/org/apache/tajo/querymaster/Repartitioner.java | 2 +- tajo-core/src/main/java/org/apache/tajo/worker/FetchImpl.java | 3 --- tajo-core/src/main/java/org/apache/tajo/worker/TaskImpl.java | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/b9f2d4ef/tajo-core/src/main/java/org/apache/tajo/querymaster/Repartitioner.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/querymaster/Repartitioner.java b/tajo-core/src/main/java/org/apache/tajo/querymaster/Repartitioner.java index 9209ad1..59c1cb4 100644 --- a/tajo-core/src/main/java/org/apache/tajo/querymaster/Repartitioner.java +++ b/tajo-core/src/main/java/org/apache/tajo/querymaster/Repartitioner.java @@ -1181,7 +1181,7 @@ public class Repartitioner { for (int i = 0; i < taskIds.size(); i++) { taskAndAttemptIds.add(new Pair<>(taskIds.get(i), attemptIds.get(i))); } - taskAndAttemptIds.sort(new Comparator<Pair<Integer, Integer>>() { + Collections.sort(taskAndAttemptIds, new Comparator<Pair<Integer, Integer>>() { @Override public int compare(Pair<Integer, Integer> p1, Pair<Integer, Integer> p2) { return p1.getFirst() - p2.getFirst(); http://git-wip-us.apache.org/repos/asf/tajo/blob/b9f2d4ef/tajo-core/src/main/java/org/apache/tajo/worker/FetchImpl.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/worker/FetchImpl.java b/tajo-core/src/main/java/org/apache/tajo/worker/FetchImpl.java index 28ab526..6338616 100644 --- a/tajo-core/src/main/java/org/apache/tajo/worker/FetchImpl.java +++ b/tajo-core/src/main/java/org/apache/tajo/worker/FetchImpl.java @@ -28,14 +28,11 @@ import org.apache.tajo.common.ProtoObject; import org.apache.tajo.querymaster.Task; import org.apache.tajo.storage.RowStoreUtil.RowStoreEncoder; import org.apache.tajo.storage.TupleRange; -import org.apache.tajo.util.Pair; import org.apache.tajo.util.TUtil; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.IntStream; import static org.apache.tajo.plan.serder.PlanProto.ShuffleType; http://git-wip-us.apache.org/repos/asf/tajo/blob/b9f2d4ef/tajo-core/src/main/java/org/apache/tajo/worker/TaskImpl.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/worker/TaskImpl.java b/tajo-core/src/main/java/org/apache/tajo/worker/TaskImpl.java index bad2510..39e9857 100644 --- a/tajo-core/src/main/java/org/apache/tajo/worker/TaskImpl.java +++ b/tajo-core/src/main/java/org/apache/tajo/worker/TaskImpl.java @@ -258,7 +258,7 @@ public class TaskImpl implements Task { @Override public void fetch(ExecutorService fetcherExecutor) { // Sort the execution order of fetch runners to increase the cache hit in pull server - fetcherRunners.sort(new Comparator<Fetcher>() { + Collections.sort(fetcherRunners, new Comparator<Fetcher>() { @Override public int compare(Fetcher f1, Fetcher f2) { String strUri = f1.getURI().toString();
