hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jssa...@apache.org
Subject svn commit: r1051252 - in /hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec: DDLTask.java.orig GroupByOperator.java.orig HashTableSinkOperator.java.orig MoveTask.java Utilities.java
Date Mon, 20 Dec 2010 19:32:25 GMT
Author: jssarma
Date: Mon Dec 20 19:32:24 2010
New Revision: 1051252

URL: http://svn.apache.org/viewvc?rev=1051252&view=rev
Log:
commit second diff for hive-1846 (rvadali via jssarma)

Removed:
    hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java.orig
    hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/GroupByOperator.java.orig
    hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/HashTableSinkOperator.java.orig
Modified:
    hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/MoveTask.java
    hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/MoveTask.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/MoveTask.java?rev=1051252&r1=1051251&r2=1051252&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/MoveTask.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/MoveTask.java Mon Dec 20 19:32:24
2010
@@ -171,8 +171,7 @@ public class MoveTask extends Task<MoveW
         if (tbd.getPartitionSpec().size() == 0) {
           dc = new DataContainer(table.getTTable());
           db.loadTable(new Path(tbd.getSourceDir()), tbd.getTable()
-              .getTableName(), tbd.getReplace(), new Path(tbd.getTmpDir()),
-              tbd.getHoldDDLTime());
+              .getTableName(), tbd.getReplace(), tbd.getHoldDDLTime());
           if (work.getOutputs() != null) {
             work.getOutputs().add(new WriteEntity(table));
           }
@@ -202,7 +201,6 @@ public class MoveTask extends Task<MoveW
                   tbd.getTable().getTableName(),
                 	tbd.getPartitionSpec(),
                 	tbd.getReplace(),
-                	new Path(tbd.getTmpDir()),
                 	dpCtx.getNumDPCols(),
                 	tbd.getHoldDDLTime());
 
@@ -243,8 +241,7 @@ public class MoveTask extends Task<MoveW
             dc = null; // reset data container to prevent it being added again.
           } else { // static partitions
             db.loadPartition(new Path(tbd.getSourceDir()), tbd.getTable().getTableName(),
-                tbd.getPartitionSpec(), tbd.getReplace(), new Path(tbd.getTmpDir()),
-                tbd.getHoldDDLTime());
+                tbd.getPartitionSpec(), tbd.getReplace(), tbd.getHoldDDLTime());
           	Partition partn = db.getPartition(table, tbd.getPartitionSpec(), false);
           	dc = new DataContainer(table.getTTable(), partn.getTPartition());
           	// add this partition to post-execution hook

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java?rev=1051252&r1=1051251&r2=1051252&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java Mon Dec 20 19:32:24
2010
@@ -171,7 +171,7 @@ public final class Utilities {
       if (gWork == null) {
         String jtConf = HiveConf.getVar(job, HiveConf.ConfVars.HADOOPJT);
         String path;
-        if (jtConf == "local") {
+        if (jtConf.equals("local")) {
           String planPath = HiveConf.getVar(job, HiveConf.ConfVars.PLAN);
           path = new Path(planPath).toUri().getPath();
         } else {



Mime
View raw message