diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionState.java ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionState.java index fd1671b..b2f7b44 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionState.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionState.java @@ -33,9 +33,6 @@ import org.apache.hadoop.hdfs.DistributedFileSystem; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.ql.ErrorMsg; -import org.apache.hadoop.hive.ql.metadata.Hive; -import org.apache.hadoop.hive.ql.metadata.HiveException; -import org.apache.hadoop.hive.shims.ShimLoader; import org.apache.hadoop.yarn.api.records.LocalResource; import org.apache.tez.client.AMConfiguration; import org.apache.tez.client.TezSession; @@ -93,9 +90,6 @@ public void open(String sessionId, HiveConf conf) // generate basic tez config TezConfiguration tezConfig = new TezConfiguration(conf); - tezConfig.set(TezConfiguration.TEZ_AM_JAVA_OPTS, - MRHelpers.getMRAMJavaOpts(conf)); - tezConfig.set(TezConfiguration.TEZ_AM_STAGING_DIR, tezScratchDir.toUri().toString()); // unless already installed on all the cluster nodes, we'll have to @@ -106,7 +100,7 @@ public void open(String sessionId, HiveConf conf) Map commonLocalResources = new HashMap(); commonLocalResources.put(DagUtils.getBaseName(appJarLr), appJarLr); - AMConfiguration amConfig = new AMConfiguration("default", null, commonLocalResources, + AMConfiguration amConfig = new AMConfiguration(null, commonLocalResources, tezConfig, null); // configuration for the session