You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by cw...@apache.org on 2011/12/09 00:37:22 UTC

svn commit: r1212183 [1/5] - in /hive/branches/branch-0.8-r2/ql/src: java/org/apache/hadoop/hive/ql/exec/ java/org/apache/hadoop/hive/ql/optimizer/ test/results/clientpositive/

Author: cws
Date: Thu Dec  8 23:37:20 2011
New Revision: 1212183

URL: http://svn.apache.org/viewvc?rev=1212183&view=rev
Log:
HIVE-2634. revert HIVE-2566 (Namit Jain via cws)

Modified:
    hive/branches/branch-0.8-r2/ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java
    hive/branches/branch-0.8-r2/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMRProcContext.java
    hive/branches/branch-0.8-r2/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMRUnion1.java
    hive/branches/branch-0.8-r2/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java
    hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/auto_join27.q.out
    hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/input25.q.out
    hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/input26.q.out
    hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/join35.q.out
    hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/lineage1.q.out
    hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/load_dyn_part14.q.out
    hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/merge4.q.out
    hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/ppd_union_view.q.out
    hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx.q.out
    hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/stats1.q.out
    hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/union10.q.out
    hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/union11.q.out
    hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/union12.q.out
    hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/union14.q.out
    hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/union15.q.out
    hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/union17.q.out
    hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/union18.q.out
    hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/union19.q.out
    hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/union20.q.out
    hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/union24.q.out
    hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/union3.q.out
    hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/union4.q.out
    hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/union5.q.out
    hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/union6.q.out
    hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/union7.q.out

Modified: hive/branches/branch-0.8-r2/ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.8-r2/ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java?rev=1212183&r1=1212182&r2=1212183&view=diff
==============================================================================
--- hive/branches/branch-0.8-r2/ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java (original)
+++ hive/branches/branch-0.8-r2/ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java Thu Dec  8 23:37:20 2011
@@ -680,19 +680,16 @@ public abstract class Operator<T extends
     assert parentIndex != -1;
     if (parentOperators.size() == 1) {
       parentOperators = null;
-    }
-    else {
+    } else {
       parentOperators.remove(parentIndex);
     }
 
     int childIndex = parent.getChildOperators().indexOf(this);
-    if (childIndex >= 0) {
-      if (parent.getChildOperators().size() == 1) {
-        parent.setChildOperators(null);
-      }
-      else {
-        parent.getChildOperators().remove(childIndex);
-      }
+    assert childIndex != -1;
+    if (parent.getChildOperators().size() == 1) {
+      parent.setChildOperators(null);
+    } else {
+      parent.getChildOperators().remove(childIndex);
     }
   }
 

Modified: hive/branches/branch-0.8-r2/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMRProcContext.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.8-r2/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMRProcContext.java?rev=1212183&r1=1212182&r2=1212183&view=diff
==============================================================================
--- hive/branches/branch-0.8-r2/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMRProcContext.java (original)
+++ hive/branches/branch-0.8-r2/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMRProcContext.java Thu Dec  8 23:37:20 2011
@@ -102,13 +102,11 @@ public class GenMRProcContext implements
     Task<? extends Serializable> uTask;
     List<String> taskTmpDir;
     List<TableDesc> tt_desc;
