hadoop-hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From na...@apache.org
Subject svn commit: r896715 [1/5] - in /hadoop/hive/trunk: ./ common/src/java/org/apache/hadoop/hive/conf/ conf/ ql/src/java/org/apache/hadoop/hive/ql/exec/ ql/src/test/queries/clientpositive/ ql/src/test/results/clientpositive/ ql/src/test/results/compiler/plan/
Date Wed, 06 Jan 2010 23:27:48 GMT
Author: namit
Date: Wed Jan  6 23:27:40 2010
New Revision: 896715

URL: http://svn.apache.org/viewvc?rev=896715&view=rev
Log:
HIVE-1030 mapjoin should throw an error if the input is too large
(Ning Zhang via namit)


Added:
    hadoop/hive/trunk/ql/src/test/queries/clientpositive/fatal.q
    hadoop/hive/trunk/ql/src/test/results/clientpositive/fatal.q.out
Modified:
    hadoop/hive/trunk/CHANGES.txt
    hadoop/hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
    hadoop/hive/trunk/conf/hive-default.xml
    hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ExecDriver.java
    hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ExecMapper.java
    hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/MapJoinOperator.java
    hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/case_sensitivity.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/cast1.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby1.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby2.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby3.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby4.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby5.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby6.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/input1.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/input2.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/input20.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/input3.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/input4.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/input5.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/input6.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/input7.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/input8.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/input9.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_part1.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_testsequencefile.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_testxpath.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_testxpath2.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/join1.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/join2.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/join3.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/join4.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/join5.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/join6.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/join7.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/join8.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample1.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample2.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample3.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample4.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample5.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample6.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample7.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/subq.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf1.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf4.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf6.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf_case.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf_when.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/union.q.xml

Modified: hadoop/hive/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/CHANGES.txt?rev=896715&r1=896714&r2=896715&view=diff
==============================================================================
--- hadoop/hive/trunk/CHANGES.txt (original)
+++ hadoop/hive/trunk/CHANGES.txt Wed Jan  6 23:27:40 2010
@@ -409,6 +409,9 @@
     HIVE-1030 Hive should use scratchDir instead of system temporary directory
     for storing plans (Zheng Shao via namit)
 
+    HIVE-1030 mapjoin should throw an error if the input is too large
+    (Ning Zhang via namit)
+
 Release 0.4.0 -  Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java?rev=896715&r1=896714&r2=896715&view=diff
==============================================================================
--- hadoop/hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java (original)
+++ hadoop/hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java Wed Jan  6 23:27:40 2010
@@ -169,6 +169,7 @@
     HIVEMERGEMAPFILESAVGSIZE("hive.merge.smallfiles.avgsize", (long)(16*1000*1000)),
 
     HIVESENDHEARTBEAT("hive.heartbeat.interval", 1000),
+    HIVEMAXMAPJOINSIZE("hive.mapjoin.maxsize", 100000),
 
     HIVEJOBPROGRESS("hive.task.progress", false),
 

Modified: hadoop/hive/trunk/conf/hive-default.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/conf/hive-default.xml?rev=896715&r1=896714&r2=896715&view=diff
==============================================================================
--- hadoop/hive/trunk/conf/hive-default.xml (original)
+++ hadoop/hive/trunk/conf/hive-default.xml Wed Jan  6 23:27:40 2010
@@ -268,6 +268,12 @@
 </property>
 
 <property>
+  <name>hive.mapjoin.maxsize</name>
+  <value>100000</value>
+  <description>Maximum # of rows of the small table that can be handled by map-side join. If the size is reached and hive.task.progress is set, a fatal error counter is set and the job will be killed.</description>
+</property>
+
+<property>
   <name>hive.mapjoin.cache.numrows</name>
   <value>25000</value>
   <description>How many rows should be cached by jdbm for map join. </description>

Modified: hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ExecDriver.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ExecDriver.java?rev=896715&r1=896714&r2=896715&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ExecDriver.java (original)
+++ hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ExecDriver.java Wed Jan  6 23:27:40 2010
@@ -67,7 +67,8 @@
   transient protected JobConf job;
   transient protected int mapProgress = 0;
   transient protected int reduceProgress = 0;
-
+  transient protected boolean success = false; // if job execution is successful
+  
   public static Random randGen = new Random();
   /**
    * Constructor when invoked from QL
@@ -233,7 +234,35 @@
       return rj.getCounters();
     }
   }
-
+  
+  /**
+   * Fatal errors are those errors that cannot be recovered by retries. These
+   * are application dependent. Examples of fatal errors include:
+   *  - the small table in the map-side joins is too large to be feasible to be
+   *    handled by one mapper. The job should fail and the user should be warned
+   *    to use regular joins rather than map-side joins.
+   * Fatal errors are indicated by counters that are set at execution time. 
+   * If the counter is non-zero, a fatal error occurred. The value of the counter
+   * indicates the error type. 
+   * @return true if fatal errors happened during job execution, false otherwise.
+   */
+  protected boolean checkFatalErrors(TaskHandle t, StringBuffer errMsg) {
+    ExecDriverTaskHandle th = (ExecDriverTaskHandle) t;
+    RunningJob rj = th.getRunningJob();
+    try {
+      Counters ctrs = th.getCounters();
+      for (Operator<? extends Serializable> op: work.getAliasToWork().values()) {
+        if (op.checkFatalErrors(ctrs, errMsg))
+          return true;
+      }
+      return false;
+     } catch (IOException e) {
+      // this exception can be tolerated
+      e.printStackTrace();
+      return false;
+    }
+  }
+  
   public void progress(TaskHandle taskHandle) throws IOException {
     ExecDriverTaskHandle th = (ExecDriverTaskHandle)taskHandle;
     JobClient jc = th.getJobClient();
@@ -243,16 +272,31 @@
         = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss,SSS");
     long reportTime = System.currentTimeMillis();
     long maxReportInterval = 60 * 1000; // One minute
+    boolean fatal = false;
+    StringBuffer errMsg = new StringBuffer();
     while (!rj.isComplete()) {
       try {
         Thread.sleep(1000);
       } catch (InterruptedException e) {
       }
       th.setRunningJob(jc.getJob(rj.getJobID()));
+      
+      // If fatal errors happen we should kill the job immediately rather than
+      // let the job retry several times, which eventually lead to failure.
+      if (fatal)
+        continue;  // wait until rj.isComplete
+      if ( fatal = checkFatalErrors(th, errMsg)) {
+        success = false;
+        console.printError("[Fatal Error] " + errMsg.toString() + ". Killing the job.");
+        rj.killJob();
+        continue;
+      }
+      errMsg.setLength(0);
+      
       updateCounters(th);
 
       String report = " "+getId()+" map = " + this.mapProgress + "%,  reduce = " + this.reduceProgress + "%";
-
+      
       if (!report.equals(lastReport)
           || System.currentTimeMillis() >= reportTime + maxReportInterval) {
 
@@ -275,6 +319,13 @@
         reportTime = System.currentTimeMillis();
       }
     }
+    // check for fatal error again in case it occurred after the last check before the job is completed
+    if ( !fatal && (fatal = checkFatalErrors(th, errMsg))) {
+      console.printError("[Fatal Error] " + errMsg.toString());
+      success = false;
+    } else 
+      success = rj.isSuccessful();
+ 
     setDone();
     th.setRunningJob(jc.getJob(rj.getJobID()));
     updateCounters(th);
@@ -495,7 +546,6 @@
 
     int returnVal = 0;
     RunningJob rj = null, orig_rj = null;
-    boolean success = false;
 
     boolean noName = StringUtils.isEmpty(HiveConf.
       getVar(job,HiveConf.ConfVars.HADOOPJOBNAME));
@@ -532,16 +582,14 @@
 
       TaskHandle th = new ExecDriverTaskHandle(jc, rj);
       jobInfo(rj);
-      progress(th);
+      progress(th); // success status will be setup inside progress
 
       if (rj == null) {
         // in the corner case where the running job has disappeared from JT memory
         // remember that we did actually submit the job.
         rj = orig_rj;
         success = false;
-      } else {
-        success = rj.isSuccessful();
-      }
+      } 
 
       String statusMesg = "Ended Job = " + rj.getJobID();
       if (!success) {

Modified: hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ExecMapper.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ExecMapper.java?rev=896715&r1=896714&r2=896715&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ExecMapper.java (original)
+++ hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ExecMapper.java Wed Jan  6 23:27:40 2010
@@ -140,6 +140,11 @@
               }
               fetchOpRows++;
               forwardOp.process(row.o, 0);
