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/02/04 03:19:24 UTC

svn commit: r1564156 - in /hive/branches/tez: pom.xml ql/src/java/org/apache/hadoop/hive/ql/exec/tez/DagUtils.java

Author: gunther
Date: Tue Feb  4 02:19:23 2014
New Revision: 1564156

URL: http://svn.apache.org/r1564156
Log:
HIVE-6255: Change Hive to not pass MRSplitsProto in MRHelpers.createMRInputPayloadWithGrouping (Thejas M Nair via Gunther Hagleitner)

Modified:
    hive/branches/tez/pom.xml
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/DagUtils.java

Modified: hive/branches/tez/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/pom.xml?rev=1564156&r1=1564155&r2=1564156&view=diff
==============================================================================
--- hive/branches/tez/pom.xml (original)
+++ hive/branches/tez/pom.xml Tue Feb  4 02:19:23 2014
@@ -94,7 +94,7 @@
     <commons-lang3.version>3.1</commons-lang3.version>
     <commons-logging.version>1.1.3</commons-logging.version>
     <derby.version>10.10.1.1</derby.version>
-    <guava.version>11.0.2</guava.version>
+    <guava.version>15.0</guava.version>
     <groovy.version>2.1.6</groovy.version>
     <hadoop-20.version>0.20.2</hadoop-20.version>
     <hadoop-20S.version>1.2.1</hadoop-20S.version>
@@ -132,7 +132,7 @@
     <stax.version>1.0.1</stax.version>
     <slf4j.version>1.7.5</slf4j.version>
     <ST4.version>4.0.4</ST4.version>
-    <tez.version>0.2.0</tez.version>
+    <tez.version>0.3.0-incubating-SNAPSHOT</tez.version>
     <tempus-fugit.version>1.1</tempus-fugit.version>
     <snappy.version>0.2</snappy.version>
     <wadl-resourcedoc-doclet.version>1.4</wadl-resourcedoc-doclet.version>
@@ -185,6 +185,17 @@
          <enabled>false</enabled>
        </snapshots>
      </repository>
+     <repository>
+       <id>apache.snapshots</id>
+       <name>Apache Snapshot Repository</name>
+       <url>http://repository.apache.org/snapshots</url>
+       <releases>
+         <enabled>false</enabled>
+       </releases>
+       <snapshots>
+         <enabled>true</enabled>
+       </snapshots>
+     </repository>
   </repositories>
 
   <!-- Hadoop dependency management is done at the bottom under profiles -->

Modified: hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/DagUtils.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/DagUtils.java?rev=1564156&r1=1564155&r2=1564156&view=diff
==============================================================================
--- hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/DagUtils.java (original)
+++ hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/DagUtils.java Tue Feb  4 02:19:23 2014
@@ -262,7 +262,7 @@ public class DagUtils {
     byte[] mrInput = null;
     if (useTezGroupedSplits) {
       mrInput = MRHelpers.createMRInputPayloadWithGrouping(serializedConf,
-          null, HiveInputFormat.class.getName());
+          HiveInputFormat.class.getName());
     } else {
       mrInput = MRHelpers.createMRInputPayload(serializedConf, null);
     }