-    List<Operator<? extends Serializable>> listTopOperators;
 
     public GenMRUnionCtx() {
       uTask = null;
       taskTmpDir = new ArrayList<String>();
       tt_desc = new ArrayList<TableDesc>();
-      listTopOperators = new ArrayList<Operator<? extends Serializable>>();
     }
 
     public Task<? extends Serializable> getUTask() {
@@ -134,19 +132,6 @@ public class GenMRProcContext implements
     public List<TableDesc> getTTDesc() {
       return tt_desc;
     }
-
-    public List<Operator<? extends Serializable>> getListTopOperators() {
-      return listTopOperators;
-    }
-
-    public void setListTopOperators(
-        List<Operator<? extends Serializable>> listTopOperators) {
-      this.listTopOperators = listTopOperators;
-    }
-    
-    public void addListTopOperators(Operator<? extends Serializable> topOperator) {
-      listTopOperators.add(topOperator);
-    }
   }
 
   /**

Modified: hive/branches/branch-0.8-r2/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMRUnion1.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.8-r2/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMRUnion1.java?rev=1212183&r1=1212182&r2=1212183&view=diff
==============================================================================
--- hive/branches/branch-0.8-r2/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMRUnion1.java (original)
+++ hive/branches/branch-0.8-r2/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMRUnion1.java Thu Dec  8 23:37:20 2011
@@ -50,7 +50,6 @@ import org.apache.hadoop.hive.ql.plan.Ma
 import org.apache.hadoop.hive.ql.plan.PartitionDesc;
 import org.apache.hadoop.hive.ql.plan.PlanUtils;
 import org.apache.hadoop.hive.ql.plan.TableDesc;
-import org.apache.hadoop.hive.ql.plan.TableScanDesc;
 
 /**
  * Processor for the rule - TableScan followed by Union.
@@ -61,145 +60,13 @@ public class GenMRUnion1 implements Node
   }
 
   /**
-   * Process the union if all sub-queries are map-only
-   * 
-   * @return
-   * @throws SemanticException
-   */
-  private Object processMapOnlyUnion(UnionOperator union, Stack<Node> stack,
-      GenMRProcContext ctx, UnionProcContext uCtx) throws SemanticException {
-    // merge currTask from multiple topOps
-    HashMap<Operator<? extends Serializable>, Task<? extends Serializable>> opTaskMap = ctx.getOpTaskMap();
-    if (opTaskMap != null && opTaskMap.size() > 0) {
-      Task<? extends Serializable> tsk = opTaskMap.get(null);
-      if (tsk != null) {
-        ctx.setCurrTask(tsk);
-      }
-    }
-
-    UnionParseContext uPrsCtx = uCtx.getUnionParseContext(union);
-    if ((uPrsCtx != null) && (uPrsCtx.getMapJoinQuery())) {
-      GenMapRedUtils.mergeMapJoinUnion(union, ctx,
-          UnionProcFactory.getPositionParent(union, stack));
-    }
-    else {
-      ctx.getMapCurrCtx().put(
-          (Operator<? extends Serializable>) union,
-          new GenMapRedCtx(ctx.getCurrTask(), ctx.getCurrTopOp(),
-              ctx.getCurrAliasId()));
-    }
-    return null;
-  }
-
-  /**
-   * Process the union when the parent is a map-reduce job. Create a temporary
-   * output, and let the union task read from the temporary output.
-   * 
-   * The files created for all the inputs are in the union context and later
-   * used to initialize the union plan
-   * 
-   * @param parent
-   * @param child
-   * @param uTask
-   * @param ctx
-   * @param uCtxTask
-   */
-  private void processSubQueryUnionCreateIntermediate(
-      Operator<? extends Serializable> parent,
-      Operator<? extends Serializable> child,
-      Task<? extends Serializable> uTask, GenMRProcContext ctx,
-      GenMRUnionCtx uCtxTask) {
-    ParseContext parseCtx = ctx.getParseCtx();
-
-    TableDesc tt_desc = PlanUtils.getIntermediateFileTableDesc(PlanUtils.getFieldSchemasFromRowSchema(
-        parent.getSchema(), "temporarycol"));
-
-    // generate the temporary file
-    Context baseCtx = parseCtx.getContext();
-    String taskTmpDir = baseCtx.getMRTmpFileURI();
-
-    // Create a file sink operator for this file name
-    Operator<? extends Serializable> fs_op = OperatorFactory.get(
-        new FileSinkDesc(taskTmpDir, tt_desc, parseCtx.getConf().getBoolVar(
-            HiveConf.ConfVars.COMPRESSINTERMEDIATE)), parent.getSchema());
-
-    assert parent.getChildOperators().size() == 1;
-    parent.getChildOperators().set(0, fs_op);
-
-    List<Operator<? extends Serializable>> parentOpList = new ArrayList<Operator<? extends Serializable>>();
-    parentOpList.add(parent);
-    fs_op.setParentOperators(parentOpList);
-
-    // Create a dummy table scan operator
-    Operator<? extends Serializable> ts_op = OperatorFactory.get(
-        new TableScanDesc(), parent.getSchema());
-    List<Operator<? extends Serializable>> childOpList = new ArrayList<Operator<? extends Serializable>>();
-    childOpList.add(child);
-    ts_op.setChildOperators(childOpList);
-    child.replaceParent(parent, ts_op);
-
-    // Add the path to alias mapping
-
-    uCtxTask.addTaskTmpDir(taskTmpDir);
-    uCtxTask.addTTDesc(tt_desc);
-    uCtxTask.addListTopOperators(ts_op);
-
-    // The union task is empty. The files created for all the inputs are
-    // assembled in the union context and later used to initialize the union
-    // plan
-
-    ctx.getCurrTask().addDependentTask(uTask);
-  }
-
-  /**
-   * Union Operator encountered. A map-only query is encountered at the given
-   * position. However, atleast of the sub-qeuries is a map-reduce job. Copy the
-   * information from the current top operator to the union context.
-   * 
-   * @param ctx
-   * @param uCtxTask
-   * @param union
-   * @param stack
-   * @throws SemanticException
-   */
-  private void processSubQueryUnionMerge(GenMRProcContext ctx,
-      GenMRUnionCtx uCtxTask, UnionOperator union, Stack<Node> stack)
-      throws SemanticException {
-    // The current plan can be thrown away after being merged with the union
-    // plan
-    Task<? extends Serializable> uTask = uCtxTask.getUTask();
-    MapredWork plan = (MapredWork) uTask.getWork();
-    Operator<? extends Serializable> currTopOp = ctx.getCurrTopOp();
-    String currAliasId = ctx.getCurrAliasId();
-    GenMapRedUtils.setTaskPlan(ctx.getCurrAliasId(), ctx.getCurrTopOp(), plan,
-        false, ctx);
-  }
-
-  private void processSubQueryUnionMapJoin(GenMRProcContext ctx) {
-    AbstractMapJoinOperator<? extends MapJoinDesc> mjOp = ctx.getCurrMapJoinOp();
-    assert mjOp != null;
-    GenMRMapJoinCtx mjCtx = ctx.getMapJoinCtx(mjOp);
-    assert mjCtx != null;
-    MapredWork plan = (MapredWork) ctx.getCurrTask().getWork();
-
-    String taskTmpDir = mjCtx.getTaskTmpDir();
-    TableDesc tt_desc = mjCtx.getTTDesc();
-    assert plan.getPathToAliases().get(taskTmpDir) == null;
-    plan.getPathToAliases().put(taskTmpDir, new ArrayList<String>());
-    plan.getPathToAliases().get(taskTmpDir).add(taskTmpDir);
-    plan.getPathToPartitionInfo().put(taskTmpDir,
-        new PartitionDesc(tt_desc, null));
-    plan.getAliasToWork().put(taskTmpDir, mjCtx.getRootMapJoinOp());
-  }
-
-  /**
    * Union Operator encountered . Currently, the algorithm is pretty simple: If
-   * all the sub-queries are map-only, don't do anything. However, if there is a
+   * all the sub-queries are map-only, dont do anything. However, if there is a
    * mapjoin followed by the union, merge at the union Otherwise, insert a
    * FileSink on top of all the sub-queries.
-   * 
+   *
    * This can be optimized later on.
-   * 
+   *
    * @param nd
    *          the file sink operator encountered
    * @param opProcCtx
@@ -214,12 +81,31 @@ public class GenMRUnion1 implements Node
 
     // Map-only subqueries can be optimized in future to not write to a file in
     // future
-    Map<Operator<? extends Serializable>, GenMapRedCtx> mapCurrCtx = ctx.getMapCurrCtx();
+    Map<Operator<? extends Serializable>, GenMapRedCtx> mapCurrCtx = ctx
+        .getMapCurrCtx();
 
     // The plan needs to be broken only if one of the sub-queries involve a
     // map-reduce job
     if (uCtx.isMapOnlySubq()) {
-      return processMapOnlyUnion(union, stack, ctx, uCtx);
+      // merge currTask from multiple topOps
+      HashMap<Operator<? extends Serializable>, Task<? extends Serializable>> opTaskMap = ctx
+          .getOpTaskMap();
+      if (opTaskMap != null && opTaskMap.size() > 0) {
+        Task<? extends Serializable> tsk = opTaskMap.get(null);
+        if (tsk != null) {
+          ctx.setCurrTask(tsk);
+        }
+      }
+
+      UnionParseContext uPrsCtx = uCtx.getUnionParseContext(union);
+      if ((uPrsCtx != null) && (uPrsCtx.getMapJoinQuery())) {
+        GenMapRedUtils.mergeMapJoinUnion(union, ctx, UnionProcFactory
+            .getPositionParent(union, stack));
+      } else {
+        mapCurrCtx.put((Operator<? extends Serializable>) nd, new GenMapRedCtx(
+            ctx.getCurrTask(), ctx.getCurrTopOp(), ctx.getCurrAliasId()));
+      }
+      return null;
     }
 
     ctx.setCurrUnionOp(union);
@@ -230,8 +116,16 @@ public class GenMRUnion1 implements Node
     Task<? extends Serializable> currTask = ctx.getCurrTask();
     int pos = UnionProcFactory.getPositionParent(union, stack);
 
+    // is the current task a root task
+    if (uPrsCtx.getRootTask(pos) && (!ctx.getRootTasks().contains(currTask))) {
+      ctx.getRootTasks().add(currTask);
+    }
+
     GenMRUnionCtx uCtxTask = ctx.getUnionTask(union);
     Task<? extends Serializable> uTask = null;
+
+    Operator<? extends Serializable> parent = union.getParentOperators().get(
+        pos);
     MapredWork uPlan = null;
 
     // union is encountered for the first time
@@ -241,36 +135,70 @@ public class GenMRUnion1 implements Node
       uTask = TaskFactory.get(uPlan, parseCtx.getConf());
       uCtxTask.setUTask(uTask);
       ctx.setUnionTask(union, uCtxTask);
-    }
-    else {
+    } else {
       uTask = uCtxTask.getUTask();
     }
 
-    // Copy into the current union task plan if  
-    if (uPrsCtx.getMapOnlySubq(pos) && uPrsCtx.getRootTask(pos)
-        && !uPrsCtx.getMapJoinSubq(pos)) {
-      processSubQueryUnionMerge(ctx, uCtxTask, union, stack);
+    // If there is a mapjoin at position 'pos'
+    if (uPrsCtx.getMapJoinSubq(pos)) {
+      AbstractMapJoinOperator<? extends MapJoinDesc> mjOp = ctx.getCurrMapJoinOp();
+      assert mjOp != null;
+      GenMRMapJoinCtx mjCtx = ctx.getMapJoinCtx(mjOp);
+      assert mjCtx != null;
+      MapredWork plan = (MapredWork) currTask.getWork();
+
+      String taskTmpDir = mjCtx.getTaskTmpDir();
+      TableDesc tt_desc = mjCtx.getTTDesc();
+      assert plan.getPathToAliases().get(taskTmpDir) == null;
+      plan.getPathToAliases().put(taskTmpDir, new ArrayList<String>());
+      plan.getPathToAliases().get(taskTmpDir).add(taskTmpDir);
+      plan.getPathToPartitionInfo().put(taskTmpDir,
+          new PartitionDesc(tt_desc, null));
+      plan.getAliasToWork().put(taskTmpDir, mjCtx.getRootMapJoinOp());
     }
-    // If it a map-reduce job, create a temporary file
-    else {
-      // is the current task a root task
-      if (uPrsCtx.getRootTask(pos) && (!ctx.getRootTasks().contains(currTask))) {
-        ctx.getRootTasks().add(currTask);
-      }
-      // If there is a mapjoin at position 'pos'
-      if (uPrsCtx.getMapJoinSubq(pos)) {
-        processSubQueryUnionMapJoin(ctx);
-      }
 
-      processSubQueryUnionCreateIntermediate(union.getParentOperators().get(pos), union, uTask, ctx, uCtxTask);
+    TableDesc tt_desc = PlanUtils.getIntermediateFileTableDesc(PlanUtils
+        .getFieldSchemasFromRowSchema(parent.getSchema(), "temporarycol"));
+
+    // generate the temporary file
+    Context baseCtx = parseCtx.getContext();
+    String taskTmpDir = baseCtx.getMRTmpFileURI();
+
+    // Add the path to alias mapping
+    uCtxTask.addTaskTmpDir(taskTmpDir);
+    uCtxTask.addTTDesc(tt_desc);
+
+    // The union task is empty. The files created for all the inputs are
+    // assembled in the
+    // union context and later used to initialize the union plan
+
+    // Create a file sink operator for this file name
+    Operator<? extends Serializable> fs_op = OperatorFactory.get(
+        new FileSinkDesc(taskTmpDir, tt_desc, parseCtx.getConf().getBoolVar(
+        HiveConf.ConfVars.COMPRESSINTERMEDIATE)), parent.getSchema());
+
+    assert parent.getChildOperators().size() == 1;
+    parent.getChildOperators().set(0, fs_op);
+
+    List<Operator<? extends Serializable>> parentOpList =
+      new ArrayList<Operator<? extends Serializable>>();
+    parentOpList.add(parent);
+    fs_op.setParentOperators(parentOpList);
+
+    currTask.addDependentTask(uTask);
+
+    // If it is map-only task, add the files to be processed
+    if (uPrsCtx.getMapOnlySubq(pos) && uPrsCtx.getRootTask(pos)) {
+      GenMapRedUtils.setTaskPlan(ctx.getCurrAliasId(), ctx.getCurrTopOp(),
+          (MapredWork) currTask.getWork(), false, ctx);
     }
 
     ctx.setCurrTask(uTask);
     ctx.setCurrAliasId(null);
     ctx.setCurrTopOp(null);
 
-    mapCurrCtx.put((Operator<? extends Serializable>) nd,
-        new GenMapRedCtx(ctx.getCurrTask(), null, null));
+    mapCurrCtx.put((Operator<? extends Serializable>) nd, new GenMapRedCtx(ctx
+        .getCurrTask(), null, null));
 
     return null;
   }

Modified: hive/branches/branch-0.8-r2/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.8-r2/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java?rev=1212183&r1=1212182&r2=1212183&view=diff
==============================================================================
--- hive/branches/branch-0.8-r2/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java (original)
+++ hive/branches/branch-0.8-r2/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java Thu Dec  8 23:37:20 2011
@@ -326,18 +326,12 @@ public final class GenMapRedUtils {
     assert uCtx != null;
 
     List<String> taskTmpDirLst = uCtx.getTaskTmpDir();
-    if ((taskTmpDirLst == null) || (taskTmpDirLst.isEmpty())) {
-      return;
-    }
-    
     List<TableDesc> tt_descLst = uCtx.getTTDesc();
     assert !taskTmpDirLst.isEmpty() && !tt_descLst.isEmpty();
     assert taskTmpDirLst.size() == tt_descLst.size();
     int size = taskTmpDirLst.size();
     assert local == false;
 
-    List<Operator<? extends Serializable>> topOperators = uCtx.getListTopOperators();
-    
     for (int pos = 0; pos < size; pos++) {
       String taskTmpDir = taskTmpDirLst.get(pos);
       TableDesc tt_desc = tt_descLst.get(pos);
@@ -346,7 +340,7 @@ public final class GenMapRedUtils {
         plan.getPathToAliases().get(taskTmpDir).add(taskTmpDir);
         plan.getPathToPartitionInfo().put(taskTmpDir,
             new PartitionDesc(tt_desc, null));
-        plan.getAliasToWork().put(taskTmpDir, topOperators.get(pos));
+        plan.getAliasToWork().put(taskTmpDir, currUnionOp);
       }
     }
   }

Modified: hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/auto_join27.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/auto_join27.q.out?rev=1212183&r1=1212182&r2=1212183&view=diff
==============================================================================
--- hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/auto_join27.q.out (original)
+++ hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/auto_join27.q.out Thu Dec  8 23:37:20 2011
@@ -27,13 +27,14 @@ ABSTRACT SYNTAX TREE:
 
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
-  Stage-8 depends on stages: Stage-1 , consists of Stage-9, Stage-10, Stage-2
+  Stage-8 depends on stages: Stage-1, Stage-4 , consists of Stage-9, Stage-10, Stage-2
   Stage-9 has a backup stage: Stage-2
   Stage-6 depends on stages: Stage-9
   Stage-3 depends on stages: Stage-2, Stage-6, Stage-7
   Stage-10 has a backup stage: Stage-2
   Stage-7 depends on stages: Stage-10
   Stage-2
+  Stage-4 is a root stage
   Stage-0 is a root stage
 
 STAGE PLANS:
@@ -131,75 +132,65 @@ STAGE PLANS:
   Stage: Stage-6
     Map Reduce
       Alias -> Map Operator Tree:
-        file:/var/folders/bZ/bZe+iKfoFTuPoShRd6dy6-tOU9Y/-Tmp-/njain/hive_2011-11-11_17-36-43_167_4198125662621366018/-mr-10002 
-          TableScan
-            Union
-              Map Join Operator
-                condition map:
-                     Inner Join 0 to 1
-                condition expressions:
-                  0 
-                  1 
-                handleSkewJoin: false
-                keys:
-                  0 [Column[_col0]]
-                  1 [Column[_col0]]
-                Position of Big Table: 0
-                Select Operator
-                  Group By Operator
-                    aggregations:
-                          expr: count(1)
-                    bucketGroup: false
-                    mode: hash
-                    outputColumnNames: _col0
-                    File Output Operator
-                      compressed: false
-                      GlobalTableId: 0
-                      table:
-                          input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                          output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-        null-subquery1:src_12-subquery1:src 
-          TableScan
-            alias: src
-            Select Operator
-              expressions:
-                    expr: key
-                    type: string
-                    expr: value
-                    type: string
-              outputColumnNames: _col0, _col1
-              Union
-                Map Join Operator
-                  condition map:
-                       Inner Join 0 to 1
-                  condition expressions:
-                    0 
-                    1 
-                  handleSkewJoin: false
-                  keys:
-                    0 [Column[_col0]]
-                    1 [Column[_col0]]
-                  Position of Big Table: 0
-                  Select Operator
-                    Group By Operator
-                      aggregations:
-                            expr: count(1)
-                      bucketGroup: false
-                      mode: hash
-                      outputColumnNames: _col0
-                      File Output Operator
-                        compressed: false
-                        GlobalTableId: 0
-                        table:
-                            input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                            output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+        file:/tmp/njain/hive_2011-12-07_17-55-14_715_2499487755302424085/-mr-10002 
+          Union
+            Map Join Operator
+              condition map:
+                   Inner Join 0 to 1
+              condition expressions:
+                0 
+                1 
+              handleSkewJoin: false
+              keys:
+                0 [Column[_col0]]
+                1 [Column[_col0]]
+              Position of Big Table: 0
+              Select Operator
+                Group By Operator
+                  aggregations:
+                        expr: count(1)
+                  bucketGroup: false
+                  mode: hash
+                  outputColumnNames: _col0
+                  File Output Operator
+                    compressed: false
+                    GlobalTableId: 0
+                    table:
+                        input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                        output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+        file:/tmp/njain/hive_2011-12-07_17-55-14_715_2499487755302424085/-mr-10004 
+          Union
+            Map Join Operator
+              condition map:
+                   Inner Join 0 to 1
+              condition expressions:
+                0 
+                1 
+              handleSkewJoin: false
+              keys:
+                0 [Column[_col0]]
+                1 [Column[_col0]]
+              Position of Big Table: 0
+              Select Operator
+                Group By Operator
+                  aggregations:
+                        expr: count(1)
+                  bucketGroup: false
+                  mode: hash
+                  outputColumnNames: _col0
+                  File Output Operator
+                    compressed: false
+                    GlobalTableId: 0
+                    table:
+                        input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                        output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
       Local Work:
         Map Reduce Local Work
 
   Stage: Stage-3
     Map Reduce
       Alias -> Map Operator Tree:
-        file:/var/folders/bZ/bZe+iKfoFTuPoShRd6dy6-tOU9Y/-Tmp-/njain/hive_2011-11-11_17-36-43_167_4198125662621366018/-mr-10003 
+        file:/tmp/njain/hive_2011-12-07_17-55-14_715_2499487755302424085/-mr-10003 
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -228,45 +219,35 @@ STAGE PLANS:
   Stage: Stage-10
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        file:/var/folders/bZ/bZe+iKfoFTuPoShRd6dy6-tOU9Y/-Tmp-/njain/hive_2011-11-11_17-36-43_167_4198125662621366018/-mr-10002 
+        file:/tmp/njain/hive_2011-12-07_17-55-14_715_2499487755302424085/-mr-10002 
           Fetch Operator
             limit: -1
-        null-subquery1:src_12-subquery1:src 
+        file:/tmp/njain/hive_2011-12-07_17-55-14_715_2499487755302424085/-mr-10004 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        file:/var/folders/bZ/bZe+iKfoFTuPoShRd6dy6-tOU9Y/-Tmp-/njain/hive_2011-11-11_17-36-43_167_4198125662621366018/-mr-10002 
-          TableScan
-            Union
-              HashTable Sink Operator
-                condition expressions:
-                  0 
-                  1 
-                handleSkewJoin: false
-                keys:
-                  0 [Column[_col0]]
-                  1 [Column[_col0]]
-                Position of Big Table: 1
-        null-subquery1:src_12-subquery1:src 
-          TableScan
-            alias: src
-            Select Operator
-              expressions:
-                    expr: key
-                    type: string
-                    expr: value
-                    type: string
-              outputColumnNames: _col0, _col1
-              Union
-                HashTable Sink Operator
-                  condition expressions:
-                    0 
-                    1 
-                  handleSkewJoin: false
-                  keys:
-                    0 [Column[_col0]]
-                    1 [Column[_col0]]
-                  Position of Big Table: 1
+        file:/tmp/njain/hive_2011-12-07_17-55-14_715_2499487755302424085/-mr-10002 
+          Union
+            HashTable Sink Operator
+              condition expressions:
+                0 
+                1 
+              handleSkewJoin: false
+              keys:
+                0 [Column[_col0]]
+                1 [Column[_col0]]
+              Position of Big Table: 1
+        file:/tmp/njain/hive_2011-12-07_17-55-14_715_2499487755302424085/-mr-10004 
+          Union
+            HashTable Sink Operator
+              condition expressions:
+                0 
+                1 
+              handleSkewJoin: false
+              keys:
+                0 [Column[_col0]]
+                1 [Column[_col0]]
+              Position of Big Table: 1
 
   Stage: Stage-7
     Map Reduce
@@ -313,38 +294,28 @@ STAGE PLANS:
   Stage: Stage-2
     Map Reduce
       Alias -> Map Operator Tree:
-        file:/var/folders/bZ/bZe+iKfoFTuPoShRd6dy6-tOU9Y/-Tmp-/njain/hive_2011-11-11_17-36-43_167_4198125662621366018/-mr-10002 
-          TableScan
-            Union
-              Reduce Output Operator
-                key expressions:
-                      expr: _col0
-                      type: string
-                sort order: +
-                Map-reduce partition columns:
-                      expr: _col0
-                      type: string
-                tag: 0
-        null-subquery1:src_12-subquery1:src 
-          TableScan
-            alias: src
-            Select Operator
-              expressions:
-                    expr: key
+        file:/tmp/njain/hive_2011-12-07_17-55-14_715_2499487755302424085/-mr-10002 
+          Union
+            Reduce Output Operator
+              key expressions:
+                    expr: _col0
                     type: string
-                    expr: value
+              sort order: +
+              Map-reduce partition columns:
+                    expr: _col0
                     type: string
-              outputColumnNames: _col0, _col1
-              Union
-                Reduce Output Operator
-                  key expressions:
-                        expr: _col0
-                        type: string
-                  sort order: +
-                  Map-reduce partition columns:
-                        expr: _col0
-                        type: string
-                  tag: 0
+              tag: 0
+        file:/tmp/njain/hive_2011-12-07_17-55-14_715_2499487755302424085/-mr-10004 
+          Union
+            Reduce Output Operator
+              key expressions:
+                    expr: _col0
+                    type: string
+              sort order: +
+              Map-reduce partition columns:
+                    expr: _col0
+                    type: string
+              tag: 0
         src3:src 
           TableScan
             alias: src
@@ -388,6 +359,26 @@ STAGE PLANS:
                     input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                     output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
 
+  Stage: Stage-4
+    Map Reduce
+      Alias -> Map Operator Tree:
+        null-subquery1:src_12-subquery1:src 
+          TableScan
+            alias: src
+            Select Operator
+              expressions:
+                    expr: key
+                    type: string
+                    expr: value
+                    type: string
+              outputColumnNames: _col0, _col1
+              File Output Operator
+                compressed: false
+                GlobalTableId: 0
+                table:
+                    input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                    output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+
   Stage: Stage-0
     Fetch Operator
       limit: -1
@@ -405,7 +396,7 @@ JOIN
 ON src_12.key = src3.k AND src3.k < 200
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
-PREHOOK: Output: file:/var/folders/bZ/bZe+iKfoFTuPoShRd6dy6-tOU9Y/-Tmp-/njain/hive_2011-11-11_17-36-44_708_3827922999145042039/-mr-10000
+PREHOOK: Output: file:/tmp/njain/hive_2011-12-07_17-55-16_087_2232818405314135078/-mr-10000
 POSTHOOK: query: SELECT count(1)
 FROM
 (
@@ -418,5 +409,5 @@ JOIN
 ON src_12.key = src3.k AND src3.k < 200
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-POSTHOOK: Output: file:/var/folders/bZ/bZe+iKfoFTuPoShRd6dy6-tOU9Y/-Tmp-/njain/hive_2011-11-11_17-36-44_708_3827922999145042039/-mr-10000
+POSTHOOK: Output: file:/tmp/njain/hive_2011-12-07_17-55-16_087_2232818405314135078/-mr-10000
 548

Modified: hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/input25.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/input25.q.out?rev=1212183&r1=1212182&r2=1212183&view=diff
==============================================================================
--- hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/input25.q.out (original)
+++ hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/input25.q.out Thu Dec  8 23:37:20 2011
@@ -80,42 +80,40 @@ STAGE PLANS:
   Stage: Stage-2
     Map Reduce
       Alias -> Map Operator Tree:
-        file:/var/folders/bZ/bZe+iKfoFTuPoShRd6dy6-tOU9Y/-Tmp-/njain/hive_2011-11-11_10-23-45_579_6808174009465727795/-mr-10002 
-          TableScan
-            Union
-              Select Operator
-                expressions:
-                      expr: _col0
-                      type: int
-                      expr: _col1
-                      type: int
-                      expr: _col2
-                      type: string
-                outputColumnNames: _col0, _col1, _col2
-                File Output Operator
-                  compressed: false
-                  GlobalTableId: 0
-                  table:
-                      input format: org.apache.hadoop.mapred.TextInputFormat
-                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-        file:/var/folders/bZ/bZe+iKfoFTuPoShRd6dy6-tOU9Y/-Tmp-/njain/hive_2011-11-11_10-23-45_579_6808174009465727795/-mr-10003 
-          TableScan
-            Union
-              Select Operator
-                expressions:
-                      expr: _col0
-                      type: int
-                      expr: _col1
-                      type: int
-                      expr: _col2
-                      type: string
-                outputColumnNames: _col0, _col1, _col2
-                File Output Operator
-                  compressed: false
-                  GlobalTableId: 0
-                  table:
-                      input format: org.apache.hadoop.mapred.TextInputFormat
-                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+        file:/tmp/njain/hive_2011-12-07_17-57-51_725_5932902027949948969/-mr-10002 
+          Union
+            Select Operator
+              expressions:
+                    expr: _col0
+                    type: int
+                    expr: _col1
+                    type: int
+                    expr: _col2
+                    type: string
+              outputColumnNames: _col0, _col1, _col2
+              File Output Operator
+                compressed: false
+                GlobalTableId: 0
+                table:
+                    input format: org.apache.hadoop.mapred.TextInputFormat
+                    output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+        file:/tmp/njain/hive_2011-12-07_17-57-51_725_5932902027949948969/-mr-10003 
+          Union
+            Select Operator
+              expressions:
+                    expr: _col0
+                    type: int
+                    expr: _col1
+                    type: int
+                    expr: _col2
+                    type: string
+              outputColumnNames: _col0, _col1, _col2
+              File Output Operator
+                compressed: false
+                GlobalTableId: 0
+                table:
+                    input format: org.apache.hadoop.mapred.TextInputFormat
+                    output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 
   Stage: Stage-3
     Map Reduce
@@ -166,7 +164,7 @@ PREHOOK: query: select * from (
 PREHOOK: type: QUERY
 PREHOOK: Input: default@tst@d=2009-01-01
 PREHOOK: Input: default@tst@d=2009-02-02
-PREHOOK: Output: file:/var/folders/bZ/bZe+iKfoFTuPoShRd6dy6-tOU9Y/-Tmp-/njain/hive_2011-11-11_10-23-45_772_1308096997862615956/-mr-10000
+PREHOOK: Output: file:/tmp/njain/hive_2011-12-07_17-57-51_941_2422734399279293092/-mr-10000
 POSTHOOK: query: select * from (
   select * from tst x where x.d='2009-01-01' limit 10
     union all
@@ -175,4 +173,4 @@ POSTHOOK: query: select * from (
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@tst@d=2009-01-01
 POSTHOOK: Input: default@tst@d=2009-02-02
-POSTHOOK: Output: file:/var/folders/bZ/bZe+iKfoFTuPoShRd6dy6-tOU9Y/-Tmp-/njain/hive_2011-11-11_10-23-45_772_1308096997862615956/-mr-10000
+POSTHOOK: Output: file:/tmp/njain/hive_2011-12-07_17-57-51_941_2422734399279293092/-mr-10000

Modified: hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/input26.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/input26.q.out?rev=1212183&r1=1212182&r2=1212183&view=diff
==============================================================================
--- hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/input26.q.out (original)
+++ hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/input26.q.out Thu Dec  8 23:37:20 2011
@@ -67,46 +67,44 @@ STAGE PLANS:
   Stage: Stage-2
     Map Reduce
       Alias -> Map Operator Tree:
-        file:/var/folders/bZ/bZe+iKfoFTuPoShRd6dy6-tOU9Y/-Tmp-/njain/hive_2011-11-11_10-24-02_277_2484701533078645970/-mr-10002 
-          TableScan
-            Union
-              Select Operator
-                expressions:
-                      expr: _col0
-                      type: string
-                      expr: _col1
-                      type: string
-                      expr: _col2
-                      type: string
-                      expr: _col3
-                      type: string
-                outputColumnNames: _col0, _col1, _col2, _col3
-                File Output Operator
-                  compressed: false
-                  GlobalTableId: 0
-                  table:
-                      input format: org.apache.hadoop.mapred.TextInputFormat
-                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-        file:/var/folders/bZ/bZe+iKfoFTuPoShRd6dy6-tOU9Y/-Tmp-/njain/hive_2011-11-11_10-24-02_277_2484701533078645970/-mr-10003 
-          TableScan
-            Union
-              Select Operator
-                expressions:
-                      expr: _col0
-                      type: string
-                      expr: _col1
-                      type: string
-                      expr: _col2
-                      type: string
-                      expr: _col3
-                      type: string
-                outputColumnNames: _col0, _col1, _col2, _col3
-                File Output Operator
-                  compressed: false
-                  GlobalTableId: 0
-                  table:
-                      input format: org.apache.hadoop.mapred.TextInputFormat
-                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+        file:/tmp/njain/hive_2011-12-07_17-58-02_024_2246324478859482077/-mr-10002 
+          Union
+            Select Operator
+              expressions:
+                    expr: _col0
+                    type: string
+                    expr: _col1
+                    type: string
+                    expr: _col2
+                    type: string
+                    expr: _col3
+                    type: string
+              outputColumnNames: _col0, _col1, _col2, _col3
+              File Output Operator
+                compressed: false
+                GlobalTableId: 0
+                table:
+                    input format: org.apache.hadoop.mapred.TextInputFormat
+                    output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+        file:/tmp/njain/hive_2011-12-07_17-58-02_024_2246324478859482077/-mr-10003 
+          Union
+            Select Operator
+              expressions:
+                    expr: _col0
+                    type: string
+                    expr: _col1
+                    type: string
+                    expr: _col2
+                    type: string
+                    expr: _col3
+                    type: string
+              outputColumnNames: _col0, _col1, _col2, _col3
+              File Output Operator
+                compressed: false
+                GlobalTableId: 0
+                table:
+                    input format: org.apache.hadoop.mapred.TextInputFormat
+                    output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
 
   Stage: Stage-3
     Map Reduce
@@ -164,7 +162,7 @@ PREHOOK: query: select * from (
 )subq
 PREHOOK: type: QUERY
 PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
-PREHOOK: Output: file:/var/folders/bZ/bZe+iKfoFTuPoShRd6dy6-tOU9Y/-Tmp-/njain/hive_2011-11-11_10-24-02_446_3327945036790717255/-mr-10000
+PREHOOK: Output: file:/tmp/njain/hive_2011-12-07_17-58-02_317_4884615947790921319/-mr-10000
 POSTHOOK: query: select * from (
   select * from srcpart a where a.ds = '2008-04-08' and a.hr = '11' order by a.key limit 5
     union all
@@ -172,7 +170,7 @@ POSTHOOK: query: select * from (
 )subq
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
-POSTHOOK: Output: file:/var/folders/bZ/bZe+iKfoFTuPoShRd6dy6-tOU9Y/-Tmp-/njain/hive_2011-11-11_10-24-02_446_3327945036790717255/-mr-10000
+POSTHOOK: Output: file:/tmp/njain/hive_2011-12-07_17-58-02_317_4884615947790921319/-mr-10000
 0	val_0	2008-04-08	11
 0	val_0	2008-04-08	11
 0	val_0	2008-04-08	11

Modified: hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/join35.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/join35.q.out?rev=1212183&r1=1212182&r2=1212183&view=diff
==============================================================================
--- hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/join35.q.out (original)
+++ hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/join35.q.out Thu Dec  8 23:37:20 2011
@@ -78,9 +78,9 @@ STAGE PLANS:
                           type: bigint
       Needs Tagging: false
       Path -> Alias:
-        pfile:/Users/njain/hive/hive2/build/ql/test/data/warehouse/src [null-subquery1:subq1-subquery1:x]
+        pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src [null-subquery1:subq1-subquery1:x]
       Path -> Partition:
-        pfile:/Users/njain/hive/hive2/build/ql/test/data/warehouse/src 
+        pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src 
           Partition
             base file name: src
             input format: org.apache.hadoop.mapred.TextInputFormat
@@ -91,12 +91,12 @@ STAGE PLANS:
               columns.types string:string
               file.inputformat org.apache.hadoop.mapred.TextInputFormat
               file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-              location pfile:/Users/njain/hive/hive2/build/ql/test/data/warehouse/src
+              location pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src
               name default.src
               serialization.ddl struct src { string key, string value}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-              transient_lastDdlTime 1321061801
+              transient_lastDdlTime 1323309312
             serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
           
               input format: org.apache.hadoop.mapred.TextInputFormat
@@ -107,12 +107,12 @@ STAGE PLANS:
                 columns.types string:string
                 file.inputformat org.apache.hadoop.mapred.TextInputFormat
                 file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                location pfile:/Users/njain/hive/hive2/build/ql/test/data/warehouse/src
+                location pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src
                 name default.src
                 serialization.ddl struct src { string key, string value}
                 serialization.format 1
                 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                transient_lastDdlTime 1321061801
+                transient_lastDdlTime 1323309312
               serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
               name: default.src
             name: default.src
@@ -136,7 +136,7 @@ STAGE PLANS:
             File Output Operator
               compressed: false
               GlobalTableId: 0
-              directory: file:/var/folders/bZ/bZe+iKfoFTuPoShRd6dy6-tOU9Y/-Tmp-/njain/hive_2011-11-11_17-47-58_134_7214786013092589853/-mr-10002
+              directory: file:/tmp/njain/hive_2011-12-07_17-58-12_129_4473789020840822175/-mr-10002
               NumFilesPerFileSink: 1
               table:
                   input format: org.apache.hadoop.mapred.SequenceFileInputFormat
@@ -173,152 +173,148 @@ STAGE PLANS:
   Stage: Stage-2
     Map Reduce
       Alias -> Map Operator Tree:
-        file:/var/folders/bZ/bZe+iKfoFTuPoShRd6dy6-tOU9Y/-Tmp-/njain/hive_2011-11-11_17-47-58_134_7214786013092589853/-mr-10002 
-          TableScan
-            GatherStats: false
-            Union
-              Map Join Operator
-                condition map:
-                     Inner Join 0 to 1
-                condition expressions:
-                  0 {_col1}
-                  1 {key} {value}
-                handleSkewJoin: false
-                keys:
-                  0 [Column[_col0]]
-                  1 [Column[key]]
+        file:/tmp/njain/hive_2011-12-07_17-58-12_129_4473789020840822175/-mr-10002 
+          Union
+            Map Join Operator
+              condition map:
+                   Inner Join 0 to 1
+              condition expressions:
+                0 {_col1}
+                1 {key} {value}
+              handleSkewJoin: false
+              keys:
+                0 [Column[_col0]]
+                1 [Column[key]]
+              outputColumnNames: _col1, _col2, _col3
+              Position of Big Table: 0
+              Select Operator
+                expressions:
+                      expr: _col1
+                      type: bigint
+                      expr: _col2
+                      type: string
+                      expr: _col3
+                      type: string
                 outputColumnNames: _col1, _col2, _col3
-                Position of Big Table: 0
                 Select Operator
                   expressions:
-                        expr: _col1
-                        type: bigint
                         expr: _col2
                         type: string
                         expr: _col3
                         type: string
-                  outputColumnNames: _col1, _col2, _col3
+                        expr: _col1
+                        type: bigint
+                  outputColumnNames: _col0, _col1, _col2
                   Select Operator
                     expressions:
-                          expr: _col2
-                          type: string
-                          expr: _col3
+                          expr: _col0
                           type: string
                           expr: _col1
-                          type: bigint
+                          type: string
+                          expr: UDFToInteger(_col2)
+                          type: int
                     outputColumnNames: _col0, _col1, _col2
-                    Select Operator
-                      expressions:
-                            expr: _col0
-                            type: string
-                            expr: _col1
-                            type: string
-                            expr: UDFToInteger(_col2)
-                            type: int
-                      outputColumnNames: _col0, _col1, _col2
-                      File Output Operator
-                        compressed: false
-                        GlobalTableId: 1
-                        directory: pfile:/Users/njain/hive/hive2/build/ql/scratchdir/hive_2011-11-11_17-47-58_134_7214786013092589853/-ext-10003
-                        NumFilesPerFileSink: 1
-                        Stats Publishing Key Prefix: pfile:/Users/njain/hive/hive2/build/ql/scratchdir/hive_2011-11-11_17-47-58_134_7214786013092589853/-ext-10000/
-                        table:
-                            input format: org.apache.hadoop.mapred.TextInputFormat
-                            output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                            properties:
-                              bucket_count -1
-                              columns key,value,val2
-                              columns.types string:string:int
-                              file.inputformat org.apache.hadoop.mapred.TextInputFormat
-                              file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                              location pfile:/Users/njain/hive/hive2/build/ql/test/data/warehouse/dest_j1
-                              name default.dest_j1
-                              serialization.ddl struct dest_j1 { string key, string value, i32 val2}
-                              serialization.format 1
-                              serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                              transient_lastDdlTime 1321062478
-                            serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                            name: default.dest_j1
-                        TotalFiles: 1
-                        GatherStats: true
-                        MultiFileSpray: false
-        file:/var/folders/bZ/bZe+iKfoFTuPoShRd6dy6-tOU9Y/-Tmp-/njain/hive_2011-11-11_17-47-58_134_7214786013092589853/-mr-10004 
-          TableScan
-            GatherStats: false
-            Union
-              Map Join Operator
-                condition map:
-                     Inner Join 0 to 1
-                condition expressions:
-                  0 {_col1}
-                  1 {key} {value}
-                handleSkewJoin: false
-                keys:
-                  0 [Column[_col0]]
-                  1 [Column[key]]
+                    File Output Operator
+                      compressed: false
+                      GlobalTableId: 1
+                      directory: pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-12-07_17-58-12_129_4473789020840822175/-ext-10003
+                      NumFilesPerFileSink: 1
+                      Stats Publishing Key Prefix: pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-12-07_17-58-12_129_4473789020840822175/-ext-10000/
+                      table:
+                          input format: org.apache.hadoop.mapred.TextInputFormat
+                          output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                          properties:
+                            bucket_count -1
+                            columns key,value,val2
+                            columns.types string:string:int
+                            file.inputformat org.apache.hadoop.mapred.TextInputFormat
+                            file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                            location pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/dest_j1
+                            name default.dest_j1
+                            serialization.ddl struct dest_j1 { string key, string value, i32 val2}
+                            serialization.format 1
+                            serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                            transient_lastDdlTime 1323309492
+                          serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                          name: default.dest_j1
+                      TotalFiles: 1
+                      GatherStats: true
+                      MultiFileSpray: false
+        file:/tmp/njain/hive_2011-12-07_17-58-12_129_4473789020840822175/-mr-10004 
+          Union
+            Map Join Operator
+              condition map:
+                   Inner Join 0 to 1
+              condition expressions:
+                0 {_col1}
+                1 {key} {value}
+              handleSkewJoin: false
+              keys:
+                0 [Column[_col0]]
+                1 [Column[key]]
+              outputColumnNames: _col1, _col2, _col3
+              Position of Big Table: 0
+              Select Operator
+                expressions:
+                      expr: _col1
+                      type: bigint
+                      expr: _col2
+                      type: string
+                      expr: _col3
+                      type: string
                 outputColumnNames: _col1, _col2, _col3
-                Position of Big Table: 0
                 Select Operator
                   expressions:
-                        expr: _col1
-                        type: bigint
                         expr: _col2
                         type: string
                         expr: _col3
                         type: string
-                  outputColumnNames: _col1, _col2, _col3
+                        expr: _col1
+                        type: bigint
+                  outputColumnNames: _col0, _col1, _col2
                   Select Operator
                     expressions:
-                          expr: _col2
-                          type: string
-                          expr: _col3
+                          expr: _col0
                           type: string
                           expr: _col1
-                          type: bigint
+                          type: string
+                          expr: UDFToInteger(_col2)
+                          type: int
                     outputColumnNames: _col0, _col1, _col2
-                    Select Operator
-                      expressions:
-                            expr: _col0
-                            type: string
-                            expr: _col1
-                            type: string
-                            expr: UDFToInteger(_col2)
-                            type: int
-                      outputColumnNames: _col0, _col1, _col2
-                      File Output Operator
-                        compressed: false
-                        GlobalTableId: 1
-                        directory: pfile:/Users/njain/hive/hive2/build/ql/scratchdir/hive_2011-11-11_17-47-58_134_7214786013092589853/-ext-10003
-                        NumFilesPerFileSink: 1
-                        Stats Publishing Key Prefix: pfile:/Users/njain/hive/hive2/build/ql/scratchdir/hive_2011-11-11_17-47-58_134_7214786013092589853/-ext-10000/
-                        table:
-                            input format: org.apache.hadoop.mapred.TextInputFormat
-                            output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                            properties:
-                              bucket_count -1
-                              columns key,value,val2
-                              columns.types string:string:int
-                              file.inputformat org.apache.hadoop.mapred.TextInputFormat
-                              file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                              location pfile:/Users/njain/hive/hive2/build/ql/test/data/warehouse/dest_j1
-                              name default.dest_j1
-                              serialization.ddl struct dest_j1 { string key, string value, i32 val2}
-                              serialization.format 1
-                              serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                              transient_lastDdlTime 1321062478
-                            serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                            name: default.dest_j1
-                        TotalFiles: 1
-                        GatherStats: true
-                        MultiFileSpray: false
+                    File Output Operator
+                      compressed: false
+                      GlobalTableId: 1
+                      directory: pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-12-07_17-58-12_129_4473789020840822175/-ext-10003
+                      NumFilesPerFileSink: 1
+                      Stats Publishing Key Prefix: pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-12-07_17-58-12_129_4473789020840822175/-ext-10000/
+                      table:
+                          input format: org.apache.hadoop.mapred.TextInputFormat
+                          output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                          properties:
+                            bucket_count -1
+                            columns key,value,val2
+                            columns.types string:string:int
+                            file.inputformat org.apache.hadoop.mapred.TextInputFormat
+                            file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                            location pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/dest_j1
+                            name default.dest_j1
+                            serialization.ddl struct dest_j1 { string key, string value, i32 val2}
+                            serialization.format 1
+                            serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                            transient_lastDdlTime 1323309492
+                          serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                          name: default.dest_j1
+                      TotalFiles: 1
+                      GatherStats: true
+                      MultiFileSpray: false
       Local Work:
         Map Reduce Local Work
       Needs Tagging: false
       Path -> Alias:
-        file:/var/folders/bZ/bZe+iKfoFTuPoShRd6dy6-tOU9Y/-Tmp-/njain/hive_2011-11-11_17-47-58_134_7214786013092589853/-mr-10002 [file:/var/folders/bZ/bZe+iKfoFTuPoShRd6dy6-tOU9Y/-Tmp-/njain/hive_2011-11-11_17-47-58_134_7214786013092589853/-mr-10002]
-        file:/var/folders/bZ/bZe+iKfoFTuPoShRd6dy6-tOU9Y/-Tmp-/njain/hive_2011-11-11_17-47-58_134_7214786013092589853/-mr-10004 [file:/var/folders/bZ/bZe+iKfoFTuPoShRd6dy6-tOU9Y/-Tmp-/njain/hive_2011-11-11_17-47-58_134_7214786013092589853/-mr-10004]
+        file:/tmp/njain/hive_2011-12-07_17-58-12_129_4473789020840822175/-mr-10002 [file:/tmp/njain/hive_2011-12-07_17-58-12_129_4473789020840822175/-mr-10002]
+        file:/tmp/njain/hive_2011-12-07_17-58-12_129_4473789020840822175/-mr-10004 [file:/tmp/njain/hive_2011-12-07_17-58-12_129_4473789020840822175/-mr-10004]
       Path -> Partition:
-        file:/var/folders/bZ/bZe+iKfoFTuPoShRd6dy6-tOU9Y/-Tmp-/njain/hive_2011-11-11_17-47-58_134_7214786013092589853/-mr-10002 
+        file:/tmp/njain/hive_2011-12-07_17-58-12_129_4473789020840822175/-mr-10002 
           Partition
             base file name: -mr-10002
             input format: org.apache.hadoop.mapred.SequenceFileInputFormat
@@ -334,7 +330,7 @@ STAGE PLANS:
                 columns _col0,_col1
                 columns.types string,bigint
                 escape.delim \
-        file:/var/folders/bZ/bZe+iKfoFTuPoShRd6dy6-tOU9Y/-Tmp-/njain/hive_2011-11-11_17-47-58_134_7214786013092589853/-mr-10004 
+        file:/tmp/njain/hive_2011-12-07_17-58-12_129_4473789020840822175/-mr-10004 
           Partition
             base file name: -mr-10004
             input format: org.apache.hadoop.mapred.SequenceFileInputFormat
@@ -358,14 +354,14 @@ STAGE PLANS:
     Move Operator
       files:
           hdfs directory: true
-          source: pfile:/Users/njain/hive/hive2/build/ql/scratchdir/hive_2011-11-11_17-47-58_134_7214786013092589853/-ext-10003
-          destination: pfile:/Users/njain/hive/hive2/build/ql/scratchdir/hive_2011-11-11_17-47-58_134_7214786013092589853/-ext-10000
+          source: pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-12-07_17-58-12_129_4473789020840822175/-ext-10003
+          destination: pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-12-07_17-58-12_129_4473789020840822175/-ext-10000
 
   Stage: Stage-0
     Move Operator
       tables:
           replace: true
-          source: pfile:/Users/njain/hive/hive2/build/ql/scratchdir/hive_2011-11-11_17-47-58_134_7214786013092589853/-ext-10000
+          source: pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-12-07_17-58-12_129_4473789020840822175/-ext-10000
           table:
               input format: org.apache.hadoop.mapred.TextInputFormat
               output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -375,28 +371,28 @@ STAGE PLANS:
                 columns.types string:string:int
                 file.inputformat org.apache.hadoop.mapred.TextInputFormat
                 file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                location pfile:/Users/njain/hive/hive2/build/ql/test/data/warehouse/dest_j1
+                location pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/dest_j1
                 name default.dest_j1
                 serialization.ddl struct dest_j1 { string key, string value, i32 val2}
                 serialization.format 1
                 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                transient_lastDdlTime 1321062478
+                transient_lastDdlTime 1323309492
               serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
               name: default.dest_j1
-          tmp directory: pfile:/Users/njain/hive/hive2/build/ql/scratchdir/hive_2011-11-11_17-47-58_134_7214786013092589853/-ext-10001
+          tmp directory: pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-12-07_17-58-12_129_4473789020840822175/-ext-10001
 
   Stage: Stage-3
     Stats-Aggr Operator
-      Stats Aggregation Key Prefix: pfile:/Users/njain/hive/hive2/build/ql/scratchdir/hive_2011-11-11_17-47-58_134_7214786013092589853/-ext-10000/
+      Stats Aggregation Key Prefix: pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-12-07_17-58-12_129_4473789020840822175/-ext-10000/
 
   Stage: Stage-4
     Map Reduce
       Alias -> Map Operator Tree:
-        pfile:/Users/njain/hive/hive2/build/ql/scratchdir/hive_2011-11-11_17-47-58_134_7214786013092589853/-ext-10003 
+        pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-12-07_17-58-12_129_4473789020840822175/-ext-10003 
             File Output Operator
               compressed: false
               GlobalTableId: 0
-              directory: pfile:/Users/njain/hive/hive2/build/ql/scratchdir/hive_2011-11-11_17-47-58_134_7214786013092589853/-ext-10000
+              directory: pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-12-07_17-58-12_129_4473789020840822175/-ext-10000
               NumFilesPerFileSink: 1
               table:
                   input format: org.apache.hadoop.mapred.TextInputFormat
@@ -407,12 +403,12 @@ STAGE PLANS:
                     columns.types string:string:int
                     file.inputformat org.apache.hadoop.mapred.TextInputFormat
                     file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                    location pfile:/Users/njain/hive/hive2/build/ql/test/data/warehouse/dest_j1
+                    location pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/dest_j1
                     name default.dest_j1
                     serialization.ddl struct dest_j1 { string key, string value, i32 val2}
                     serialization.format 1
                     serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                    transient_lastDdlTime 1321062478
+                    transient_lastDdlTime 1323309492
                   serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                   name: default.dest_j1
               TotalFiles: 1
@@ -420,9 +416,9 @@ STAGE PLANS:
               MultiFileSpray: false
       Needs Tagging: false
       Path -> Alias:
-        pfile:/Users/njain/hive/hive2/build/ql/scratchdir/hive_2011-11-11_17-47-58_134_7214786013092589853/-ext-10003 [pfile:/Users/njain/hive/hive2/build/ql/scratchdir/hive_2011-11-11_17-47-58_134_7214786013092589853/-ext-10003]
+        pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-12-07_17-58-12_129_4473789020840822175/-ext-10003 [pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-12-07_17-58-12_129_4473789020840822175/-ext-10003]
       Path -> Partition:
-        pfile:/Users/njain/hive/hive2/build/ql/scratchdir/hive_2011-11-11_17-47-58_134_7214786013092589853/-ext-10003 
+        pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-12-07_17-58-12_129_4473789020840822175/-ext-10003 
           Partition
             base file name: -ext-10003
             input format: org.apache.hadoop.mapred.TextInputFormat
@@ -433,12 +429,12 @@ STAGE PLANS:
               columns.types string:string:int
               file.inputformat org.apache.hadoop.mapred.TextInputFormat
               file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-              location pfile:/Users/njain/hive/hive2/build/ql/test/data/warehouse/dest_j1
+              location pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/dest_j1
               name default.dest_j1
               serialization.ddl struct dest_j1 { string key, string value, i32 val2}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-              transient_lastDdlTime 1321062478
+              transient_lastDdlTime 1323309492
             serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
           
               input format: org.apache.hadoop.mapred.TextInputFormat
@@ -449,12 +445,12 @@ STAGE PLANS:
                 columns.types string:string:int
                 file.inputformat org.apache.hadoop.mapred.TextInputFormat
                 file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                location pfile:/Users/njain/hive/hive2/build/ql/test/data/warehouse/dest_j1
+                location pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/dest_j1
                 name default.dest_j1
                 serialization.ddl struct dest_j1 { string key, string value, i32 val2}
                 serialization.format 1
                 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                transient_lastDdlTime 1321062478
+                transient_lastDdlTime 1323309492
               serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
               name: default.dest_j1
             name: default.dest_j1
@@ -499,9 +495,9 @@ STAGE PLANS:
                           type: bigint
       Needs Tagging: false
       Path -> Alias:
-        pfile:/Users/njain/hive/hive2/build/ql/test/data/warehouse/src [null-subquery2:subq1-subquery2:x1]
+        pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src [null-subquery2:subq1-subquery2:x1]
       Path -> Partition:
-        pfile:/Users/njain/hive/hive2/build/ql/test/data/warehouse/src 
+        pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src 
           Partition
             base file name: src
             input format: org.apache.hadoop.mapred.TextInputFormat
@@ -512,12 +508,12 @@ STAGE PLANS:
               columns.types string:string
               file.inputformat org.apache.hadoop.mapred.TextInputFormat
               file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-              location pfile:/Users/njain/hive/hive2/build/ql/test/data/warehouse/src
+              location pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src
               name default.src
               serialization.ddl struct src { string key, string value}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-              transient_lastDdlTime 1321061801
+              transient_lastDdlTime 1323309312
             serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
           
               input format: org.apache.hadoop.mapred.TextInputFormat
@@ -528,12 +524,12 @@ STAGE PLANS:
                 columns.types string:string
                 file.inputformat org.apache.hadoop.mapred.TextInputFormat
                 file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                location pfile:/Users/njain/hive/hive2/build/ql/test/data/warehouse/src
+                location pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/src
                 name default.src
                 serialization.ddl struct src { string key, string value}
                 serialization.format 1
                 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                transient_lastDdlTime 1321061801
+                transient_lastDdlTime 1323309312
               serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
               name: default.src
             name: default.src
@@ -557,7 +553,7 @@ STAGE PLANS:
             File Output Operator
               compressed: false
               GlobalTableId: 0
-              directory: file:/var/folders/bZ/bZe+iKfoFTuPoShRd6dy6-tOU9Y/-Tmp-/njain/hive_2011-11-11_17-47-58_134_7214786013092589853/-mr-10004
+              directory: file:/tmp/njain/hive_2011-12-07_17-58-12_129_4473789020840822175/-mr-10004
               NumFilesPerFileSink: 1
               table:
                   input format: org.apache.hadoop.mapred.SequenceFileInputFormat
@@ -601,11 +597,11 @@ POSTHOOK: Lineage: dest_j1.value SIMPLE 
 PREHOOK: query: select * from dest_j1 x order by x.key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest_j1
-PREHOOK: Output: file:/var/folders/bZ/bZe+iKfoFTuPoShRd6dy6-tOU9Y/-Tmp-/njain/hive_2011-11-11_17-48-31_514_2648201231429080670/-mr-10000
+PREHOOK: Output: file:/tmp/njain/hive_2011-12-07_17-58-25_435_1706583075891060460/-mr-10000
 POSTHOOK: query: select * from dest_j1 x order by x.key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest_j1
-POSTHOOK: Output: file:/var/folders/bZ/bZe+iKfoFTuPoShRd6dy6-tOU9Y/-Tmp-/njain/hive_2011-11-11_17-48-31_514_2648201231429080670/-mr-10000
+POSTHOOK: Output: file:/tmp/njain/hive_2011-12-07_17-58-25_435_1706583075891060460/-mr-10000
 POSTHOOK: Lineage: dest_j1.key SIMPLE [(src1)x.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: dest_j1.val2 EXPRESSION [(src)x.null, (src)x1.null, ]
 POSTHOOK: Lineage: dest_j1.value SIMPLE [(src1)x.FieldSchema(name:value, type:string, comment:default), ]

Modified: hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/lineage1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/lineage1.q.out?rev=1212183&r1=1212182&r2=1212183&view=diff
==============================================================================
--- hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/lineage1.q.out (original)
+++ hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/lineage1.q.out Thu Dec  8 23:37:20 2011
@@ -102,56 +102,54 @@ STAGE PLANS:
   Stage: Stage-2
     Map Reduce
       Alias -> Map Operator Tree:
-        file:/var/folders/bZ/bZe+iKfoFTuPoShRd6dy6-tOU9Y/-Tmp-/njain/hive_2011-11-11_17-48-38_851_484927696341419107/-mr-10002 
-          TableScan
-            Union
+        file:/tmp/njain/hive_2011-12-07_17-58-28_928_7172632558607469868/-mr-10002 
+          Union
+            Select Operator
+              expressions:
+                    expr: _col0
+                    type: string
+                    expr: _col1
+                    type: string
+              outputColumnNames: _col0, _col1
               Select Operator
                 expressions:
-                      expr: _col0
-                      type: string
+                      expr: UDFToInteger(_col0)
+                      type: int
                       expr: _col1
                       type: string
                 outputColumnNames: _col0, _col1
-                Select Operator
-                  expressions:
-                        expr: UDFToInteger(_col0)
-                        type: int
-                        expr: _col1
-                        type: string
-                  outputColumnNames: _col0, _col1
-                  File Output Operator
-                    compressed: false
-                    GlobalTableId: 1
-                    table:
-                        input format: org.apache.hadoop.mapred.TextInputFormat
-                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                        serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                        name: default.dest_l1
-        file:/var/folders/bZ/bZe+iKfoFTuPoShRd6dy6-tOU9Y/-Tmp-/njain/hive_2011-11-11_17-48-38_851_484927696341419107/-mr-10004 
-          TableScan
-            Union
+                File Output Operator
+                  compressed: false
+                  GlobalTableId: 1
+                  table:
+                      input format: org.apache.hadoop.mapred.TextInputFormat
+                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                      name: default.dest_l1
+        file:/tmp/njain/hive_2011-12-07_17-58-28_928_7172632558607469868/-mr-10004 
+          Union
+            Select Operator
+              expressions:
+                    expr: _col0
+                    type: string
+                    expr: _col1
+                    type: string
+              outputColumnNames: _col0, _col1
               Select Operator
                 expressions:
-                      expr: _col0
-                      type: string
+                      expr: UDFToInteger(_col0)
+                      type: int
                       expr: _col1
                       type: string
                 outputColumnNames: _col0, _col1
-                Select Operator
-                  expressions:
-                        expr: UDFToInteger(_col0)
-                        type: int
-                        expr: _col1
-                        type: string
-                  outputColumnNames: _col0, _col1
-                  File Output Operator
-                    compressed: false
-                    GlobalTableId: 1
-                    table:
-                        input format: org.apache.hadoop.mapred.TextInputFormat
-                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                        serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                        name: default.dest_l1
+                File Output Operator
+                  compressed: false
+                  GlobalTableId: 1
+                  table:
+                      input format: org.apache.hadoop.mapred.TextInputFormat
+                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                      name: default.dest_l1
 
   Stage: Stage-6
     Conditional Operator
@@ -160,7 +158,7 @@ STAGE PLANS:
     Move Operator
       files:
           hdfs directory: true
-          destination: pfile:/Users/njain/hive/hive2/build/ql/scratchdir/hive_2011-11-11_17-48-38_851_484927696341419107/-ext-10000
+          destination: pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-12-07_17-58-28_928_7172632558607469868/-ext-10000
 
   Stage: Stage-0
     Move Operator
@@ -178,7 +176,7 @@ STAGE PLANS:
   Stage: Stage-4
     Map Reduce
       Alias -> Map Operator Tree:
-        pfile:/Users/njain/hive/hive2/build/ql/scratchdir/hive_2011-11-11_17-48-38_851_484927696341419107/-ext-10003 
+        pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-12-07_17-58-28_928_7172632558607469868/-ext-10003 
             File Output Operator
               compressed: false
               GlobalTableId: 0

Modified: hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/load_dyn_part14.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/load_dyn_part14.q.out?rev=1212183&r1=1212182&r2=1212183&view=diff
==============================================================================
--- hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/load_dyn_part14.q.out (original)
+++ hive/branches/branch-0.8-r2/ql/src/test/results/clientpositive/load_dyn_part14.q.out Thu Dec  8 23:37:20 2011
@@ -12,7 +12,7 @@ POSTHOOK: type: DESCTABLE
 key	string	
 value	string	
 	 	 
-Detailed Table Information	Table(tableName:nzhang_part14, dbName:default, owner:njain, createTime:1321035905, lastAccessTime:0, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:key, type:string, comment:null), FieldSchema(name:value, type:string, comment:null)], location:pfile:/Users/njain/hive/hive2/build/ql/test/data/warehouse/nzhang_part14, inputFormat:org.apache.hadoop.mapred.TextInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat, compressed:false, numBuckets:-1, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe, parameters:{serialization.format=1}), bucketCols:[], sortCols:[], parameters:{}), partitionKeys:[FieldSchema(name:value, type:string, comment:null)], parameters:{transient_lastDdlTime=1321035905}, viewOriginalText:null, viewExpandedText:null, tableType:MANAGED_TABLE)	
+Detailed Table Information	Table(tableName:nzhang_part14, dbName:default, owner:njain, createTime:1323309520, lastAccessTime:0, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:key, type:string, comment:null), FieldSchema(name:value, type:string, comment:null)], location:pfile:/data/users/njain/hive_commit2/build/ql/test/data/warehouse/nzhang_part14, inputFormat:org.apache.hadoop.mapred.TextInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat, compressed:false, numBuckets:-1, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe, parameters:{serialization.format=1}), bucketCols:[], sortCols:[], parameters:{}), partitionKeys:[FieldSchema(name:value, type:string, comment:null)], parameters:{transient_lastDdlTime=1323309520}, viewOriginalText:null, viewExpandedText:null, tableType:MANAGED_TABLE)	
 PREHOOK: query: explain
 insert overwrite table nzhang_part14 partition(value) 
 select key, value from (
@@ -83,60 +83,57 @@ STAGE PLANS:
   Stage: Stage-2
     Map Reduce
       Alias -> Map Operator Tree:
-        file:/var/folders/bZ/bZe+iKfoFTuPoShRd6dy6-tOU9Y/-Tmp-/njain/hive_2011-11-11_10-25-05_842_9192092705231412985/-mr-10002 
-          TableScan
-            Union
-              Select Operator
-                expressions:
-                      expr: _col0
-                      type: string
-                      expr: _col1
-                      type: string
-                outputColumnNames: _col0, _col1
-                File Output Operator
-                  compressed: false
-                  GlobalTableId: 1
-                  table:
-                      input format: org.apache.hadoop.mapred.TextInputFormat
-                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                      name: default.nzhang_part14
-        file:/var/folders/bZ/bZe+iKfoFTuPoShRd6dy6-tOU9Y/-Tmp-/njain/hive_2011-11-11_10-25-05_842_9192092705231412985/-mr-10004 
-          TableScan
-            Union
-              Select Operator
-                expressions:
-                      expr: _col0
-                      type: string
-                      expr: _col1
-                      type: string
-                outputColumnNames: _col0, _col1
-                File Output Operator
-                  compressed: false
-                  GlobalTableId: 1
-                  table:
-                      input format: org.apache.hadoop.mapred.TextInputFormat
-                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                      name: default.nzhang_part14
-        file:/var/folders/bZ/bZe+iKfoFTuPoShRd6dy6-tOU9Y/-Tmp-/njain/hive_2011-11-11_10-25-05_842_9192092705231412985/-mr-10005 
-          TableScan
-            Union
-              Select Operator
-                expressions:
-                      expr: _col0
-                      type: string
-                      expr: _col1
-                      type: string
-                outputColumnNames: _col0, _col1
-                File Output Operator
-                  compressed: false
-                  GlobalTableId: 1
-                  table:
-                      input format: org.apache.hadoop.mapred.TextInputFormat
-                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                      name: default.nzhang_part14
+        file:/tmp/njain/hive_2011-12-07_17-58-40_914_3018145671418748325/-mr-10002 
+          Union
+            Select Operator
+              expressions:
+                    expr: _col0
+                    type: string
+                    expr: _col1
+                    type: string
+              outputColumnNames: _col0, _col1
+              File Output Operator
+                compressed: false
+                GlobalTableId: 1
+                table:
+                    input format: org.apache.hadoop.mapred.TextInputFormat
+                    output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                    serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                    name: default.nzhang_part14
+        file:/tmp/njain/hive_2011-12-07_17-58-40_914_3018145671418748325/-mr-10004 
+          Union
+            Select Operator
+              expressions:
+                    expr: _col0
+                    type: string
+                    expr: _col1
+                    type: string
+              outputColumnNames: _col0, _col1
+              File Output Operator
+                compressed: false
+                GlobalTableId: 1
+                table:
+                    input format: org.apache.hadoop.mapred.TextInputFormat
+                    output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                    serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                    name: default.nzhang_part14
+        file:/tmp/njain/hive_2011-12-07_17-58-40_914_3018145671418748325/-mr-10005 
+          Union
+            Select Operator
+              expressions:
+                    expr: _col0
+                    type: string
+                    expr: _col1
+                    type: string
+              outputColumnNames: _col0, _col1
+              File Output Operator
+                compressed: false
+                GlobalTableId: 1
+                table:
+                    input format: org.apache.hadoop.mapred.TextInputFormat
+                    output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                    serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                    name: default.nzhang_part14
 
   Stage: Stage-6
     Conditional Operator
@@ -145,7 +142,7 @@ STAGE PLANS:
     Move Operator
       files:
           hdfs directory: true
-          destination: pfile:/Users/njain/hive/hive2/build/ql/scratchdir/hive_2011-11-11_10-25-05_842_9192092705231412985/-ext-10000
+          destination: pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-12-07_17-58-40_914_3018145671418748325/-ext-10000
 
   Stage: Stage-0
     Move Operator
@@ -165,7 +162,7 @@ STAGE PLANS:
   Stage: Stage-4
     Map Reduce
       Alias -> Map Operator Tree:
-        pfile:/Users/njain/hive/hive2/build/ql/scratchdir/hive_2011-11-11_10-25-05_842_9192092705231412985/-ext-10003 
+        pfile:/data/users/njain/hive_commit2/build/ql/scratchdir/hive_2011-12-07_17-58-40_914_3018145671418748325/-ext-10003 
             File Output Operator
               compressed: false
               GlobalTableId: 0
@@ -278,13 +275,13 @@ order by key, value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@nzhang_part14@value= 
 PREHOOK: Input: default@nzhang_part14@value=__HIVE_DEFAULT_PARTITION__
-PREHOOK: Output: file:/var/folders/bZ/bZe+iKfoFTuPoShRd6dy6-tOU9Y/-Tmp-/njain/hive_2011-11-11_10-25-41_035_2320609910504169210/-mr-10000
+PREHOOK: Output: file:/tmp/njain/hive_2011-12-07_17-58-56_195_4783722404416817168/-mr-10000
 POSTHOOK: query: select * from nzhang_part14 where value <> 'a'
 order by key, value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@nzhang_part14@value= 
 POSTHOOK: Input: default@nzhang_part14@value=__HIVE_DEFAULT_PARTITION__
-POSTHOOK: Output: file:/var/folders/bZ/bZe+iKfoFTuPoShRd6dy6-tOU9Y/-Tmp-/njain/hive_2011-11-11_10-25-41_035_2320609910504169210/-mr-10000
+POSTHOOK: Output: file:/tmp/njain/hive_2011-12-07_17-58-56_195_4783722404416817168/-mr-10000
 POSTHOOK: Lineage: nzhang_part14 PARTITION(value= ).key EXPRESSION []
 POSTHOOK: Lineage: nzhang_part14 PARTITION(value=__HIVE_DEFAULT_PARTITION__).key EXPRESSION []
 k1	__HIVE_DEFAULT_PARTITION__