HIVE-12850. Fixes after changes made in TEZ-2669 and TEZ-3024. (Siddharth Seth, reviewed by Sergey Shelukhin)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/c153a146 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/c153a146 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/c153a146 Branch: refs/heads/master Commit: c153a1466fd425b23269f4541310af189a4cc7a5 Parents: 5a9ccdd Author: Siddharth Seth <ss...@apache.org> Authored: Sun Jan 24 15:25:03 2016 -0800 Committer: Siddharth Seth <ss...@apache.org> Committed: Sun Jan 24 15:25:03 2016 -0800 ---------------------------------------------------------------------- .../apache/hadoop/hive/llap/tezplugins/LlapTaskCommunicator.java | 2 +- .../hadoop/hive/llap/tezplugins/helpers/SourceStateTracker.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/c153a146/llap-server/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapTaskCommunicator.java ---------------------------------------------------------------------- diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapTaskCommunicator.java b/llap-server/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapTaskCommunicator.java index ae7d291..eb6384f 100644 --- a/llap-server/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapTaskCommunicator.java +++ b/llap-server/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapTaskCommunicator.java @@ -63,7 +63,6 @@ import org.apache.hadoop.yarn.api.records.ContainerId; import org.apache.hadoop.yarn.api.records.LocalResource; import org.apache.tez.common.TezTaskUmbilicalProtocol; import org.apache.tez.common.security.JobTokenSecretManager; -import org.apache.tez.dag.api.TaskCommunicatorContext; import org.apache.tez.dag.api.TezConfiguration; import org.apache.tez.dag.api.TezException; import org.apache.tez.dag.api.TezUncheckedException; @@ -75,6 +74,7 @@ import org.apache.tez.runtime.api.impl.TezHeartbeatRequest; import org.apache.tez.runtime.api.impl.TezHeartbeatResponse; import org.apache.tez.serviceplugins.api.ContainerEndReason; import org.apache.tez.serviceplugins.api.TaskAttemptEndReason; +import org.apache.tez.serviceplugins.api.TaskCommunicatorContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/hive/blob/c153a146/llap-server/src/java/org/apache/hadoop/hive/llap/tezplugins/helpers/SourceStateTracker.java ---------------------------------------------------------------------- diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/tezplugins/helpers/SourceStateTracker.java b/llap-server/src/java/org/apache/hadoop/hive/llap/tezplugins/helpers/SourceStateTracker.java index 628fe9c..fded9bf 100644 --- a/llap-server/src/java/org/apache/hadoop/hive/llap/tezplugins/helpers/SourceStateTracker.java +++ b/llap-server/src/java/org/apache/hadoop/hive/llap/tezplugins/helpers/SourceStateTracker.java @@ -24,8 +24,8 @@ import java.util.Map; import java.util.Set; import org.apache.commons.lang3.mutable.MutableInt; -import org.apache.hadoop.hive.llap.daemon.impl.QueryIdentifier; import org.apache.hadoop.hive.llap.daemon.rpc.LlapDaemonProtocolProtos.QueryIdentifierProto; +import org.apache.tez.serviceplugins.api.TaskCommunicatorContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.llap.LlapNodeId; @@ -33,7 +33,6 @@ import org.apache.hadoop.hive.llap.daemon.rpc.LlapDaemonProtocolProtos.FragmentR import org.apache.hadoop.hive.llap.daemon.rpc.LlapDaemonProtocolProtos.SourceStateUpdatedRequestProto; import org.apache.hadoop.hive.llap.tezplugins.Converters; import org.apache.hadoop.hive.llap.tezplugins.LlapTaskCommunicator; -import org.apache.tez.dag.api.TaskCommunicatorContext; import org.apache.tez.dag.api.event.VertexState; import org.apache.tez.mapreduce.input.MRInput; import org.apache.tez.mapreduce.input.MRInputLegacy;