Author: gunther
Date: Fri Dec 20 03:01:10 2013
New Revision: 1552483
URL: http://svn.apache.org/r1552483
Log:
HIVE-6079: Hadoop 1 tests fail in tez branch (Vikram Dixit K via Gunther
Hagleitner)
Modified:
hive/branches/tez/itests/qtest/pom.xml
hive/branches/tez/packaging/src/main/assembly/bin.xml
hive/branches/tez/ql/pom.xml
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezTask.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java
Modified: hive/branches/tez/itests/qtest/pom.xml
URL:
http://svn.apache.org/viewvc/hive/branches/tez/itests/qtest/pom.xml?rev=1552483&r1=1552482&r2=1552483&view=diff
==============================================================================
--- hive/branches/tez/itests/qtest/pom.xml (original)
+++ hive/branches/tez/itests/qtest/pom.xml Fri Dec 20 03:01:10 2013
@@ -330,6 +330,42 @@
<version>${tez.version}</version>
<type>test-jar</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.tez</groupId>
+ <artifactId>tez-api</artifactId>
+ <version>${tez.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tez</groupId>
+ <artifactId>tez-runtime-library</artifactId>
+ <version>${tez.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tez</groupId>
+ <artifactId>tez-mapreduce</artifactId>
+ <version>${tez.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tez</groupId>
+ <artifactId>tez-dag</artifactId>
+ <version>${tez.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency >
+ <groupId>org.apache.tez</groupId>
+ <artifactId>tez-common</artifactId>
+ <version>${tez.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tez</groupId>
+ <artifactId>tez-runtime-internals</artifactId>
+ <version>${tez.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</profile>
</profiles>
Modified: hive/branches/tez/packaging/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/hive/branches/tez/packaging/src/main/assembly/bin.xml?rev=1552483&r1=1552482&r2=1552483&view=diff
==============================================================================
--- hive/branches/tez/packaging/src/main/assembly/bin.xml (original)
+++ hive/branches/tez/packaging/src/main/assembly/bin.xml Fri Dec 20 03:01:10
2013
@@ -40,7 +40,6 @@
<useTransitiveFiltering>true</useTransitiveFiltering>
<excludes>
<exclude>org.apache.hive.hcatalog:*</exclude>
- <exclude>org.apache.tez:*</exclude>
</excludes>
</dependencySet>
<dependencySet>
Modified: hive/branches/tez/ql/pom.xml
URL:
http://svn.apache.org/viewvc/hive/branches/tez/ql/pom.xml?rev=1552483&r1=1552482&r2=1552483&view=diff
==============================================================================
--- hive/branches/tez/ql/pom.xml (original)
+++ hive/branches/tez/ql/pom.xml Fri Dec 20 03:01:10 2013
@@ -219,16 +219,19 @@
<groupId>org.apache.tez</groupId>
<artifactId>tez-api</artifactId>
<version>${tez.version}</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.tez</groupId>
<artifactId>tez-runtime-library</artifactId>
<version>${tez.version}</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.tez</groupId>
<artifactId>tez-mapreduce</artifactId>
<version>${tez.version}</version>
+ <optional>true</optional>
</dependency>
</dependencies>
@@ -259,21 +262,6 @@
<version>${hadoop-23.version}</version>
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>org.apache.tez</groupId>
- <artifactId>tez-dag</artifactId>
- <version>${tez.version}</version>
- </dependency>
- <dependency >
- <groupId>org.apache.tez</groupId>
- <artifactId>tez-common</artifactId>
- <version>${tez.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tez</groupId>
- <artifactId>tez-runtime-internals</artifactId>
- <version>${tez.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
Modified:
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezTask.java
URL:
http://svn.apache.org/viewvc/hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezTask.java?rev=1552483&r1=1552482&r2=1552483&view=diff
==============================================================================
---
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezTask.java
(original)
+++
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezTask.java
Fri Dec 20 03:01:10 2013
@@ -111,6 +111,13 @@ public class TezTask extends Task<TezWor
// get a session.
SessionState ss = SessionState.get();
session = ss.getTezSession();
+
+ // if we don't have one yet create it.
+ if (session == null) {
+ ss.setTezSession(new TezSessionState());
+ }
+
+ // if it's not running start it.
if (!session.isOpen()) {
// can happen if the user sets the tez flag after the session was
// established
Modified:
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java
URL:
http://svn.apache.org/viewvc/hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java?rev=1552483&r1=1552482&r2=1552483&view=diff
==============================================================================
---
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java
(original)
+++
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java
Fri Dec 20 03:01:10 2013
@@ -137,7 +137,7 @@ public class SessionState {
private Map<String, List<String>> localMapRedErrors;
- private final TezSessionState tezSessionState;
+ private TezSessionState tezSessionState;
private String currentDatabase;
@@ -199,7 +199,6 @@ public class SessionState {
this.conf = conf;
isSilent = conf.getBoolVar(HiveConf.ConfVars.HIVESESSIONSILENT);
ls = new LineageState();
- tezSessionState = new TezSessionState();
overriddenConfigurations = new HashMap<String, String>();
overriddenConfigurations.putAll(HiveConf.getConfSystemProperties());
// if there isn't already a session name, go ahead and create it.
@@ -313,6 +312,9 @@ public class SessionState {
if (HiveConf.getBoolVar(startSs.getConf(),
HiveConf.ConfVars.HIVE_OPTIMIZE_TEZ)) {
try {
+ if (startSs.tezSessionState == null) {
+ startSs.tezSessionState = new TezSessionState();
+ }
startSs.tezSessionState.open(startSs.getSessionId(), startSs.conf);
} catch (Exception e) {
throw new RuntimeException(e);
@@ -859,4 +861,7 @@ public class SessionState {
return tezSessionState;
}
+ public void setTezSession(TezSessionState session) {
+ this.tezSessionState = session;
+ }
}
