You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by hy...@apache.org on 2014/09/19 10:24:22 UTC
[4/4] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/tajo into block_iteration
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into block_iteration
Conflicts:
tajo-core/src/main/java/org/apache/tajo/worker/Task.java
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/64ba68c7
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/64ba68c7
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/64ba68c7
Branch: refs/heads/block_iteration
Commit: 64ba68c763eff9e60e9cf7d8cffa5f74b5c86fd8
Parents: c969a61 2001774
Author: Hyunsik Choi <hy...@apache.org>
Authored: Fri Sep 19 01:23:52 2014 -0700
Committer: Hyunsik Choi <hy...@apache.org>
Committed: Fri Sep 19 01:23:52 2014 -0700
----------------------------------------------------------------------
CHANGES | 8 ++++++++
.../tajo/engine/planner/PreLogicalPlanVerifier.java | 4 ++++
.../org/apache/tajo/master/querymaster/SubQuery.java | 15 ++++++++-------
.../apache/tajo/worker/ExecutionBlockContext.java | 5 +++++
.../main/java/org/apache/tajo/worker/Fetcher.java | 9 ++-------
.../src/main/java/org/apache/tajo/worker/Task.java | 4 +++-
.../org/apache/tajo/worker/TaskRunnerManager.java | 13 +++++++++++++
.../java/org/apache/tajo/worker/TestFetcher.java | 15 ++++++++++-----
8 files changed, 53 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/64ba68c7/CHANGES
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/64ba68c7/tajo-core/src/main/java/org/apache/tajo/worker/Task.java
----------------------------------------------------------------------
diff --cc tajo-core/src/main/java/org/apache/tajo/worker/Task.java
index d2cb60d,c9c83d1..3b438d2
--- a/tajo-core/src/main/java/org/apache/tajo/worker/Task.java
+++ b/tajo-core/src/main/java/org/apache/tajo/worker/Task.java
@@@ -49,11 -49,11 +49,12 @@@ import org.apache.tajo.ipc.QueryMasterP
import org.apache.tajo.ipc.TajoWorkerProtocol.*;
import org.apache.tajo.ipc.TajoWorkerProtocol.EnforceProperty.EnforceType;
import org.apache.tajo.rpc.NullCallback;
+import org.apache.tajo.storage.BaseTupleComparator;
+import org.apache.tajo.storage.RawFile;
import org.apache.tajo.storage.StorageUtil;
-import org.apache.tajo.storage.TupleComparator;
import org.apache.tajo.storage.fragment.FileFragment;
import org.jboss.netty.channel.socket.ClientSocketChannelFactory;
+ import org.jboss.netty.util.Timer;
import java.io.File;
import java.io.IOException;
@@@ -688,8 -687,8 +690,8 @@@ public class Task
if (!storeDir.exists()) {
storeDir.mkdirs();
}
- storeFile = new File(storeDir, "in_" + i);
+ storeFile = new File(storeDir, "in_" + i + "." + RawFile.FILE_EXTENSION);
- Fetcher fetcher = new Fetcher(systemConf, uri, storeFile, channelFactory);
+ Fetcher fetcher = new Fetcher(systemConf, uri, storeFile, channelFactory, timer);
runnerList.add(fetcher);
i++;
}