+              // check if any operator had a fatal error or early exit during execution
+              if ( forwardOp.getDone() ) {
+                done = true;
+                break;
+              }
             }
             
             if (l4j.isInfoEnabled()) {

Modified: hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/MapJoinOperator.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/MapJoinOperator.java?rev=896715&r1=896714&r2=896715&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/MapJoinOperator.java (original)
+++ hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/MapJoinOperator.java Wed Jan  6 23:27:40 2010
@@ -72,6 +72,11 @@
 
   transient protected Map<Byte, HashMapWrapper<MapJoinObjectKey, MapJoinObjectValue>> mapJoinTables;
   
+  transient static final private String[] fatalErrMsg = { 
+    null,  // counter value 0 means no error
+    "Mapside join size exceeds hive.mapjoin.maxsize. Please increase that or remove the mapjoin hint." // counter value 1
+  };
+  
   public static class MapJoinObjectCtx {
     ObjectInspector standardOI;
     SerDe      serde;
@@ -115,6 +120,7 @@
   transient List<File> hTables;
   transient int      numMapRowsRead;
   transient int      heartbeatInterval;
+  transient int      maxMapJoinSize;
 
   @Override
   protected void initializeOp(Configuration hconf) throws HiveException {
@@ -123,6 +129,7 @@
 
     firstRow = true;
     heartbeatInterval = HiveConf.getIntVar(hconf, HiveConf.ConfVars.HIVESENDHEARTBEAT);
+    maxMapJoinSize = HiveConf.getIntVar(hconf, HiveConf.ConfVars.HIVEMAXMAPJOINSIZE);
     
     joinKeys  = new HashMap<Byte, List<ExprNodeEvaluator>>();
     
@@ -176,9 +183,14 @@
   }
   
   @Override
+  protected void fatalErrorMessage(StringBuffer errMsg, long counterCode) {
+    errMsg.append("Operator " + getOperatorId() + " (id=" + id + "): " + 
+        fatalErrMsg[(int)counterCode]);
+  }
+  
+  @Override
   public void processOp(Object row, int tag) throws HiveException {
     try {
-      
       // get alias
       alias = (byte)tag;
       
@@ -207,10 +219,19 @@
           firstRow = false;
         }
 
-        // Send some status perodically
+        // Send some status periodically
         numMapRowsRead++;
         if (((numMapRowsRead % heartbeatInterval) == 0) && (reporter != null))
           reporter.progress();
+        
+        if ( (numMapRowsRead > maxMapJoinSize) && (reporter != null) && (counterNameToEnum != null)) {
+          // update counter
+          LOG.warn("Too many rows in map join tables. Fatal error counter will be incremented!!");
+          incrCounter(fatalErrorCntr, 1);
+          fatalError = true;
+          return;
+        }
+          
 
         HashMapWrapper<MapJoinObjectKey, MapJoinObjectValue> hashTable =  mapJoinTables.get(alias);
         MapJoinObjectKey keyMap = new MapJoinObjectKey(metadataKeyTag, key);

Modified: hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java?rev=896715&r1=896714&r2=896715&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java (original)
+++ hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java Wed Jan  6 23:27:40 2010
@@ -89,6 +89,8 @@
   };
   transient protected State state = State.UNINIT;
 
+  transient static boolean fatalError = false; // fatalError is shared acorss all operators
+  
   static {
     seqId = 0;
   }
@@ -152,7 +154,7 @@
   }
 
   public boolean getDone() {
-    return done;
+    return done || fatalError;
   }
 
   public void setDone(boolean done) {
@@ -280,6 +282,7 @@
     if(!areAllParentsInitialized()) {
       return;
     }
+    
     LOG.info("Initializing Self " + id + " " + getName());
 
     if (inputOIs != null) {
@@ -337,6 +340,9 @@
     LOG.info("Initializing children of " + id + " " + getName());
     for (int i = 0; i < childOperatorsArray.length; i++) {
       childOperatorsArray[i].initialize(hconf, outputObjInspector, childOperatorsTag[i]);
+      if ( reporter != null ) {
+        childOperatorsArray[i].setReporter(reporter);
+      }
     }
   }
 
@@ -370,6 +376,8 @@
    *             Rows with the same tag should have exactly the same rowInspector all the time.
    */
   public void process(Object row, int tag) throws HiveException {
+    if ( fatalError ) 
+      return;
     preProcessCounter();
     processOp(row, tag);
     postProcessCounter();
@@ -381,6 +389,9 @@
 
     if (childOperators == null)
       return;
+    
+    if ( fatalError )
+      return;
 
     LOG.debug("Starting group for children:");
     for (Operator<? extends Serializable> op: childOperators)
@@ -396,6 +407,9 @@
     if (childOperators == null)
       return;
 
+    if ( fatalError )
+      return;
+
     LOG.debug("Ending group for children:");
     for (Operator<? extends Serializable> op: childOperators)
       op.endGroup();
@@ -720,17 +734,49 @@
    * TODO This is a hack for hadoop 0.17 which only supports enum counters
    */
   public static enum ProgressCounter {
-    C1, C2, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12, C13, C14, C15, C16,
-    C17, C18, C19, C20, C21, C22, C23, C24, C25, C26, C27, C28, C29, C30, C31, C32,
-    C33, C34, C35, C36, C37, C38, C39, C40, C41, C42, C43, C44, C45, C46, C47, C48,
-    C49, C50, C51, C52, C53, C54, C55, C56, C57, C58, C59, C60, C61, C62, C63, C64,
-    C65, C66, C67, C68, C69, C70, C71, C72, C73, C74, C75, C76, C77, C78, C79, C80,
-    C81, C82, C83, C84, C85, C86, C87, C88, C89, C90, C91, C92, C93, C94, C95, C96,
-    C97, C98, C99, C100, C101, C102, C103, C104, C105, C106, C107, C108, C109, C110, C111, C112,
-    C113, C114, C115, C116, C117, C118, C119, C120, C121, C122, C123, C124, C125, C126, C127, C128
+    C1, C2, C3, C4, C5, C6, C7, C8, C9, C10, 
+    C11, C12, C13, C14, C15, C16, C17, C18, C19, C20, 
+    C21, C22, C23, C24, C25, C26, C27, C28, C29, C30, 
+    C31, C32, C33, C34, C35, C36, C37, C38, C39, C40, 
+    C41, C42, C43, C44, C45, C46, C47, C48, C49, C50, 
+    C51, C52, C53, C54, C55, C56, C57, C58, C59, C60, 
+    C61, C62, C63, C64, C65, C66, C67, C68, C69, C70, 
+    C71, C72, C73, C74, C75, C76, C77, C78, C79, C80,
+    C81, C82, C83, C84, C85, C86, C87, C88, C89, C90, 
+    C91, C92, C93, C94, C95, C96, C97, C98, C99, C100, 
+    C101, C102, C103, C104, C105, C106, C107, C108, C109, C110, 
+    C111, C112, C113, C114, C115, C116, C117, C118, C119, C120, 
+    C121, C122, C123, C124, C125, C126, C127, C128, C129, C130,
+    C131, C132, C133, C134, C135, C136, C137, C138, C139, C140,
+    C141, C142, C143, C144, C145, C146, C147, C148, C149, C150,
+    C151, C152, C153, C154, C155, C156, C157, C158, C159, C160,
+    C161, C162, C163, C164, C165, C166, C167, C168, C169, C170,
+    C171, C172, C173, C174, C175, C176, C177, C178, C179, C180,
+    C181, C182, C183, C184, C185, C186, C187, C188, C189, C190,
+    C191, C192, C193, C194, C195, C196, C197, C198, C199, C200,
+    C201, C202, C203, C204, C205, C206, C207, C208, C209, C210,
+    C211, C212, C213, C214, C215, C216, C217, C218, C219, C220,
+    C221, C222, C223, C224, C225, C226, C227, C228, C229, C230,
+    C231, C232, C233, C234, C235, C236, C237, C238, C239, C240,
+    C241, C242, C243, C244, C245, C246, C247, C248, C249, C250,
+    C251, C252, C253, C254, C255, C256, C257, C258, C259, C260,
+    C261, C262, C263, C264, C265, C266, C267, C268, C269, C270,
+    C271, C272, C273, C274, C275, C276, C277, C278, C279, C280,
+    C281, C282, C283, C284, C285, C286, C287, C288, C289, C290,
+    C291, C292, C293, C294, C295, C296, C297, C298, C299, C300,
+    C301, C302, C303, C304, C305, C306, C307, C308, C309, C310,
+    C311, C312, C313, C314, C315, C316, C317, C318, C319, C320,
+    C321, C322, C323, C324, C325, C326, C327, C328, C329, C330,
+    C331, C332, C333, C334, C335, C336, C337, C338, C339, C340,
+    C341, C342, C343, C344, C345, C346, C347, C348, C349, C350,
+    C351, C352, C353, C354, C355, C356, C357, C358, C359, C360,
+    C361, C362, C363, C364, C365, C366, C367, C368, C369, C370,
+    C371, C372, C373, C374, C375, C376, C377, C378, C379, C380,
+    C381, C382, C383, C384, C385, C386, C387, C388, C389, C390,
+    C391, C392, C393, C394, C395, C396, C397, C398, C399, C400
   };
 
-  private static int totalNumCntrs = 128;
+  private static int totalNumCntrs = 400;
 
   /**
    * populated at runtime from hadoop counters at run time in the client
@@ -787,7 +833,7 @@
     String counterName = "CNTR_NAME_" + getOperatorId() + "_" + name;
     ProgressCounter pc = counterNameToEnum.get(counterName);
 
-    // Currently, we maintain 128 counters per plan - in case of a bigger tree, we may run out of them
+    // Currently, we maintain fixed number of counters per plan - in case of a bigger tree, we may run out of them
     if (pc == null)
       LOG.warn("Using too many counters. Increase the total number of counters for " + counterName);
     else if (reporter != null)
@@ -845,6 +891,46 @@
     }
   }
 
+  /**
+   * Recursively check this operator and its descendants to see if the
+   * fatal error counter is set to non-zero.
+   * @param ctrs
+   */
+  public boolean checkFatalErrors(Counters ctrs, StringBuffer errMsg) {
+    if ( counterNameToEnum == null )
+      return false;
+    
+    String counterName = "CNTR_NAME_" + getOperatorId() + "_" + fatalErrorCntr;
+    ProgressCounter pc = counterNameToEnum.get(counterName);
+
+    // Currently, we maintain fixed number of counters per plan - in case of a bigger tree, we may run out of them
+    if (pc == null)
+      LOG.warn("Using too many counters. Increase the total number of counters for " + counterName);
+    else {
+      long value = ctrs.getCounter(pc);
+      fatalErrorMessage(errMsg, value);
+      if ( value != 0 ) 
+        return true;
+    }
+    
+    if (getChildren() != null) {
+      for (Node op: getChildren()) {
+        if (((Operator<? extends Serializable>)op).checkFatalErrors(ctrs, errMsg)) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+  
+  /** 
+   * Get the fatal error message based on counter's code.
+   * @param errMsg error message should be appended to this output parameter.
+   * @param counterValue input counter code.
+   */
+  protected void fatalErrorMessage(StringBuffer errMsg, long counterValue) {
+  }
+  
   // A given query can have multiple map-reduce jobs
   public static void resetLastEnumUsed() {
     lastEnumUsed = 0;
@@ -878,6 +964,7 @@
   protected static String numInputRowsCntr  = "NUM_INPUT_ROWS";
   protected static String numOutputRowsCntr = "NUM_OUTPUT_ROWS";
   protected static String timeTakenCntr     = "TIME_TAKEN";
+  protected static String fatalErrorCntr    = "FATAL_ERROR";
 
   public void initializeCounters() {
     initOperatorId();
@@ -885,6 +972,7 @@
     counterNames.add("CNTR_NAME_" + getOperatorId() + "_" + numInputRowsCntr);
     counterNames.add("CNTR_NAME_" + getOperatorId() + "_" + numOutputRowsCntr);
     counterNames.add("CNTR_NAME_" + getOperatorId() + "_" + timeTakenCntr);
+    counterNames.add("CNTR_NAME_" + getOperatorId() + "_" + fatalErrorCntr);
     List<String> newCntrs = getAdditionalCounters();
     if (newCntrs != null) {
       counterNames.addAll(newCntrs);
@@ -894,11 +982,12 @@
   /*
    * By default, the list is empty - if an operator wants to add more counters, it should override this method
    * and provide the new list.
+
    */
   private List<String> getAdditionalCounters() {
     return null;
   }
-
+ 
   public HashMap<String, ProgressCounter> getCounterNameToEnum() {
     return counterNameToEnum;
   }

Added: hadoop/hive/trunk/ql/src/test/queries/clientpositive/fatal.q
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/queries/clientpositive/fatal.q?rev=896715&view=auto
==============================================================================
--- hadoop/hive/trunk/ql/src/test/queries/clientpositive/fatal.q (added)
+++ hadoop/hive/trunk/ql/src/test/queries/clientpositive/fatal.q Wed Jan  6 23:27:40 2010
@@ -0,0 +1,4 @@
+set hive.mapjoin.maxsize=1;
+set hive.task.progress=true;
+
+select /*+ mapjoin(b) */ * from src a join src b on (a.key=b.key);

Added: hadoop/hive/trunk/ql/src/test/results/clientpositive/fatal.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/fatal.q.out?rev=896715&view=auto
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/fatal.q.out (added)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/fatal.q.out Wed Jan  6 23:27:40 2010
@@ -0,0 +1,8 @@
+PREHOOK: query: select /*+ mapjoin(b) */ * from src a join src b on (a.key=b.key)
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1224835023/10000
+POSTHOOK: query: select /*+ mapjoin(b) */ * from src a join src b on (a.key=b.key)
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1224835023/10000

Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/case_sensitivity.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/case_sensitivity.q.xml?rev=896715&r1=896714&r2=896715&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/case_sensitivity.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/case_sensitivity.q.xml Wed Jan  6 23:27:40 2010
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?> 
-<java version="1.6.0_07" class="java.beans.XMLDecoder"> 
+<java version="1.6.0_16" class="java.beans.XMLDecoder"> 
  <object id="MapRedTask0" class="org.apache.hadoop.hive.ql.exec.MapRedTask"> 
   <void property="childTasks"> 
    <object class="java.util.ArrayList"> 
@@ -30,7 +30,7 @@
                <boolean>true</boolean> 
               </void> 
               <void property="sourceDir"> 
-               <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/2028344243/10000</string> 
+               <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/35260603/10000</string> 
               </void> 
               <void property="table"> 
                <object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
@@ -83,11 +83,11 @@
                   </void> 
                   <void method="put"> 
                    <string>location</string> 
-                   <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/dest1</string> 
+                   <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest1</string> 
                   </void> 
                   <void method="put"> 
                    <string>transient_lastDdlTime</string> 
-                   <string>1259648273</string> 
+                   <string>1262739145</string> 
                   </void> 
                  </object> 
                 </void> 
@@ -97,7 +97,7 @@
                </object> 
               </void> 
               <void property="tmpDir"> 
-               <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/2028344243/10001</string> 
+               <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/35260603/10001</string> 
               </void> 
              </object> 
             </void> 
@@ -125,10 +125,10 @@
                <boolean>true</boolean> 
               </void> 
               <void property="sourceDir"> 
-               <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/925350182/10002</string> 
+               <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1354175981/10002</string> 
               </void> 
               <void property="targetDir"> 
-               <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/2028344243/10000</string> 
+               <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/35260603/10000</string> 
               </void> 
              </object> 
             </void> 
@@ -146,7 +146,7 @@
             <void property="aliasToWork"> 
              <object class="java.util.LinkedHashMap"> 
               <void method="put"> 
-               <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/925350182/10002</string> 
+               <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1354175981/10002</string> 
                <object id="TableScanOperator0" class="org.apache.hadoop.hive.ql.exec.TableScanOperator"> 
                 <void property="childOperators"> 
                  <object class="java.util.ArrayList"> 
@@ -309,6 +309,9 @@
                       <void method="add"> 
                        <string>CNTR_NAME_RS_6_TIME_TAKEN</string> 
                       </void> 
+                      <void method="add"> 
+                       <string>CNTR_NAME_RS_6_FATAL_ERROR</string> 
+                      </void> 
                      </object> 
                     </void> 
                     <void property="operatorId"> 
@@ -364,6 +367,9 @@
                   <void method="add"> 
                    <string>CNTR_NAME_TS_5_TIME_TAKEN</string> 
                   </void> 
+                  <void method="add"> 
+                   <string>CNTR_NAME_TS_5_FATAL_ERROR</string> 
+                  </void> 
                  </object> 
                 </void> 
                 <void property="operatorId"> 
@@ -385,10 +391,10 @@
             <void property="pathToAliases"> 
              <object class="java.util.LinkedHashMap"> 
               <void method="put"> 
-               <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/925350182/10002</string> 
+               <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1354175981/10002</string> 
                <object class="java.util.ArrayList"> 
                 <void method="add"> 
-                 <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/925350182/10002</string> 
+                 <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1354175981/10002</string> 
                 </void> 
                </object> 
               </void> 
@@ -397,7 +403,7 @@
             <void property="pathToPartitionInfo"> 
              <object class="java.util.LinkedHashMap"> 
               <void method="put"> 
-               <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/925350182/10002</string> 
+               <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1354175981/10002</string> 
                <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
                 <void property="deserializerClass"> 
                  <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class> 
@@ -430,7 +436,7 @@
                   <void property="conf"> 
                    <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
                     <void property="dirName"> 
-                     <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/2028344243/10000</string> 
+                     <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/35260603/10000</string> 
                     </void> 
                     <void property="tableInfo"> 
                      <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
@@ -479,7 +485,7 @@
                         </void> 
                         <void method="put"> 
                          <string>location</string> 
-                         <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/dest1</string> 
+                         <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest1</string> 
                         </void> 
                         <void method="put"> 
                          <string>file.outputformat</string> 
@@ -487,7 +493,7 @@
                         </void> 
                         <void method="put"> 
                          <string>transient_lastDdlTime</string> 
-                         <string>1259648273</string> 
+                         <string>1262739145</string> 
                         </void> 
                        </object> 
                       </void> 
@@ -509,6 +515,9 @@
                     <void method="add"> 
                      <string>CNTR_NAME_FS_8_TIME_TAKEN</string> 
                     </void> 
+                    <void method="add"> 
+                     <string>CNTR_NAME_FS_8_FATAL_ERROR</string> 
+                    </void> 
                    </object> 
                   </void> 
                   <void property="operatorId"> 
@@ -556,6 +565,9 @@
                 <void method="add"> 
                  <string>CNTR_NAME_OP_7_TIME_TAKEN</string> 
                 </void> 
+                <void method="add"> 
+                 <string>CNTR_NAME_OP_7_FATAL_ERROR</string> 
+                </void> 
                </object> 
               </void> 
               <void property="operatorId"> 
@@ -621,7 +633,7 @@
       <void property="resolverCtx"> 
        <object class="org.apache.hadoop.hive.ql.plan.ConditionalResolverMergeFiles$ConditionalResolverMergeFilesCtx"> 
         <void property="dir"> 
-         <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/925350182/10002</string> 
+         <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1354175981/10002</string> 
         </void> 
         <void property="listTasks"> 
          <object idref="ArrayList0"/> 
@@ -711,11 +723,11 @@
          </void> 
          <void method="put"> 
           <string>location</string> 
-          <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src_thrift</string> 
+          <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src_thrift</string> 
          </void> 
          <void method="put"> 
           <string>transient_lastDdlTime</string> 
-          <string>1259648272</string> 
+          <string>1262739144</string> 
          </void> 
         </object> 
        </void> 
@@ -771,7 +783,7 @@
                            <int>1</int> 
                           </void> 
                           <void property="dirName"> 
-                           <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/925350182/10002</string> 
+                           <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1354175981/10002</string> 
                           </void> 
                           <void property="tableInfo"> 
                            <object idref="tableDesc0"/> 
@@ -789,6 +801,9 @@
                           <void method="add"> 
                            <string>CNTR_NAME_FS_3_TIME_TAKEN</string> 
                           </void> 
+                          <void method="add"> 
+                           <string>CNTR_NAME_FS_3_FATAL_ERROR</string> 
+                          </void> 
                          </object> 
                         </void> 
                         <void property="operatorId"> 
@@ -944,6 +959,9 @@
                       <void method="add"> 
                        <string>CNTR_NAME_SEL_2_TIME_TAKEN</string> 
                       </void> 
+                      <void method="add"> 
+                       <string>CNTR_NAME_SEL_2_FATAL_ERROR</string> 
+                      </void> 
                      </object> 
                     </void> 
                     <void property="operatorId"> 
@@ -1078,6 +1096,9 @@
                   <void method="add"> 
                    <string>CNTR_NAME_FIL_1_TIME_TAKEN</string> 
                   </void> 
+                  <void method="add"> 
+                   <string>CNTR_NAME_FIL_1_FATAL_ERROR</string> 
+                  </void> 
                  </object> 
                 </void> 
                 <void property="operatorId"> 
@@ -1259,6 +1280,9 @@
               <void method="add"> 
                <string>CNTR_NAME_FIL_4_TIME_TAKEN</string> 
               </void> 
+              <void method="add"> 
+               <string>CNTR_NAME_FIL_4_FATAL_ERROR</string> 
+              </void> 
              </object> 
             </void> 
             <void property="operatorId"> 
@@ -1300,6 +1324,9 @@
           <void method="add"> 
            <string>CNTR_NAME_TS_0_TIME_TAKEN</string> 
           </void> 
+          <void method="add"> 
+           <string>CNTR_NAME_TS_0_FATAL_ERROR</string> 
+          </void> 
          </object> 
         </void> 
         <void property="neededColumnIDs"> 
@@ -1329,7 +1356,7 @@
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src_thrift</string> 
+       <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src_thrift</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>src_thrift</string> 
@@ -1341,7 +1368,7 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src_thrift</string> 
+       <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src_thrift</string> 
        <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
         <void property="deserializerClass"> 
          <class>org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer</class> 

Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/cast1.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/cast1.q.xml?rev=896715&r1=896714&r2=896715&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/cast1.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/cast1.q.xml Wed Jan  6 23:27:40 2010
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?> 
-<java version="1.6.0_07" class="java.beans.XMLDecoder"> 
+<java version="1.6.0_16" class="java.beans.XMLDecoder"> 
  <object class="org.apache.hadoop.hive.ql.exec.MapRedTask"> 
   <void property="id"> 
    <string>Stage-2</string> 
@@ -62,11 +62,11 @@
          </void> 
          <void method="put"> 
           <string>location</string> 
-          <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string> 
+          <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src</string> 
          </void> 
          <void method="put"> 
           <string>transient_lastDdlTime</string> 
-          <string>1259648276</string> 
+          <string>1262739149</string> 
          </void> 
         </object> 
        </void> 
@@ -119,7 +119,7 @@
                         <void property="conf"> 
                          <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
                           <void property="dirName"> 
-                           <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/859934066/10001</string> 
+                           <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/21599662/10001</string> 
                           </void> 
                           <void property="tableInfo"> 
                            <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
@@ -163,6 +163,9 @@
                           <void method="add"> 
                            <string>CNTR_NAME_FS_21_TIME_TAKEN</string> 
                           </void> 
+                          <void method="add"> 
+                           <string>CNTR_NAME_FS_21_FATAL_ERROR</string> 
+                          </void> 
                          </object> 
                         </void> 
                         <void property="operatorId"> 
@@ -648,6 +651,9 @@
                       <void method="add"> 
                        <string>CNTR_NAME_SEL_20_TIME_TAKEN</string> 
                       </void> 
+                      <void method="add"> 
+                       <string>CNTR_NAME_SEL_20_FATAL_ERROR</string> 
+                      </void> 
                      </object> 
                     </void> 
                     <void property="operatorId"> 
@@ -829,6 +835,9 @@
                   <void method="add"> 
                    <string>CNTR_NAME_FIL_19_TIME_TAKEN</string> 
                   </void> 
+                  <void method="add"> 
+                   <string>CNTR_NAME_FIL_19_FATAL_ERROR</string> 
+                  </void> 
                  </object> 
                 </void> 
                 <void property="operatorId"> 
@@ -935,6 +944,9 @@
               <void method="add"> 
                <string>CNTR_NAME_FIL_22_TIME_TAKEN</string> 
               </void> 
+              <void method="add"> 
+               <string>CNTR_NAME_FIL_22_FATAL_ERROR</string> 
+              </void> 
              </object> 
             </void> 
             <void property="operatorId"> 
@@ -976,6 +988,9 @@
           <void method="add"> 
            <string>CNTR_NAME_TS_18_TIME_TAKEN</string> 
           </void> 
+          <void method="add"> 
+           <string>CNTR_NAME_TS_18_FATAL_ERROR</string> 
+          </void> 
          </object> 
         </void> 
         <void property="neededColumnIDs"> 
@@ -1002,7 +1017,7 @@
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string> 
+       <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>src</string> 
@@ -1014,7 +1029,7 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string> 
+       <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src</string> 
        <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
         <void property="deserializerClass"> 
          <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class> 

Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby1.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby1.q.xml?rev=896715&r1=896714&r2=896715&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby1.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby1.q.xml Wed Jan  6 23:27:40 2010
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?> 
-<java version="1.6.0_07" class="java.beans.XMLDecoder"> 
+<java version="1.6.0_16" class="java.beans.XMLDecoder"> 
  <object id="MapRedTask0" class="org.apache.hadoop.hive.ql.exec.MapRedTask"> 
   <void property="childTasks"> 
    <object class="java.util.ArrayList"> 
@@ -26,7 +26,7 @@
            <boolean>true</boolean> 
           </void> 
           <void property="sourceDir"> 
-           <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/1773953046/10000</string> 
+           <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/362038280/10000</string> 
           </void> 
           <void property="table"> 
            <object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
@@ -79,11 +79,11 @@
               </void> 
               <void method="put"> 
                <string>location</string> 
-               <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/dest1</string> 
+               <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest1</string> 
               </void> 
               <void method="put"> 
                <string>transient_lastDdlTime</string> 
-               <string>1259648280</string> 
+               <string>1262739152</string> 
               </void> 
              </object> 
             </void> 
@@ -93,7 +93,7 @@
            </object> 
           </void> 
           <void property="tmpDir"> 
-           <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/1773953046/10001</string> 
+           <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/362038280/10001</string> 
           </void> 
          </object> 
         </void> 
@@ -164,11 +164,11 @@
          </void> 
          <void method="put"> 
           <string>location</string> 
-          <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string> 
+          <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src</string> 
          </void> 
          <void method="put"> 
           <string>transient_lastDdlTime</string> 
-          <string>1259648280</string> 
+          <string>1262739152</string> 
          </void> 
         </object> 
        </void> 
@@ -360,6 +360,9 @@
                       <void method="add"> 
                        <string>CNTR_NAME_RS_31_TIME_TAKEN</string> 
                       </void> 
+                      <void method="add"> 
+                       <string>CNTR_NAME_RS_31_FATAL_ERROR</string> 
+                      </void> 
                      </object> 
                     </void> 
                     <void property="operatorId"> 
@@ -530,6 +533,9 @@
                   <void method="add"> 
                    <string>CNTR_NAME_GBY_30_TIME_TAKEN</string> 
                   </void> 
+                  <void method="add"> 
+                   <string>CNTR_NAME_GBY_30_FATAL_ERROR</string> 
+                  </void> 
                  </object> 
                 </void> 
                 <void property="operatorId"> 
@@ -632,6 +638,9 @@
               <void method="add"> 
                <string>CNTR_NAME_SEL_29_TIME_TAKEN</string> 
               </void> 
+              <void method="add"> 
+               <string>CNTR_NAME_SEL_29_FATAL_ERROR</string> 
+              </void> 
              </object> 
             </void> 
             <void property="operatorId"> 
@@ -694,6 +703,9 @@
           <void method="add"> 
            <string>CNTR_NAME_TS_28_TIME_TAKEN</string> 
           </void> 
+          <void method="add"> 
+           <string>CNTR_NAME_TS_28_FATAL_ERROR</string> 
+          </void> 
          </object> 
         </void> 
         <void property="neededColumnIDs"> 
@@ -729,7 +741,7 @@
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string> 
+       <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>src</string> 
@@ -741,7 +753,7 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string> 
+       <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src</string> 
        <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
         <void property="deserializerClass"> 
          <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class> 
@@ -800,7 +812,7 @@
                  <int>1</int> 
                 </void> 
                 <void property="dirName"> 
-                 <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/1773953046/10000</string> 
+                 <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/362038280/10000</string> 
                 </void> 
                 <void property="tableInfo"> 
                  <object idref="tableDesc0"/> 
@@ -818,6 +830,9 @@
                 <void method="add"> 
                  <string>CNTR_NAME_FS_34_TIME_TAKEN</string> 
                 </void> 
+                <void method="add"> 
+                 <string>CNTR_NAME_FS_34_FATAL_ERROR</string> 
+                </void> 
                </object> 
               </void> 
               <void property="operatorId"> 
@@ -929,6 +944,9 @@
             <void method="add"> 
              <string>CNTR_NAME_SEL_33_TIME_TAKEN</string> 
             </void> 
+            <void method="add"> 
+             <string>CNTR_NAME_SEL_33_FATAL_ERROR</string> 
+            </void> 
            </object> 
           </void> 
           <void property="operatorId"> 
@@ -1058,6 +1076,9 @@
         <void method="add"> 
          <string>CNTR_NAME_GBY_32_TIME_TAKEN</string> 
         </void> 
+        <void method="add"> 
+         <string>CNTR_NAME_GBY_32_FATAL_ERROR</string> 
+        </void> 
        </object> 
       </void> 
       <void property="operatorId"> 

Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby2.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby2.q.xml?rev=896715&r1=896714&r2=896715&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby2.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby2.q.xml Wed Jan  6 23:27:40 2010
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?> 
-<java version="1.6.0_07" class="java.beans.XMLDecoder"> 
+<java version="1.6.0_16" class="java.beans.XMLDecoder"> 
  <object class="org.apache.hadoop.hive.ql.exec.MapRedTask"> 
   <void property="id"> 
    <string>Stage-2</string> 
@@ -62,11 +62,11 @@
          </void> 
          <void method="put"> 
           <string>location</string> 
-          <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string> 
+          <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src</string> 
          </void> 
          <void method="put"> 
           <string>transient_lastDdlTime</string> 
-          <string>1259648283</string> 
+          <string>1262739155</string> 
          </void> 
         </object> 
        </void> 
@@ -302,6 +302,9 @@
                       <void method="add"> 
                        <string>CNTR_NAME_RS_45_TIME_TAKEN</string> 
                       </void> 
+                      <void method="add"> 
+                       <string>CNTR_NAME_RS_45_FATAL_ERROR</string> 
+                      </void> 
                      </object> 
                     </void> 
                     <void property="operatorId"> 
@@ -651,6 +654,9 @@
                   <void method="add"> 
                    <string>CNTR_NAME_GBY_44_TIME_TAKEN</string> 
                   </void> 
+                  <void method="add"> 
+                   <string>CNTR_NAME_GBY_44_FATAL_ERROR</string> 
+                  </void> 
                  </object> 
                 </void> 
                 <void property="operatorId"> 
@@ -773,6 +779,9 @@
               <void method="add"> 
                <string>CNTR_NAME_SEL_43_TIME_TAKEN</string> 
               </void> 
+              <void method="add"> 
+               <string>CNTR_NAME_SEL_43_FATAL_ERROR</string> 
+              </void> 
              </object> 
             </void> 
             <void property="operatorId"> 
@@ -835,6 +844,9 @@
           <void method="add"> 
            <string>CNTR_NAME_TS_42_TIME_TAKEN</string> 
           </void> 
+          <void method="add"> 
+           <string>CNTR_NAME_TS_42_FATAL_ERROR</string> 
+          </void> 
          </object> 
         </void> 
         <void property="neededColumnIDs"> 
@@ -870,7 +882,7 @@
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string> 
+       <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>src</string> 
@@ -882,7 +894,7 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string> 
+       <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src</string> 
        <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
         <void property="deserializerClass"> 
          <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class> 
@@ -938,7 +950,7 @@
               <void property="conf"> 
                <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
                 <void property="dirName"> 
-                 <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/2058936823/10001</string> 
+                 <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1180224763/10001</string> 
                 </void> 
                 <void property="tableInfo"> 
                  <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
@@ -982,6 +994,9 @@
                 <void method="add"> 
                  <string>CNTR_NAME_FS_48_TIME_TAKEN</string> 
                 </void> 
+                <void method="add"> 
+                 <string>CNTR_NAME_FS_48_FATAL_ERROR</string> 
+                </void> 
                </object> 
               </void> 
               <void property="operatorId"> 
@@ -1157,6 +1172,9 @@
             <void method="add"> 
              <string>CNTR_NAME_SEL_47_TIME_TAKEN</string> 
             </void> 
+            <void method="add"> 
+             <string>CNTR_NAME_SEL_47_FATAL_ERROR</string> 
+            </void> 
            </object> 
           </void> 
           <void property="operatorId"> 
@@ -1340,6 +1358,9 @@
         <void method="add"> 
          <string>CNTR_NAME_GBY_46_TIME_TAKEN</string> 
         </void> 
+        <void method="add"> 
+         <string>CNTR_NAME_GBY_46_FATAL_ERROR</string> 
+        </void> 
        </object> 
       </void> 
       <void property="operatorId"> 

Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby3.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby3.q.xml?rev=896715&r1=896714&r2=896715&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby3.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby3.q.xml Wed Jan  6 23:27:40 2010
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?> 
-<java version="1.6.0_07" class="java.beans.XMLDecoder"> 
+<java version="1.6.0_16" class="java.beans.XMLDecoder"> 
  <object class="org.apache.hadoop.hive.ql.exec.MapRedTask"> 
   <void property="id"> 
    <string>Stage-2</string> 
@@ -62,11 +62,11 @@
          </void> 
          <void method="put"> 
           <string>location</string> 
-          <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string> 
+          <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src</string> 
          </void> 
          <void method="put"> 
           <string>transient_lastDdlTime</string> 
-          <string>1259648285</string> 
+          <string>1262739158</string> 
          </void> 
         </object> 
        </void> 
@@ -322,6 +322,9 @@
                       <void method="add"> 
                        <string>CNTR_NAME_RS_59_TIME_TAKEN</string> 
                       </void> 
+                      <void method="add"> 
+                       <string>CNTR_NAME_RS_59_FATAL_ERROR</string> 
+                      </void> 
                      </object> 
                     </void> 
                     <void property="operatorId"> 
@@ -830,6 +833,9 @@
                   <void method="add"> 
                    <string>CNTR_NAME_GBY_58_TIME_TAKEN</string> 
                   </void> 
+                  <void method="add"> 
+                   <string>CNTR_NAME_GBY_58_FATAL_ERROR</string> 
+                  </void> 
                  </object> 
                 </void> 
                 <void property="operatorId"> 
@@ -956,6 +962,9 @@
               <void method="add"> 
                <string>CNTR_NAME_SEL_57_TIME_TAKEN</string> 
               </void> 
+              <void method="add"> 
+               <string>CNTR_NAME_SEL_57_FATAL_ERROR</string> 
+              </void> 
              </object> 
             </void> 
             <void property="operatorId"> 
@@ -1008,6 +1017,9 @@
           <void method="add"> 
            <string>CNTR_NAME_TS_56_TIME_TAKEN</string> 
           </void> 
+          <void method="add"> 
+           <string>CNTR_NAME_TS_56_FATAL_ERROR</string> 
+          </void> 
          </object> 
         </void> 
         <void property="neededColumnIDs"> 
@@ -1054,7 +1066,7 @@
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string> 
+       <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>src</string> 
@@ -1066,7 +1078,7 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string> 
+       <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src</string> 
        <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
         <void property="deserializerClass"> 
          <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class> 
@@ -1122,7 +1134,7 @@
               <void property="conf"> 
                <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
                 <void property="dirName"> 
-                 <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/1909842924/10001</string> 
+                 <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/2120442501/10001</string> 
                 </void> 
                 <void property="tableInfo"> 
                  <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
@@ -1166,6 +1178,9 @@
                 <void method="add"> 
                  <string>CNTR_NAME_FS_62_TIME_TAKEN</string> 
                 </void> 
+                <void method="add"> 
+                 <string>CNTR_NAME_FS_62_FATAL_ERROR</string> 
+                </void> 
                </object> 
               </void> 
               <void property="operatorId"> 
@@ -1367,6 +1382,9 @@
             <void method="add"> 
              <string>CNTR_NAME_SEL_61_TIME_TAKEN</string> 
             </void> 
+            <void method="add"> 
+             <string>CNTR_NAME_SEL_61_FATAL_ERROR</string> 
+            </void> 
            </object> 
           </void> 
           <void property="operatorId"> 
@@ -1647,6 +1665,9 @@
         <void method="add"> 
          <string>CNTR_NAME_GBY_60_TIME_TAKEN</string> 
         </void> 
+        <void method="add"> 
+         <string>CNTR_NAME_GBY_60_FATAL_ERROR</string> 
+        </void> 
        </object> 
       </void> 
       <void property="operatorId"> 

Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby4.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby4.q.xml?rev=896715&r1=896714&r2=896715&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby4.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby4.q.xml Wed Jan  6 23:27:40 2010
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?> 
-<java version="1.6.0_07" class="java.beans.XMLDecoder"> 
+<java version="1.6.0_16" class="java.beans.XMLDecoder"> 
  <object class="org.apache.hadoop.hive.ql.exec.MapRedTask"> 
   <void property="id"> 
    <string>Stage-2</string> 
@@ -62,11 +62,11 @@
          </void> 
          <void method="put"> 
           <string>location</string> 
-          <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string> 
+          <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src</string> 
          </void> 
          <void method="put"> 
           <string>transient_lastDdlTime</string> 
-          <string>1259648288</string> 
+          <string>1262739161</string> 
          </void> 
         </object> 
        </void> 
@@ -236,6 +236,9 @@
                       <void method="add"> 
                        <string>CNTR_NAME_RS_73_TIME_TAKEN</string> 
                       </void> 
+                      <void method="add"> 
+                       <string>CNTR_NAME_RS_73_FATAL_ERROR</string> 
+                      </void> 
                      </object> 
                     </void> 
                     <void property="operatorId"> 
@@ -370,6 +373,9 @@
                   <void method="add"> 
                    <string>CNTR_NAME_GBY_72_TIME_TAKEN</string> 
                   </void> 
+                  <void method="add"> 
+                   <string>CNTR_NAME_GBY_72_FATAL_ERROR</string> 
+                  </void> 
                  </object> 
                 </void> 
                 <void property="operatorId"> 
@@ -446,6 +452,9 @@
               <void method="add"> 
                <string>CNTR_NAME_SEL_71_TIME_TAKEN</string> 
               </void> 
+              <void method="add"> 
+               <string>CNTR_NAME_SEL_71_FATAL_ERROR</string> 
+              </void> 
              </object> 
             </void> 
             <void property="operatorId"> 
@@ -498,6 +507,9 @@
           <void method="add"> 
            <string>CNTR_NAME_TS_70_TIME_TAKEN</string> 
           </void> 
+          <void method="add"> 
+           <string>CNTR_NAME_TS_70_FATAL_ERROR</string> 
+          </void> 
          </object> 
         </void> 
         <void property="neededColumnIDs"> 
@@ -544,7 +556,7 @@
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string> 
+       <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>src</string> 
@@ -556,7 +568,7 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string> 
+       <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src</string> 
        <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
         <void property="deserializerClass"> 
          <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class> 
@@ -612,7 +624,7 @@
               <void property="conf"> 
                <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
                 <void property="dirName"> 
-                 <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/514428882/10001</string> 
+                 <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1023294117/10001</string> 
                 </void> 
                 <void property="tableInfo"> 
                  <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
@@ -656,6 +668,9 @@
                 <void method="add"> 
                  <string>CNTR_NAME_FS_76_TIME_TAKEN</string> 
                 </void> 
+                <void method="add"> 
+                 <string>CNTR_NAME_FS_76_FATAL_ERROR</string> 
+                </void> 
                </object> 
               </void> 
               <void property="operatorId"> 
@@ -737,6 +752,9 @@
             <void method="add"> 
              <string>CNTR_NAME_SEL_75_TIME_TAKEN</string> 
             </void> 
+            <void method="add"> 
+             <string>CNTR_NAME_SEL_75_FATAL_ERROR</string> 
+            </void> 
            </object> 
           </void> 
           <void property="operatorId"> 
@@ -826,6 +844,9 @@
         <void method="add"> 
          <string>CNTR_NAME_GBY_74_TIME_TAKEN</string> 
         </void> 
+        <void method="add"> 
+         <string>CNTR_NAME_GBY_74_FATAL_ERROR</string> 
+        </void> 
        </object> 
       </void> 
       <void property="operatorId"> 

Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby5.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby5.q.xml?rev=896715&r1=896714&r2=896715&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby5.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby5.q.xml Wed Jan  6 23:27:40 2010
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?> 
-<java version="1.6.0_07" class="java.beans.XMLDecoder"> 
+<java version="1.6.0_16" class="java.beans.XMLDecoder"> 
  <object class="org.apache.hadoop.hive.ql.exec.MapRedTask"> 
   <void property="id"> 
    <string>Stage-2</string> 
@@ -62,11 +62,11 @@
          </void> 
          <void method="put"> 
           <string>location</string> 
-          <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string> 
+          <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src</string> 
          </void> 
          <void method="put"> 
           <string>transient_lastDdlTime</string> 
-          <string>1259648290</string> 
+          <string>1262739164</string> 
          </void> 
         </object> 
        </void> 
@@ -258,6 +258,9 @@
                       <void method="add"> 
                        <string>CNTR_NAME_RS_87_TIME_TAKEN</string> 
                       </void> 
+                      <void method="add"> 
+                       <string>CNTR_NAME_RS_87_FATAL_ERROR</string> 
+                      </void> 
                      </object> 
                     </void> 
                     <void property="operatorId"> 
@@ -428,6 +431,9 @@
                   <void method="add"> 
                    <string>CNTR_NAME_GBY_86_TIME_TAKEN</string> 
                   </void> 
+                  <void method="add"> 
+                   <string>CNTR_NAME_GBY_86_FATAL_ERROR</string> 
+                  </void> 
                  </object> 
                 </void> 
                 <void property="operatorId"> 
@@ -530,6 +536,9 @@
               <void method="add"> 
                <string>CNTR_NAME_SEL_85_TIME_TAKEN</string> 
               </void> 
+              <void method="add"> 
+               <string>CNTR_NAME_SEL_85_FATAL_ERROR</string> 
+              </void> 
              </object> 
             </void> 
             <void property="operatorId"> 
@@ -592,6 +601,9 @@
           <void method="add"> 
            <string>CNTR_NAME_TS_84_TIME_TAKEN</string> 
           </void> 
+          <void method="add"> 
+           <string>CNTR_NAME_TS_84_FATAL_ERROR</string> 
+          </void> 
          </object> 
         </void> 
         <void property="neededColumnIDs"> 
@@ -627,7 +639,7 @@
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string> 
+       <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>src</string> 
@@ -639,7 +651,7 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string> 
+       <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src</string> 
        <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
         <void property="deserializerClass"> 
          <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class> 
@@ -695,7 +707,7 @@
               <void property="conf"> 
                <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
                 <void property="dirName"> 
-                 <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/1620104231/10001</string> 
+                 <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/1732269169/10001</string> 
                 </void> 
                 <void property="tableInfo"> 
                  <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
@@ -739,6 +751,9 @@
                 <void method="add"> 
                  <string>CNTR_NAME_FS_90_TIME_TAKEN</string> 
                 </void> 
+                <void method="add"> 
+                 <string>CNTR_NAME_FS_90_FATAL_ERROR</string> 
+                </void> 
                </object> 
               </void> 
               <void property="operatorId"> 
@@ -850,6 +865,9 @@
             <void method="add"> 
              <string>CNTR_NAME_SEL_89_TIME_TAKEN</string> 
             </void> 
+            <void method="add"> 
+             <string>CNTR_NAME_SEL_89_FATAL_ERROR</string> 
+            </void> 
            </object> 
           </void> 
           <void property="operatorId"> 
@@ -985,6 +1003,9 @@
         <void method="add"> 
          <string>CNTR_NAME_GBY_88_TIME_TAKEN</string> 
         </void> 
+        <void method="add"> 
+         <string>CNTR_NAME_GBY_88_FATAL_ERROR</string> 
+        </void> 
        </object> 
       </void> 
       <void property="operatorId"> 

Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby6.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby6.q.xml?rev=896715&r1=896714&r2=896715&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby6.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby6.q.xml Wed Jan  6 23:27:40 2010
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?> 
-<java version="1.6.0_07" class="java.beans.XMLDecoder"> 
+<java version="1.6.0_16" class="java.beans.XMLDecoder"> 
  <object class="org.apache.hadoop.hive.ql.exec.MapRedTask"> 
   <void property="id"> 
    <string>Stage-2</string> 
@@ -62,11 +62,11 @@
          </void> 
          <void method="put"> 
           <string>location</string> 
-          <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string> 
+          <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src</string> 
          </void> 
          <void method="put"> 
           <string>transient_lastDdlTime</string> 
-          <string>1259648292</string> 
+          <string>1262739167</string> 
          </void> 
         </object> 
        </void> 
@@ -236,6 +236,9 @@
                       <void method="add"> 
                        <string>CNTR_NAME_RS_101_TIME_TAKEN</string> 
                       </void> 
+                      <void method="add"> 
+                       <string>CNTR_NAME_RS_101_FATAL_ERROR</string> 
+                      </void> 
                      </object> 
                     </void> 
                     <void property="operatorId"> 
@@ -370,6 +373,9 @@
                   <void method="add"> 
                    <string>CNTR_NAME_GBY_100_TIME_TAKEN</string> 
                   </void> 
+                  <void method="add"> 
+                   <string>CNTR_NAME_GBY_100_FATAL_ERROR</string> 
+                  </void> 
                  </object> 
                 </void> 
                 <void property="operatorId"> 
@@ -446,6 +452,9 @@
               <void method="add"> 
                <string>CNTR_NAME_SEL_99_TIME_TAKEN</string> 
               </void> 
+              <void method="add"> 
+               <string>CNTR_NAME_SEL_99_FATAL_ERROR</string> 
+              </void> 
              </object> 
             </void> 
             <void property="operatorId"> 
@@ -498,6 +507,9 @@
           <void method="add"> 
            <string>CNTR_NAME_TS_98_TIME_TAKEN</string> 
           </void> 
+          <void method="add"> 
+           <string>CNTR_NAME_TS_98_FATAL_ERROR</string> 
+          </void> 
          </object> 
         </void> 
         <void property="neededColumnIDs"> 
@@ -544,7 +556,7 @@
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string> 
+       <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>src</string> 
@@ -556,7 +568,7 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string> 
+       <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src</string> 
        <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
         <void property="deserializerClass"> 
          <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class> 
@@ -612,7 +624,7 @@
               <void property="conf"> 
                <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
                 <void property="dirName"> 
-                 <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/585707865/10001</string> 
+                 <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/323065343/10001</string> 
                 </void> 
                 <void property="tableInfo"> 
                  <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
@@ -656,6 +668,9 @@
                 <void method="add"> 
                  <string>CNTR_NAME_FS_104_TIME_TAKEN</string> 
                 </void> 
+                <void method="add"> 
+                 <string>CNTR_NAME_FS_104_FATAL_ERROR</string> 
+                </void> 
                </object> 
               </void> 
               <void property="operatorId"> 
@@ -737,6 +752,9 @@
             <void method="add"> 
              <string>CNTR_NAME_SEL_103_TIME_TAKEN</string> 
             </void> 
+            <void method="add"> 
+             <string>CNTR_NAME_SEL_103_FATAL_ERROR</string> 
+            </void> 
            </object> 
           </void> 
           <void property="operatorId"> 
@@ -826,6 +844,9 @@
         <void method="add"> 
          <string>CNTR_NAME_GBY_102_TIME_TAKEN</string> 
         </void> 
+        <void method="add"> 
+         <string>CNTR_NAME_GBY_102_FATAL_ERROR</string> 
+        </void> 
        </object> 
       </void> 
       <void property="operatorId"> 

Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/input1.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/input1.q.xml?rev=896715&r1=896714&r2=896715&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/input1.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/input1.q.xml Wed Jan  6 23:27:40 2010
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?> 
-<java version="1.6.0_07" class="java.beans.XMLDecoder"> 
+<java version="1.6.0_16" class="java.beans.XMLDecoder"> 
  <object id="MapRedTask0" class="org.apache.hadoop.hive.ql.exec.MapRedTask"> 
   <void property="childTasks"> 
    <object class="java.util.ArrayList"> 
@@ -30,7 +30,7 @@
                <boolean>true</boolean> 
               </void> 
               <void property="sourceDir"> 
-               <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/1603120055/10000</string> 
+               <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/711146424/10000</string> 
               </void> 
               <void property="table"> 
                <object id="tableDesc0" class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
@@ -83,11 +83,11 @@
                   </void> 
                   <void method="put"> 
                    <string>location</string> 
-                   <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/dest1</string> 
+                   <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest1</string> 
                   </void> 
                   <void method="put"> 
                    <string>transient_lastDdlTime</string> 
-                   <string>1259648295</string> 
+                   <string>1262739171</string> 
                   </void> 
                  </object> 
                 </void> 
@@ -97,7 +97,7 @@
                </object> 
               </void> 
               <void property="tmpDir"> 
-               <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/1603120055/10001</string> 
+               <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/711146424/10001</string> 
               </void> 
              </object> 
             </void> 
@@ -125,10 +125,10 @@
                <boolean>true</boolean> 
               </void> 
               <void property="sourceDir"> 
-               <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/263637718/10002</string> 
+               <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/822015054/10002</string> 
               </void> 
               <void property="targetDir"> 
-               <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/1603120055/10000</string> 
+               <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/711146424/10000</string> 
               </void> 
              </object> 
             </void> 
@@ -146,7 +146,7 @@
             <void property="aliasToWork"> 
              <object class="java.util.LinkedHashMap"> 
               <void method="put"> 
-               <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/263637718/10002</string> 
+               <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/822015054/10002</string> 
                <object id="TableScanOperator0" class="org.apache.hadoop.hive.ql.exec.TableScanOperator"> 
                 <void property="childOperators"> 
                  <object class="java.util.ArrayList"> 
@@ -309,6 +309,9 @@
                       <void method="add"> 
                        <string>CNTR_NAME_RS_118_TIME_TAKEN</string> 
                       </void> 
+                      <void method="add"> 
+                       <string>CNTR_NAME_RS_118_FATAL_ERROR</string> 
+                      </void> 
                      </object> 
                     </void> 
                     <void property="operatorId"> 
@@ -364,6 +367,9 @@
                   <void method="add"> 
                    <string>CNTR_NAME_TS_117_TIME_TAKEN</string> 
                   </void> 
+                  <void method="add"> 
+                   <string>CNTR_NAME_TS_117_FATAL_ERROR</string> 
+                  </void> 
                  </object> 
                 </void> 
                 <void property="operatorId"> 
@@ -385,10 +391,10 @@
             <void property="pathToAliases"> 
              <object class="java.util.LinkedHashMap"> 
               <void method="put"> 
-               <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/263637718/10002</string> 
+               <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/822015054/10002</string> 
                <object class="java.util.ArrayList"> 
                 <void method="add"> 
-                 <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/263637718/10002</string> 
+                 <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/822015054/10002</string> 
                 </void> 
                </object> 
               </void> 
@@ -397,7 +403,7 @@
             <void property="pathToPartitionInfo"> 
              <object class="java.util.LinkedHashMap"> 
               <void method="put"> 
-               <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/263637718/10002</string> 
+               <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/822015054/10002</string> 
                <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
                 <void property="deserializerClass"> 
                  <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class> 
@@ -430,7 +436,7 @@
                   <void property="conf"> 
                    <object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc"> 
                     <void property="dirName"> 
-                     <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/1603120055/10000</string> 
+                     <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/711146424/10000</string> 
                     </void> 
                     <void property="tableInfo"> 
                      <object class="org.apache.hadoop.hive.ql.plan.tableDesc"> 
@@ -479,7 +485,7 @@
                         </void> 
                         <void method="put"> 
                          <string>location</string> 
-                         <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/dest1</string> 
+                         <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/dest1</string> 
                         </void> 
                         <void method="put"> 
                          <string>file.outputformat</string> 
@@ -487,7 +493,7 @@
                         </void> 
                         <void method="put"> 
                          <string>transient_lastDdlTime</string> 
-                         <string>1259648295</string> 
+                         <string>1262739171</string> 
                         </void> 
                        </object> 
                       </void> 
@@ -509,6 +515,9 @@
                     <void method="add"> 
                      <string>CNTR_NAME_FS_120_TIME_TAKEN</string> 
                     </void> 
+                    <void method="add"> 
+                     <string>CNTR_NAME_FS_120_FATAL_ERROR</string> 
+                    </void> 
                    </object> 
                   </void> 
                   <void property="operatorId"> 
@@ -556,6 +565,9 @@
                 <void method="add"> 
                  <string>CNTR_NAME_OP_119_TIME_TAKEN</string> 
                 </void> 
+                <void method="add"> 
+                 <string>CNTR_NAME_OP_119_FATAL_ERROR</string> 
+                </void> 
                </object> 
               </void> 
               <void property="operatorId"> 
@@ -617,7 +629,7 @@
       <void property="resolverCtx"> 
        <object class="org.apache.hadoop.hive.ql.plan.ConditionalResolverMergeFiles$ConditionalResolverMergeFilesCtx"> 
         <void property="dir"> 
-         <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/263637718/10002</string> 
+         <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/822015054/10002</string> 
         </void> 
         <void property="listTasks"> 
          <object idref="ArrayList0"/> 
@@ -703,11 +715,11 @@
          </void> 
          <void method="put"> 
           <string>location</string> 
-          <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string> 
+          <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src</string> 
          </void> 
          <void method="put"> 
           <string>transient_lastDdlTime</string> 
-          <string>1259648295</string> 
+          <string>1262739170</string> 
          </void> 
         </object> 
        </void> 
@@ -763,7 +775,7 @@
                            <int>1</int> 
                           </void> 
                           <void property="dirName"> 
-                           <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/263637718/10002</string> 
+                           <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/tmp/822015054/10002</string> 
                           </void> 
                           <void property="tableInfo"> 
                            <object idref="tableDesc0"/> 
@@ -781,6 +793,9 @@
                           <void method="add"> 
                            <string>CNTR_NAME_FS_115_TIME_TAKEN</string> 
                           </void> 
+                          <void method="add"> 
+                           <string>CNTR_NAME_FS_115_FATAL_ERROR</string> 
+                          </void> 
                          </object> 
                         </void> 
                         <void property="operatorId"> 
@@ -867,6 +882,9 @@
                       <void method="add"> 
                        <string>CNTR_NAME_SEL_114_TIME_TAKEN</string> 
                       </void> 
+                      <void method="add"> 
+                       <string>CNTR_NAME_SEL_114_FATAL_ERROR</string> 
+                      </void> 
                      </object> 
                     </void> 
                     <void property="operatorId"> 
@@ -981,6 +999,9 @@
                   <void method="add"> 
                    <string>CNTR_NAME_FIL_113_TIME_TAKEN</string> 
                   </void> 
+                  <void method="add"> 
+                   <string>CNTR_NAME_FIL_113_FATAL_ERROR</string> 
+                  </void> 
                  </object> 
                 </void> 
                 <void property="operatorId"> 
@@ -1087,6 +1108,9 @@
               <void method="add"> 
                <string>CNTR_NAME_FIL_116_TIME_TAKEN</string> 
               </void> 
+              <void method="add"> 
+               <string>CNTR_NAME_FIL_116_FATAL_ERROR</string> 
+              </void> 
              </object> 
             </void> 
             <void property="operatorId"> 
@@ -1128,6 +1152,9 @@
           <void method="add"> 
            <string>CNTR_NAME_TS_112_TIME_TAKEN</string> 
           </void> 
+          <void method="add"> 
+           <string>CNTR_NAME_TS_112_FATAL_ERROR</string> 
+          </void> 
          </object> 
         </void> 
         <void property="neededColumnIDs"> 
@@ -1157,7 +1184,7 @@
     <void property="pathToAliases"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string> 
+       <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src</string> 
        <object class="java.util.ArrayList"> 
         <void method="add"> 
          <string>src</string> 
@@ -1169,7 +1196,7 @@
     <void property="pathToPartitionInfo"> 
      <object class="java.util.LinkedHashMap"> 
       <void method="put"> 
-       <string>file:/data/users/njain/hive_commit1/hive_commit1/build/ql/test/data/warehouse/src</string> 
+       <string>file:/data/users/nzhang/work/876/apache-hive/build/ql/test/data/warehouse/src</string> 
        <object class="org.apache.hadoop.hive.ql.plan.partitionDesc"> 
         <void property="deserializerClass"> 
          <class>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</class> 



Mime
View raw message