You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by gu...@apache.org on 2014/01/09 02:38:32 UTC
svn commit: r1556695 - in /hive/branches/tez: conf/
hcatalog/webhcat/svr/src/test/data/status/hive/ ql/
ql/src/java/org/apache/hadoop/hive/ql/
ql/src/java/org/apache/hadoop/hive/ql/exec/
ql/src/java/org/apache/hadoop/hive/ql/exec/tez/ shims/0.23/ shims...
Author: gunther
Date: Thu Jan 9 01:38:32 2014
New Revision: 1556695
URL: http://svn.apache.org/r1556695
Log:
HIVE-6172: Whitespaces and comments on Tez (Gunther Hagleitner)
Modified:
hive/branches/tez/conf/hive-default.xml.template
hive/branches/tez/hcatalog/webhcat/svr/src/test/data/status/hive/stderr
hive/branches/tez/ql/pom.xml
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/Driver.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/HashTableLoader.java
hive/branches/tez/shims/0.23/pom.xml
hive/branches/tez/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java
Modified: hive/branches/tez/conf/hive-default.xml.template
URL: http://svn.apache.org/viewvc/hive/branches/tez/conf/hive-default.xml.template?rev=1556695&r1=1556694&r2=1556695&view=diff
==============================================================================
--- hive/branches/tez/conf/hive-default.xml.template (original)
+++ hive/branches/tez/conf/hive-default.xml.template Thu Jan 9 01:38:32 2014
@@ -2162,4 +2162,23 @@
</description>
</property>
+<property>
+ <name>hive.jar.directory</name>
+ <value>hdfs:///user/hive/</value>
+ <description>
+ This is the location hive in tez mode will look for to find a site wide
+ installed hive instance.
+ </description>
+</property>
+
+<property>
+ <name>hive.user.install.directory</name>
+ <value>hdfs:///user/</value>
+ <description>
+ If hive (in tez mode only) cannot find a usable hive jar in "hive.jar.directory",
+ it will upload the hive jar to <hive.user.install.directory>/<user name>
+ and use it to run queries.
+ </description>
+</property>
+
</configuration>
Modified: hive/branches/tez/hcatalog/webhcat/svr/src/test/data/status/hive/stderr
URL: http://svn.apache.org/viewvc/hive/branches/tez/hcatalog/webhcat/svr/src/test/data/status/hive/stderr?rev=1556695&r1=1556694&r2=1556695&view=diff
==============================================================================
--- hive/branches/tez/hcatalog/webhcat/svr/src/test/data/status/hive/stderr (original)
+++ hive/branches/tez/hcatalog/webhcat/svr/src/test/data/status/hive/stderr Thu Jan 9 01:38:32 2014
@@ -19,7 +19,7 @@
WARNING: org.apache.hadoop.metrics.jvm.EventCounter is deprecated. Please use org.apache.hadoop.log.metrics.EventCounter in all the log4j.properties files.
Logging initialized using configuration in jar:file:/Users/daijy/hadoop-1.0.3/tmp/mapred/local/taskTracker/distcache/7168149899505899073_637041239_1133292873/localhost/apps/templeton/hive-0.10.0.tar.gz/hive-0.10.0/lib/hive-common-0.10.0.jar!/hive-log4j.properties
Hive history file=/tmp/daijy/hive_job_log_daijy_201305091500_862342848.txt
-Total MapReduce jobs = 1
+Total jobs = 1
Launching Job 1 out of 1
Number of reduce tasks is set to 0 since there's no reduce operator
Starting Job = job_201305091437_0012, Tracking URL = http://localhost:50030/jobdetails.jsp?jobid=job_201305091437_0012
Modified: hive/branches/tez/ql/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/pom.xml?rev=1556695&r1=1556694&r2=1556695&view=diff
==============================================================================
--- hive/branches/tez/ql/pom.xml (original)
+++ hive/branches/tez/ql/pom.xml Thu Jan 9 01:38:32 2014
@@ -215,7 +215,7 @@
<version>${mockito-all.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.tez</groupId>
<artifactId>tez-api</artifactId>
<version>${tez.version}</version>
@@ -247,7 +247,7 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.tez</groupId>
<artifactId>tez-runtime-library</artifactId>
<version>${tez.version}</version>
@@ -279,7 +279,7 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.tez</groupId>
<artifactId>tez-mapreduce</artifactId>
<version>${tez.version}</version>
Modified: hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/Driver.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/Driver.java?rev=1556695&r1=1556694&r2=1556695&view=diff
==============================================================================
--- hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/Driver.java (original)
+++ hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/Driver.java Thu Jan 9 01:38:32 2014
@@ -1215,7 +1215,7 @@ public class Driver implements CommandPr
int jobs = Utilities.getMRTasks(plan.getRootTasks()).size()
+ Utilities.getTezTasks(plan.getRootTasks()).size();
if (jobs > 0) {
- console.printInfo("Total MapReduce jobs = " + jobs);
+ console.printInfo("Total jobs = " + jobs);
}
if (SessionState.get() != null) {
SessionState.get().getHiveHistory().setQueryProperty(queryId, Keys.QUERY_NUM_TASKS,
Modified: hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java?rev=1556695&r1=1556694&r2=1556695&view=diff
==============================================================================
--- hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java (original)
+++ hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java Thu Jan 9 01:38:32 2014
@@ -316,7 +316,7 @@ public final class Utilities {
}
if (HiveConf.getBoolVar(conf, ConfVars.HIVE_RPC_QUERY_PLAN)) {
- LOG.debug("Loading plan from: "+path.toUri().getPath());
+ LOG.debug("Loading plan from string: "+path.toUri().getPath());
String planString = conf.get(path.toUri().getPath());
if (planString == null) {
LOG.debug("Could not find plan string in conf");
Modified: hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/HashTableLoader.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/HashTableLoader.java?rev=1556695&r1=1556694&r2=1556695&view=diff
==============================================================================
--- hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/HashTableLoader.java (original)
+++ hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/HashTableLoader.java Thu Jan 9 01:38:32 2014
@@ -81,7 +81,7 @@ public class HashTableLoader implements
while (kvReader.next()) {
MapJoinKey key = new MapJoinKey();
key.read(mapJoinTableSerdes[pos].getKeyContext(), (Writable)kvReader.getCurrentKey());
-
+
MapJoinRowContainer values = tableContainer.get(key);
if(values == null){
values = new MapJoinRowContainer();
Modified: hive/branches/tez/shims/0.23/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/shims/0.23/pom.xml?rev=1556695&r1=1556694&r2=1556695&view=diff
==============================================================================
--- hive/branches/tez/shims/0.23/pom.xml (original)
+++ hive/branches/tez/shims/0.23/pom.xml Thu Jan 9 01:38:32 2014
@@ -89,13 +89,13 @@
<version>${jetty.version}</version>
<optional>true</optional>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.tez</groupId>
<artifactId>tez-api</artifactId>
<version>${tez.version}</version>
<optional>true</optional>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.tez</groupId>
<artifactId>tez-dag</artifactId>
<version>${tez.version}</version>
@@ -107,13 +107,13 @@
<version>${tez.version}</version>
<optional>true</optional>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.tez</groupId>
<artifactId>tez-runtime-library</artifactId>
<version>${tez.version}</version>
<optional>true</optional>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.tez</groupId>
<artifactId>tez-mapreduce</artifactId>
<version>${tez.version}</version>
@@ -149,8 +149,8 @@
<version>${hadoop-23.version}</version>
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>org.apache.tez</groupId>
+ <dependency>
+ <groupId>org.apache.tez</groupId>
<artifactId>tez-tests</artifactId>
<version>${tez.version}</version>
<optional>true</optional>
Modified: hive/branches/tez/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java?rev=1556695&r1=1556694&r2=1556695&view=diff
==============================================================================
--- hive/branches/tez/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java (original)
+++ hive/branches/tez/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java Thu Jan 9 01:38:32 2014
@@ -201,7 +201,7 @@ public class Hadoop23Shims extends Hadoo
conf = null;
}
- public MiniMrShim(Configuration conf, int numberOfTaskTrackers,
+ public MiniMrShim(Configuration conf, int numberOfTaskTrackers,
String nameNode, int numDir) throws IOException {
this.conf = conf;
@@ -254,7 +254,7 @@ public class Hadoop23Shims extends Hadoo
private final MiniTezCluster mr;
private final Configuration conf;
- public MiniTezShim(Configuration conf, int numberOfTaskTrackers,
+ public MiniTezShim(Configuration conf, int numberOfTaskTrackers,
String nameNode, int numDir) throws IOException {
mr = new MiniTezCluster("hive", numberOfTaskTrackers);
@@ -273,7 +273,7 @@ public class Hadoop23Shims extends Hadoo
if (StringUtils.isBlank(address)) {
throw new IllegalArgumentException("Invalid YARN resource manager port.");
}
-
+
return Integer.parseInt(address);
}
@@ -281,7 +281,7 @@ public class Hadoop23Shims extends Hadoo
public void shutdown() throws IOException {
mr.stop();
}
-
+
@Override
public void setupConfiguration(Configuration conf) {
Configuration config = mr.getConfig();