Return-Path: 
 <commits-return-13367-apmail-hive-commits-archive=hive.apache.org@hive.apache.org>
X-Original-To: apmail-hive-commits-archive@www.apache.org
Delivered-To: apmail-hive-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id BCAEB17E16
	for <apmail-hive-commits-archive@www.apache.org>;
 Wed,  8 Apr 2015 00:05:58 +0000 (UTC)
Received: (qmail 49658 invoked by uid 500); 8 Apr 2015 00:05:58 -0000
Delivered-To: apmail-hive-commits-archive@hive.apache.org
Received: (qmail 49428 invoked by uid 500); 8 Apr 2015 00:05:58 -0000
Mailing-List: contact commits-help@hive.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@hive.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@hive.apache.org>
List-Post: <mailto:commits@hive.apache.org>
List-Id: <commits.hive.apache.org>
Reply-To: hive-dev@hive.apache.org
Delivered-To: mailing list commits@hive.apache.org
Received: (qmail 49370 invoked by uid 99); 8 Apr 2015 00:05:58 -0000
Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Apr 2015 00:05:58 +0000
Received: from hades.apache.org (localhost [127.0.0.1])
	by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id
 4401AAC0454
	for <commits@hive.apache.org>; Wed,  8 Apr 2015 00:05:58 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1671979 [3/6] - in /hive/trunk: common/
 common/src/java/org/apache/hadoop/hive/common/jsonexplain/
 common/src/java/org/apache/hadoop/hive/common/jsonexplain/tez/
 common/src/java/org/apache/hadoop/hive/conf/ itests/src/test/resources/
 ql/sr...
Date: Wed, 08 Apr 2015 00:05:56 -0000
To: commits@hive.apache.org
From: hashutosh@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20150408000558.4401AAC0454@hades.apache.org>

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/MapWork.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/MapWork.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/MapWork.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/MapWork.java Wed Apr  8 00:05:54 2015
@@ -40,6 +40,7 @@ import org.apache.hadoop.hive.ql.exec.Op
 import org.apache.hadoop.hive.ql.optimizer.physical.BucketingSortingCtx.BucketCol;
 import org.apache.hadoop.hive.ql.optimizer.physical.BucketingSortingCtx.SortCol;
 import org.apache.hadoop.hive.ql.parse.SplitSample;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
 import org.apache.hadoop.mapred.JobConf;
 
 import com.google.common.collect.Interner;
@@ -134,7 +135,7 @@ public class MapWork extends BaseWork {
     super(name);
   }
 
-  @Explain(displayName = "Path -> Alias", normalExplain = false)
+  @Explain(displayName = "Path -> Alias", explainLevels = { Level.EXTENDED })
   public LinkedHashMap<String, ArrayList<String>> getPathToAliases() {
     return pathToAliases;
   }
@@ -155,7 +156,7 @@ public class MapWork extends BaseWork {
    *
    * @return
    */
-  @Explain(displayName = "Truncated Path -> Alias", normalExplain = false)
+  @Explain(displayName = "Truncated Path -> Alias", explainLevels = { Level.EXTENDED })
   public Map<String, ArrayList<String>> getTruncatedPathToAliases() {
     Map<String, ArrayList<String>> trunPathToAliases = new LinkedHashMap<String,
         ArrayList<String>>();
@@ -170,7 +171,7 @@ public class MapWork extends BaseWork {
     return trunPathToAliases;
   }
 
-  @Explain(displayName = "Path -> Partition", normalExplain = false)
+  @Explain(displayName = "Path -> Partition", explainLevels = { Level.EXTENDED })
   public LinkedHashMap<String, PartitionDesc> getPathToPartitionInfo() {
     return pathToPartitionInfo;
   }
@@ -240,7 +241,7 @@ public class MapWork extends BaseWork {
     this.aliasToWork = aliasToWork;
   }
 
-  @Explain(displayName = "Split Sample", normalExplain = false)
+  @Explain(displayName = "Split Sample", explainLevels = { Level.EXTENDED })
   public HashMap<String, SplitSample> getNameToSplitSample() {
     return nameToSplitSample;
   }
@@ -329,7 +330,7 @@ public class MapWork extends BaseWork {
   }
 
   @Override
-  @Explain(displayName = "Map Operator Tree")
+  @Explain(displayName = "Map Operator Tree", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public Set<Operator<?>> getAllRootOperators() {
     Set<Operator<?>> opSet = new LinkedHashSet<Operator<?>>();
 
@@ -467,12 +468,12 @@ public class MapWork extends BaseWork {
     mapWork.useBucketizedHiveInputFormat |= useBucketizedHiveInputFormat;
   }
 
-  @Explain(displayName = "Path -> Bucketed Columns", normalExplain = false)
+  @Explain(displayName = "Path -> Bucketed Columns", explainLevels = { Level.EXTENDED })
   public Map<String, List<BucketCol>> getBucketedColsByDirectory() {
     return bucketedColsByDirectory;
   }
 
-  @Explain(displayName = "Path -> Sorted Columns", normalExplain = false)
+  @Explain(displayName = "Path -> Sorted Columns", explainLevels = { Level.EXTENDED })
   public Map<String, List<SortCol>> getSortedColsByDirectory() {
     return sortedColsByDirectory;
   }
@@ -493,7 +494,7 @@ public class MapWork extends BaseWork {
     this.samplingType = samplingType;
   }
 
-  @Explain(displayName = "Sampling", normalExplain = false)
+  @Explain(displayName = "Sampling", explainLevels = { Level.EXTENDED })
   public String getSamplingTypeString() {
     return samplingType == 1 ? "SAMPLING_ON_PREV_MR" :
         samplingType == 2 ? "SAMPLING_ON_START" : null;

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/MapredLocalWork.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/MapredLocalWork.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/MapredLocalWork.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/MapredLocalWork.java Wed Apr  8 00:05:54 2015
@@ -31,12 +31,14 @@ import java.util.Set;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hive.ql.exec.MapJoinOperator;
 import org.apache.hadoop.hive.ql.exec.Operator;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
+
 
 /**
  * MapredLocalWork.
  *
  */
-@Explain(displayName = "Map Reduce Local Work")
+@Explain(displayName = "Map Reduce Local Work", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
 public class MapredLocalWork implements Serializable {
   private static final long serialVersionUID = 1L;
 
@@ -83,7 +85,7 @@ public class MapredLocalWork implements
   }
 
 
-  @Explain(displayName = "Alias -> Map Local Operator Tree")
+  @Explain(displayName = "Alias -> Map Local Operator Tree", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public LinkedHashMap<String, Operator<? extends OperatorDesc>> getAliasToWork() {
     return aliasToWork;
   }
@@ -104,7 +106,7 @@ public class MapredLocalWork implements
   /**
    * @return the aliasToFetchWork
    */
-  @Explain(displayName = "Alias -> Map Local Tables")
+  @Explain(displayName = "Alias -> Map Local Tables", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public LinkedHashMap<String, FetchWork> getAliasToFetchWork() {
     return aliasToFetchWork;
   }
@@ -138,7 +140,7 @@ public class MapredLocalWork implements
     }
   }
 
-  @Explain(displayName = "Bucket Mapjoin Context", normalExplain = false)
+  @Explain(displayName = "Bucket Mapjoin Context", explainLevels = { Level.EXTENDED })
   public BucketMapJoinContext getBucketMapjoinContextExplain() {
     return bucketMapjoinContext != null &&
         bucketMapjoinContext.getBucketFileNameMapping() != null ? bucketMapjoinContext : null;

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/MapredWork.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/MapredWork.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/MapredWork.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/MapredWork.java Wed Apr  8 00:05:54 2015
@@ -23,13 +23,15 @@ import java.util.List;
 
 import org.apache.hadoop.hive.ql.exec.Operator;
 import org.apache.hadoop.mapred.JobConf;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
+
 
 
 /**
  * MapredWork.
  *
  */
-@Explain(displayName = "Map Reduce")
+@Explain(displayName = "Map Reduce", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
 public class MapredWork extends AbstractOperatorDesc {
   private static final long serialVersionUID = 1L;
 
@@ -38,7 +40,7 @@ public class MapredWork extends Abstract
 
   private boolean finalMapRed;
 
-  @Explain(skipHeader = true, displayName = "Map")
+  @Explain(skipHeader = true, displayName = "Map", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public MapWork getMapWork() {
     return mapWork;
   }
@@ -47,7 +49,7 @@ public class MapredWork extends Abstract
     this.mapWork = mapWork;
   }
 
-  @Explain(skipHeader = true, displayName = "Reduce")
+  @Explain(skipHeader = true, displayName = "Reduce", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public ReduceWork getReduceWork() {
     return reduceWork;
   }

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/MergeJoinWork.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/MergeJoinWork.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/MergeJoinWork.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/MergeJoinWork.java Wed Apr  8 00:05:54 2015
@@ -28,6 +28,7 @@ import org.apache.hadoop.hive.ql.exec.Co
 import org.apache.hadoop.hive.ql.exec.HashTableDummyOperator;
 import org.apache.hadoop.hive.ql.exec.Operator;
 import org.apache.hadoop.hive.ql.exec.ReduceSinkOperator;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
 import org.apache.hadoop.mapred.JobConf;
 
 public class MergeJoinWork extends BaseWork {
@@ -115,7 +116,7 @@ public class MergeJoinWork extends BaseW
     }
   }
 
-  @Explain(skipHeader = true, displayName = "Join")
+  @Explain(skipHeader=true, displayName = "Join", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public List<BaseWork> getBaseWorkList() {
     return mergeWorkList;
   }
@@ -124,7 +125,7 @@ public class MergeJoinWork extends BaseW
     return ((MapWork) bigTableWork).getAliasToWork().keySet().iterator().next();
   }
 
-  @Explain(skipHeader = true, displayName = "Main")
+  @Explain(skipHeader=true, displayName = "Main", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public BaseWork getMainWork() {
     return bigTableWork;
   }

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/MoveWork.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/MoveWork.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/MoveWork.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/MoveWork.java Wed Apr  8 00:05:54 2015
@@ -25,12 +25,14 @@ import java.util.List;
 import org.apache.hadoop.hive.metastore.api.Partition;
 import org.apache.hadoop.hive.ql.hooks.ReadEntity;
 import org.apache.hadoop.hive.ql.hooks.WriteEntity;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
+
 
 /**
  * MoveWork.
  *
  */
-@Explain(displayName = "Move Operator")
+@Explain(displayName = "Move Operator", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
 public class MoveWork implements Serializable {
   private static final long serialVersionUID = 1L;
   private LoadTableDesc loadTableWork;
@@ -81,7 +83,7 @@ public class MoveWork implements Seriali
     this.checkFileFormat = checkFileFormat;
   }
 
-  @Explain(displayName = "tables")
+  @Explain(displayName = "tables", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public LoadTableDesc getLoadTableWork() {
     return loadTableWork;
   }

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/MuxDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/MuxDesc.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/MuxDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/MuxDesc.java Wed Apr  8 00:05:54 2015
@@ -24,13 +24,15 @@ import java.util.Map;
 
 import org.apache.hadoop.hive.ql.exec.Operator;
 import org.apache.hadoop.hive.ql.exec.ReduceSinkOperator;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
+
 
 
 /**
  * Mux operator descriptor implementation..
  *
  */
-@Explain(displayName = "Mux Operator")
+@Explain(displayName = "Mux Operator", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
 public class MuxDesc extends AbstractOperatorDesc {
   private static final long serialVersionUID = 1L;
 

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/OrcFileMergeDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/OrcFileMergeDesc.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/OrcFileMergeDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/OrcFileMergeDesc.java Wed Apr  8 00:05:54 2015
@@ -18,11 +18,13 @@
 package org.apache.hadoop.hive.ql.plan;
 
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
+
 
 /**
  * ORC fast file merge operator descriptor.
  */
-@Explain(displayName = "ORC File Merge Operator")
+@Explain(displayName = "ORC File Merge Operator", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
 public class OrcFileMergeDesc extends FileMergeDesc {
   
   public OrcFileMergeDesc() {

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PTFDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PTFDesc.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PTFDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PTFDesc.java Wed Apr  8 00:05:54 2015
@@ -32,8 +32,10 @@ import org.apache.hadoop.hive.ql.udf.ptf
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
 
-@Explain(displayName = "PTF Operator")
+
+@Explain(displayName = "PTF Operator", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
 public class PTFDesc extends AbstractOperatorDesc {
   private static final long serialVersionUID = 1L;
   @SuppressWarnings("unused")
@@ -65,7 +67,7 @@ public class PTFDesc extends AbstractOpe
     return funcDef == null ? null : funcDef.getStartOfChain();
   }
 
-  @Explain(displayName = "Function definitions")
+  @Explain(displayName = "Function definitions", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public List<PTFInputDef> getFuncDefExplain() {
     if (funcDef == null) {
       return null;

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PartitionDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PartitionDesc.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PartitionDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PartitionDesc.java Wed Apr  8 00:05:54 2015
@@ -42,12 +42,14 @@ import org.apache.hadoop.mapred.InputFor
 import org.apache.hadoop.mapred.OutputFormat;
 import org.apache.hadoop.util.ReflectionUtils;
 import org.apache.hive.common.util.HiveStringUtils;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
+
 
 /**
  * PartitionDesc.
  *
  */
-@Explain(displayName = "Partition")
+@Explain(displayName = "Partition", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
 public class PartitionDesc implements Serializable, Cloneable {
 
   static {
@@ -94,7 +96,7 @@ public class PartitionDesc implements Se
     setOutputFileFormatClass(part.getOutputFormatClass());
   }
 
-  @Explain(displayName = "")
+  @Explain(displayName = "", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public TableDesc getTableDesc() {
     return tableDesc;
   }
@@ -103,7 +105,7 @@ public class PartitionDesc implements Se
     this.tableDesc = tableDesc;
   }
 
-  @Explain(displayName = "partition values")
+  @Explain(displayName = "partition values", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public LinkedHashMap<String, String> getPartSpec() {
     return partSpec;
   }
@@ -176,7 +178,7 @@ public class PartitionDesc implements Se
     return properties;
   }
 
-  @Explain(displayName = "properties", normalExplain = false)
+  @Explain(displayName = "properties", explainLevels = { Level.EXTENDED })
   public Map getPropertiesExplain() {
     return HiveStringUtils.getPropertiesExplain(getProperties());
   }
@@ -196,27 +198,27 @@ public class PartitionDesc implements Se
   /**
    * @return the serdeClassName
    */
-  @Explain(displayName = "serde")
+  @Explain(displayName = "serde", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public String getSerdeClassName() {
     return getProperties().getProperty(serdeConstants.SERIALIZATION_LIB);
   }
 
-  @Explain(displayName = "name")
+  @Explain(displayName = "name", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public String getTableName() {
     return getProperties().getProperty(hive_metastoreConstants.META_TABLE_NAME);
   }
 
-  @Explain(displayName = "input format")
+  @Explain(displayName = "input format", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public String getInputFileFormatClassName() {
     return getInputFileFormatClass().getName();
   }
 
-  @Explain(displayName = "output format")
+  @Explain(displayName = "output format", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public String getOutputFileFormatClassName() {
     return getOutputFileFormatClass().getName();
   }
 
-  @Explain(displayName = "base file name", normalExplain = false)
+  @Explain(displayName = "base file name", explainLevels = { Level.EXTENDED })
   public String getBaseFileName() {
     return baseFileName;
   }

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PrincipalDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PrincipalDesc.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PrincipalDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PrincipalDesc.java Wed Apr  8 00:05:54 2015
@@ -21,8 +21,10 @@ package org.apache.hadoop.hive.ql.plan;
 import java.io.Serializable;
 
 import org.apache.hadoop.hive.metastore.api.PrincipalType;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
 
-@Explain(displayName = "Principal")
+
+@Explain(displayName = "Principal", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
 public class PrincipalDesc implements Serializable, Cloneable {
 
   private static final long serialVersionUID = 1L;
@@ -41,7 +43,7 @@ public class PrincipalDesc implements Se
     super();
   }
 
-  @Explain(displayName="name")
+  @Explain(displayName="name", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public String getName() {
     return name;
   }
@@ -50,7 +52,7 @@ public class PrincipalDesc implements Se
     this.name = name;
   }
 
-  @Explain(displayName="type", normalExplain = false)
+  @Explain(displayName="type", explainLevels = { Level.EXTENDED })
   public PrincipalType getType() {
     return type;
   }

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PrivilegeDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PrivilegeDesc.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PrivilegeDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PrivilegeDesc.java Wed Apr  8 00:05:54 2015
@@ -22,8 +22,10 @@ import java.io.Serializable;
 import java.util.List;
 
 import org.apache.hadoop.hive.ql.security.authorization.Privilege;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
 
-@Explain(displayName = "Privilege")
+
+@Explain(displayName = "Privilege", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
 public class PrivilegeDesc implements Serializable, Cloneable {
   private static final long serialVersionUID = 1L;
   
@@ -44,7 +46,7 @@ public class PrivilegeDesc implements Se
   /**
    * @return privilege definition
    */
-  @Explain(displayName = "privilege")
+  @Explain(displayName = "privilege", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public Privilege getPrivilege() {
     return privilege;
   }
@@ -59,7 +61,7 @@ public class PrivilegeDesc implements Se
   /**
    * @return columns on which the given privilege take affect.
    */
-  @Explain(displayName = "columns")
+  @Explain(displayName = "columns", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public List<String> getColumns() {
     return columns;
   }

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PrivilegeObjectDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PrivilegeObjectDesc.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PrivilegeObjectDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PrivilegeObjectDesc.java Wed Apr  8 00:05:54 2015
@@ -20,8 +20,10 @@ package org.apache.hadoop.hive.ql.plan;
 
 import java.util.HashMap;
 import java.util.List;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
 
-@Explain(displayName="privilege subject")
+
+@Explain(displayName="privilege subject", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
 public class PrivilegeObjectDesc {
 
   //default type is table
@@ -53,7 +55,7 @@ public class PrivilegeObjectDesc {
     this.table = isTable;
   }
 
-  @Explain(displayName="object")
+  @Explain(displayName="object", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public String getObject() {
     return object;
   }
@@ -62,7 +64,7 @@ public class PrivilegeObjectDesc {
     this.object = object;
   }
 
-  @Explain(displayName="partition spec")
+  @Explain(displayName="partition spec", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public HashMap<String, String> getPartSpec() {
     return partSpec;
   }

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/RCFileMergeDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/RCFileMergeDesc.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/RCFileMergeDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/RCFileMergeDesc.java Wed Apr  8 00:05:54 2015
@@ -18,11 +18,13 @@
 package org.apache.hadoop.hive.ql.plan;
 
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
+
 
 /**
  * Descriptor for Fast file merge RC file operator.
  */
-@Explain(displayName = "RCFile Merge Operator")
+@Explain(displayName = "RCFile Merge Operator", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
 public class RCFileMergeDesc extends FileMergeDesc {
 
   public RCFileMergeDesc() {

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ReduceSinkDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ReduceSinkDesc.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ReduceSinkDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ReduceSinkDesc.java Wed Apr  8 00:05:54 2015
@@ -21,17 +21,20 @@ package org.apache.hadoop.hive.ql.plan;
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
+import java.util.Map.Entry;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.hive.ql.io.AcidUtils;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
+
 
 
 /**
  * ReduceSinkDesc.
  *
  */
-@Explain(displayName = "Reduce Output Operator")
+@Explain(displayName = "Reduce Output Operator", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
 public class ReduceSinkDesc extends AbstractOperatorDesc {
   private static final long serialVersionUID = 1L;
   /**
@@ -190,7 +193,7 @@ public class ReduceSinkDesc extends Abst
     this.outputValueColumnNames = outputValueColumnNames;
   }
 
-  @Explain(displayName = "key expressions")
+  @Explain(displayName = "key expressions", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public String getKeyColString() {
     return PlanUtils.getExprListString(keyCols);
   }
@@ -211,7 +214,7 @@ public class ReduceSinkDesc extends Abst
     this.numDistributionKeys = numKeys;
   }
 
-  @Explain(displayName = "value expressions")
+  @Explain(displayName = "value expressions", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public String getValueColsString() {
     return PlanUtils.getExprListString(valueCols);
   }
@@ -224,7 +227,7 @@ public class ReduceSinkDesc extends Abst
     this.valueCols = valueCols;
   }
 
-  @Explain(displayName = "Map-reduce partition columns")
+  @Explain(displayName = "Map-reduce partition columns", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public String getParitionColsString() {
     return PlanUtils.getExprListString(partitionCols);
   }
@@ -245,7 +248,7 @@ public class ReduceSinkDesc extends Abst
     return false;
   }
 
-  @Explain(displayName = "tag", normalExplain = false)
+  @Explain(displayName = "tag", explainLevels = { Level.EXTENDED })
   public int getTag() {
     return tag;
   }
@@ -262,7 +265,7 @@ public class ReduceSinkDesc extends Abst
     this.topN = topN;
   }
 
-  @Explain(displayName = "TopN", normalExplain = false)
+  @Explain(displayName = "TopN", explainLevels = { Level.EXTENDED })
   public Integer getTopNExplain() {
     return topN > 0 ? topN : null;
   }
@@ -333,7 +336,7 @@ public class ReduceSinkDesc extends Abst
    *         of the same length as key columns, that consists of only "+"
    *         (ascending order) and "-" (descending order).
    */
-  @Explain(displayName = "sort order")
+  @Explain(displayName = "sort order", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public String getOrder() {
     return keySerializeInfo.getProperties().getProperty(
         org.apache.hadoop.hive.serde.serdeConstants.SERIALIZATION_SORT_ORDER);
@@ -361,6 +364,7 @@ public class ReduceSinkDesc extends Abst
     this.distinctColumnIndices = distinctColumnIndices;
   }
 
+  @Explain(displayName = "outputname", explainLevels = { Level.USER })
   public String getOutputName() {
     return outputName;
   }
@@ -393,7 +397,7 @@ public class ReduceSinkDesc extends Abst
     return skipTag;
   }
 
-  @Explain(displayName = "auto parallelism", normalExplain = false)
+  @Explain(displayName = "auto parallelism", explainLevels = { Level.EXTENDED })
   public final boolean isAutoParallel() {
     return (this.reduceTraits.contains(ReducerTraits.AUTOPARALLEL));
   }

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ReduceWork.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ReduceWork.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ReduceWork.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ReduceWork.java Wed Apr  8 00:05:54 2015
@@ -24,6 +24,7 @@ import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 
 import org.apache.commons.logging.Log;
@@ -32,6 +33,7 @@ import org.apache.hadoop.hive.ql.exec.Fi
 import org.apache.hadoop.hive.ql.exec.Operator;
 import org.apache.hadoop.hive.ql.exec.OperatorUtils;
 import org.apache.hadoop.hive.ql.exec.Utilities;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
 import org.apache.hadoop.hive.serde2.Deserializer;
 import org.apache.hadoop.hive.serde2.SerDeUtils;
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
@@ -153,7 +155,7 @@ public class ReduceWork extends BaseWork
     return vectorMode ? "vectorized" : null;
   }
 
-  @Explain(displayName = "Reduce Operator Tree")
+  @Explain(displayName = "Reduce Operator Tree", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public Operator<?> getReducer() {
     return reducer;
   }
@@ -162,7 +164,7 @@ public class ReduceWork extends BaseWork
     this.reducer = reducer;
   }
 
-  @Explain(displayName = "Needs Tagging", normalExplain = false)
+  @Explain(displayName = "Needs Tagging", explainLevels = { Level.EXTENDED })
   public boolean getNeedsTagging() {
     return needsTagging;
   }

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/RevokeDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/RevokeDesc.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/RevokeDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/RevokeDesc.java Wed Apr  8 00:05:54 2015
@@ -20,8 +20,10 @@ package org.apache.hadoop.hive.ql.plan;
 
 import java.io.Serializable;
 import java.util.List;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
 
-@Explain(displayName="Revoke")
+
+@Explain(displayName="Revoke", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
 public class RevokeDesc extends DDLDesc implements Serializable, Cloneable {
 
   private static final long serialVersionUID = 1L;

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/RoleDDLDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/RoleDDLDesc.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/RoleDDLDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/RoleDDLDesc.java Wed Apr  8 00:05:54 2015
@@ -21,8 +21,10 @@ package org.apache.hadoop.hive.ql.plan;
 import java.io.Serializable;
 
 import org.apache.hadoop.hive.metastore.api.PrincipalType;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
 
-@Explain(displayName = "Create Role")
+
+@Explain(displayName = "Create Role", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
 public class RoleDDLDesc extends DDLDesc implements Serializable {
 
   private static final long serialVersionUID = 1L;
@@ -108,12 +110,12 @@ public class RoleDDLDesc extends DDLDesc
     this.roleOwnerName = roleOwnerName;
   }
 
-  @Explain(displayName = "name")
+  @Explain(displayName = "name", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public String getName() {
     return name;
   }
 
-  @Explain(displayName = "role operation")
+  @Explain(displayName = "role operation", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public RoleOperation getOperation() {
     return operation;
   }

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/SMBJoinDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/SMBJoinDesc.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/SMBJoinDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/SMBJoinDesc.java Wed Apr  8 00:05:54 2015
@@ -23,8 +23,10 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.hadoop.hive.ql.exec.DummyStoreOperator;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
 
-@Explain(displayName = "Sorted Merge Bucket Map Join Operator")
+
+@Explain(displayName = "Sorted Merge Bucket Map Join Operator", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
 public class SMBJoinDesc extends MapJoinDesc implements Serializable {
 
   private static final long serialVersionUID = 1L;

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ScriptDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ScriptDesc.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ScriptDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ScriptDesc.java Wed Apr  8 00:05:54 2015
@@ -20,12 +20,14 @@ package org.apache.hadoop.hive.ql.plan;
 
 import org.apache.hadoop.hive.ql.exec.RecordReader;
 import org.apache.hadoop.hive.ql.exec.RecordWriter;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
+
 
 /**
  * ScriptDesc.
  *
  */
-@Explain(displayName = "Transform Operator")
+@Explain(displayName = "Transform Operator", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
 public class ScriptDesc extends AbstractOperatorDesc {
   private static final long serialVersionUID = 1L;
   private String scriptCmd;
@@ -59,7 +61,7 @@ public class ScriptDesc extends Abstract
     this.scriptErrInfo = scriptErrInfo;
   }
 
-  @Explain(displayName = "command")
+  @Explain(displayName = "command", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public String getScriptCmd() {
     return scriptCmd;
   }
@@ -68,7 +70,7 @@ public class ScriptDesc extends Abstract
     this.scriptCmd = scriptCmd;
   }
 
-  @Explain(displayName = "output info")
+  @Explain(displayName = "output info", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public TableDesc getScriptOutputInfo() {
     return scriptOutputInfo;
   }

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/SelectDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/SelectDesc.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/SelectDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/SelectDesc.java Wed Apr  8 00:05:54 2015
@@ -20,13 +20,14 @@ package org.apache.hadoop.hive.ql.plan;
 
 import java.util.ArrayList;
 import java.util.List;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
 
 
 /**
  * SelectDesc.
  *
  */
-@Explain(displayName = "Select Operator")
+@Explain(displayName = "Select Operator", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
 public class SelectDesc extends AbstractOperatorDesc {
   private static final long serialVersionUID = 1L;
   private List<org.apache.hadoop.hive.ql.plan.ExprNodeDesc> colList;
@@ -81,7 +82,7 @@ public class SelectDesc extends Abstract
     this.colList = colList;
   }
 
-  @Explain(displayName = "outputColumnNames")
+  @Explain(displayName = "outputColumnNames", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public List<java.lang.String> getOutputColumnNames() {
     return outputColumnNames;
   }

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowColumnsDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowColumnsDesc.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowColumnsDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowColumnsDesc.java Wed Apr  8 00:05:54 2015
@@ -20,6 +20,7 @@ package org.apache.hadoop.hive.ql.plan;
 import java.io.Serializable;
 
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
 
 public class ShowColumnsDesc extends DDLDesc implements Serializable {
   private static final long serialVersionUID = 1L;
@@ -64,7 +65,7 @@ public class ShowColumnsDesc extends DDL
   /**
    * @return the tableName
    */
-  @Explain(displayName = "table name")
+  @Explain(displayName = "table name", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public String getTableName() {
     return tableName;
   }
@@ -80,7 +81,7 @@ public class ShowColumnsDesc extends DDL
   /**
    * @return the resFile
    */
-  @Explain(displayName = "result file", normalExplain = false)
+  @Explain(displayName = "result file", explainLevels = { Level.EXTENDED })
   public String getResFile() {
     return resFile;
   }

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowConfDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowConfDesc.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowConfDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowConfDesc.java Wed Apr  8 00:05:54 2015
@@ -18,6 +18,7 @@
 package org.apache.hadoop.hive.ql.plan;
 
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
 
 import java.io.Serializable;
 
@@ -41,7 +42,7 @@ public class ShowConfDesc extends DDLDes
     this.confName = confName;
   }
 
-  @Explain(displayName = "result file", normalExplain = false)
+  @Explain(displayName = "result file", explainLevels = { Level.EXTENDED })
   public Path getResFile() {
     return resFile;
   }
@@ -50,7 +51,7 @@ public class ShowConfDesc extends DDLDes
     this.resFile = resFile;
   }
 
-  @Explain(displayName = "conf name", normalExplain = false)
+  @Explain(displayName = "conf name", explainLevels = { Level.EXTENDED })
   public String getConfName() {
     return confName;
   }

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowCreateTableDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowCreateTableDesc.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowCreateTableDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowCreateTableDesc.java Wed Apr  8 00:05:54 2015
@@ -19,12 +19,14 @@
 package org.apache.hadoop.hive.ql.plan;
 
 import java.io.Serializable;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
+
 
 /**
  * ShowCreateTableDesc.
  *
  */
-@Explain(displayName = "Show Create Table")
+@Explain(displayName = "Show Create Table", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
 public class ShowCreateTableDesc extends DDLDesc implements Serializable {
   private static final long serialVersionUID = 1L;
   String resFile;
@@ -66,7 +68,7 @@ public class ShowCreateTableDesc extends
   /**
    * @return the resFile
    */
-  @Explain(displayName = "result file", normalExplain = false)
+  @Explain(displayName = "result file", explainLevels = { Level.EXTENDED })
   public String getResFile() {
     return resFile;
   }
@@ -82,7 +84,7 @@ public class ShowCreateTableDesc extends
   /**
    * @return the tableName
    */
-  @Explain(displayName = "table name")
+  @Explain(displayName = "table name", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public String getTableName() {
     return tableName;
   }

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowDatabasesDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowDatabasesDesc.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowDatabasesDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowDatabasesDesc.java Wed Apr  8 00:05:54 2015
@@ -21,12 +21,14 @@ package org.apache.hadoop.hive.ql.plan;
 import java.io.Serializable;
 
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
+
 
 /**
  * ShowDatabasesDesc.
  *
  */
-@Explain(displayName = "Show Databases")
+@Explain(displayName = "Show Databases", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
 public class ShowDatabasesDesc extends DDLDesc implements Serializable {
   private static final long serialVersionUID = 1L;
   String pattern;
@@ -89,7 +91,7 @@ public class ShowDatabasesDesc extends D
   /**
    * @return the resFile
    */
-  @Explain(displayName = "result file", normalExplain = false)
+  @Explain(displayName = "result file", explainLevels = { Level.EXTENDED })
   public String getResFile() {
     return resFile;
   }

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowFunctionsDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowFunctionsDesc.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowFunctionsDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowFunctionsDesc.java Wed Apr  8 00:05:54 2015
@@ -21,12 +21,14 @@ package org.apache.hadoop.hive.ql.plan;
 import java.io.Serializable;
 
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
+
 
 /**
  * ShowFunctionsDesc.
  *
  */
-@Explain(displayName = "Show Functions")
+@Explain(displayName = "Show Functions", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
 public class ShowFunctionsDesc extends DDLDesc implements Serializable {
   private static final long serialVersionUID = 1L;
   String pattern;
@@ -103,7 +105,7 @@ public class ShowFunctionsDesc extends D
   /**
    * @return the resFile
    */
-  @Explain(displayName = "result file", normalExplain = false)
+  @Explain(displayName = "result file", explainLevels = { Level.EXTENDED })
   public String getResFile() {
     return resFile;
   }

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowGrantDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowGrantDesc.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowGrantDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowGrantDesc.java Wed Apr  8 00:05:54 2015
@@ -16,8 +16,10 @@
  * limitations under the License.
  */
 package org.apache.hadoop.hive.ql.plan;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
 
-@Explain(displayName="show grant desc")
+
+@Explain(displayName="show grant desc", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
 public class ShowGrantDesc {
   
   private PrincipalDesc principalDesc;
@@ -48,7 +50,7 @@ public class ShowGrantDesc {
     return tabularSchema;
   }
 
-  @Explain(displayName="principal desc")
+  @Explain(displayName="principal desc", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public PrincipalDesc getPrincipalDesc() {
     return principalDesc;
   }
@@ -57,7 +59,7 @@ public class ShowGrantDesc {
     this.principalDesc = principalDesc;
   }
 
-  @Explain(displayName="object")
+  @Explain(displayName="object", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public PrivilegeObjectDesc getHiveObj() {
     return hiveObj;
   }

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowIndexesDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowIndexesDesc.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowIndexesDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowIndexesDesc.java Wed Apr  8 00:05:54 2015
@@ -21,12 +21,14 @@ package org.apache.hadoop.hive.ql.plan;
 import java.io.Serializable;
 
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
+
 
 /**
  * ShowIndexesDesc.
  * Returns table index information per SQL syntax.
  */
-@Explain(displayName = "Show Indexes")
+@Explain(displayName = "Show Indexes", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
 public class ShowIndexesDesc extends DDLDesc implements Serializable {
   private static final long serialVersionUID = 1L;
   String tableName;

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowLocksDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowLocksDesc.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowLocksDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowLocksDesc.java Wed Apr  8 00:05:54 2015
@@ -23,12 +23,14 @@ import java.util.HashMap;
 
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
+
 
 /**
  * ShowLocksDesc.
  *
  */
-@Explain(displayName = "Show Locks")
+@Explain(displayName = "Show Locks", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
 public class ShowLocksDesc extends DDLDesc implements Serializable {
   private static final long serialVersionUID = 1L;
   String resFile;
@@ -105,7 +107,7 @@ public class ShowLocksDesc extends DDLDe
   /**
    * @return the tableName
    */
-  @Explain(displayName = "table")
+  @Explain(displayName = "table", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public String getTableName() {
     return tableName;
   }
@@ -121,7 +123,7 @@ public class ShowLocksDesc extends DDLDe
   /**
    * @return the partSpec
    */
-  @Explain(displayName = "partition")
+  @Explain(displayName = "partition", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public HashMap<String, String> getPartSpec() {
     return partSpec;
   }
@@ -137,7 +139,7 @@ public class ShowLocksDesc extends DDLDe
   /**
    * @return the resFile
    */
-  @Explain(displayName = "result file", normalExplain = false)
+  @Explain(displayName = "result file", explainLevels = { Level.EXTENDED })
   public String getResFile() {
     return resFile;
   }

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowPartitionsDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowPartitionsDesc.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowPartitionsDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowPartitionsDesc.java Wed Apr  8 00:05:54 2015
@@ -22,12 +22,14 @@ import java.io.Serializable;
 import java.util.Map;
 
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
+
 
 /**
  * ShowPartitionsDesc.
  *
  */
-@Explain(displayName = "Show Partitions")
+@Explain(displayName = "Show Partitions", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
 public class ShowPartitionsDesc extends DDLDesc implements Serializable {
   private static final long serialVersionUID = 1L;
   String tabName;
@@ -71,7 +73,7 @@ public class ShowPartitionsDesc extends
   /**
    * @return the name of the table.
    */
-  @Explain(displayName = "table")
+  @Explain(displayName = "table", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public String getTabName() {
     return tabName;
   }
@@ -87,7 +89,7 @@ public class ShowPartitionsDesc extends
   /**
    * @return the name of the table.
    */
-  @Explain(displayName = "partSpec")
+  @Explain(displayName = "partSpec", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public Map<String, String> getPartSpec() {
     return partSpec;
   }
@@ -102,7 +104,7 @@ public class ShowPartitionsDesc extends
   /**
    * @return the results file
    */
-  @Explain(displayName = "result file", normalExplain = false)
+  @Explain(displayName = "result file", explainLevels = { Level.EXTENDED })
   public String getResFile() {
     return resFile;
   }

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowTableStatusDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowTableStatusDesc.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowTableStatusDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowTableStatusDesc.java Wed Apr  8 00:05:54 2015
@@ -22,12 +22,14 @@ import java.io.Serializable;
 import java.util.HashMap;
 
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
+
 
 /**
  * ShowTableStatusDesc.
  *
  */
-@Explain(displayName = "Show Table Status")
+@Explain(displayName = "Show Table Status", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
 public class ShowTableStatusDesc extends DDLDesc implements Serializable {
   private static final long serialVersionUID = 1L;
   String pattern;
@@ -108,7 +110,7 @@ public class ShowTableStatusDesc extends
     return resFile;
   }
 
-  @Explain(displayName = "result file", normalExplain = false)
+  @Explain(displayName = "result file", explainLevels = { Level.EXTENDED })
   public String getResFileString() {
     return getResFile();
   }
@@ -124,7 +126,7 @@ public class ShowTableStatusDesc extends
   /**
    * @return the database name
    */
-  @Explain(displayName = "database")
+  @Explain(displayName = "database", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public String getDbName() {
     return dbName;
   }
@@ -140,7 +142,7 @@ public class ShowTableStatusDesc extends
   /**
    * @return the partSpec
    */
-  @Explain(displayName = "partition")
+  @Explain(displayName = "partition", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public HashMap<String, String> getPartSpec() {
     return partSpec;
   }

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowTablesDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowTablesDesc.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowTablesDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowTablesDesc.java Wed Apr  8 00:05:54 2015
@@ -21,12 +21,14 @@ package org.apache.hadoop.hive.ql.plan;
 import java.io.Serializable;
 
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
+
 
 /**
  * ShowTablesDesc.
  *
  */
-@Explain(displayName = "Show Tables")
+@Explain(displayName = "Show Tables", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
 public class ShowTablesDesc extends DDLDesc implements Serializable {
   private static final long serialVersionUID = 1L;
   String pattern;
@@ -98,7 +100,7 @@ public class ShowTablesDesc extends DDLD
   /**
    * @return the resFile
    */
-  @Explain(displayName = "result file", normalExplain = false)
+  @Explain(displayName = "result file", explainLevels = { Level.EXTENDED })
   public String getResFile() {
     return resFile;
   }
@@ -114,7 +116,7 @@ public class ShowTablesDesc extends DDLD
   /**
    * @return the dbName
    */
-  @Explain(displayName = "database name")
+  @Explain(displayName = "database name", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public String getDbName() {
     return dbName;
   }

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowTblPropertiesDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowTblPropertiesDesc.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowTblPropertiesDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowTblPropertiesDesc.java Wed Apr  8 00:05:54 2015
@@ -22,12 +22,14 @@ import java.io.Serializable;
 import java.util.HashMap;
 
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
+
 
 /**
  * ShowTblPropertiesDesc.
  *
  */
-@Explain(displayName = "Show Table Properties")
+@Explain(displayName = "Show Table Properties", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
 public class ShowTblPropertiesDesc extends DDLDesc implements Serializable {
   private static final long serialVersionUID = 1L;
   String resFile;
@@ -77,7 +79,7 @@ public class ShowTblPropertiesDesc exten
     return resFile;
   }
 
-  @Explain(displayName = "result file", normalExplain = false)
+  @Explain(displayName = "result file", explainLevels = { Level.EXTENDED })
   public String getResFileString() {
     return getResFile();
   }
@@ -93,7 +95,7 @@ public class ShowTblPropertiesDesc exten
   /**
    * @return the tableName
    */
-  @Explain(displayName = "table name")
+  @Explain(displayName = "table name", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public String getTableName() {
     return tableName;
   }

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/Statistics.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/Statistics.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/Statistics.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/Statistics.java Wed Apr  8 00:05:54 2015
@@ -22,6 +22,7 @@ import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
 import org.apache.hadoop.hive.ql.stats.StatsUtils;
 
 import com.google.common.collect.Lists;
@@ -101,7 +102,7 @@ public class Statistics implements Seria
   }
 
   @Override
-  @Explain(displayName = "Statistics")
+  @Explain(displayName = "Statistics", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("Num rows: ");

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/StatsNoJobWork.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/StatsNoJobWork.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/StatsNoJobWork.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/StatsNoJobWork.java Wed Apr  8 00:05:54 2015
@@ -22,12 +22,14 @@ import java.io.Serializable;
 
 import org.apache.hadoop.hive.ql.parse.BaseSemanticAnalyzer.TableSpec;
 import org.apache.hadoop.hive.ql.parse.PrunedPartitionList;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
+
 
 
 /**
  * Client-side stats aggregator task.
  */
-@Explain(displayName = "Stats-Aggr Operator")
+@Explain(displayName = "Stats-Aggr Operator", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
 public class StatsNoJobWork implements Serializable {
   private static final long serialVersionUID = 1L;
 

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/StatsWork.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/StatsWork.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/StatsWork.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/StatsWork.java Wed Apr  8 00:05:54 2015
@@ -22,12 +22,14 @@ import java.io.Serializable;
 
 import org.apache.hadoop.hive.ql.exec.Task;
 import org.apache.hadoop.hive.ql.parse.BaseSemanticAnalyzer.TableSpec;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
+
 
 /**
  * ConditionalStats.
  *
  */
-@Explain(displayName = "Stats-Aggr Operator")
+@Explain(displayName = "Stats-Aggr Operator", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
 public class StatsWork implements Serializable {
   private static final long serialVersionUID = 1L;
 
@@ -90,7 +92,7 @@ public class StatsWork implements Serial
     aggKey = aggK;
   }
 
-  @Explain(displayName = "Stats Aggregation Key Prefix", normalExplain = false)
+  @Explain(displayName = "Stats Aggregation Key Prefix", explainLevels = { Level.EXTENDED })
   public String getAggKey() {
     return aggKey;
   }

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/SwitchDatabaseDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/SwitchDatabaseDesc.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/SwitchDatabaseDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/SwitchDatabaseDesc.java Wed Apr  8 00:05:54 2015
@@ -19,12 +19,14 @@
 package org.apache.hadoop.hive.ql.plan;
 
 import java.io.Serializable;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
+
 
 /**
  * SwitchDatabaseDesc.
  *
  */
-@Explain(displayName = "Switch Database")
+@Explain(displayName = "Switch Database", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
 public class SwitchDatabaseDesc extends DDLDesc implements Serializable {
 
   private static final long serialVersionUID = 1L;
@@ -39,7 +41,7 @@ public class SwitchDatabaseDesc extends
     this.databaseName = databaseName;
   }
 
-  @Explain(displayName = "name")
+  @Explain(displayName = "name", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public String getDatabaseName() {
     return databaseName;
   }

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/TableDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/TableDesc.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/TableDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/TableDesc.java Wed Apr  8 00:05:54 2015
@@ -28,6 +28,7 @@ import org.apache.hadoop.conf.Configurat
 import org.apache.hadoop.hive.metastore.api.hive_metastoreConstants;
 import org.apache.hadoop.hive.ql.exec.Utilities;
 import org.apache.hadoop.hive.ql.io.HiveFileFormatUtils;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
 import org.apache.hadoop.hive.serde.serdeConstants;
 import org.apache.hadoop.hive.serde2.Deserializer;
 import org.apache.hadoop.hive.serde2.SerDeUtils;
@@ -117,7 +118,7 @@ public class TableDesc implements Serial
     return properties;
   }
 
-  @Explain(displayName = "properties", normalExplain = false)
+  @Explain(displayName = "properties", explainLevels = { Level.EXTENDED })
   public Map getPropertiesExplain() {
     return HiveStringUtils.getPropertiesExplain(getProperties());
   }
@@ -130,7 +131,7 @@ public class TableDesc implements Serial
     this.jobProperties = jobProperties;
   }
 
-  @Explain(displayName = "jobProperties", normalExplain = false)
+  @Explain(displayName = "jobProperties", explainLevels = { Level.EXTENDED })
   public Map<String, String> getJobProperties() {
     return jobProperties;
   }
@@ -138,23 +139,23 @@ public class TableDesc implements Serial
   /**
    * @return the serdeClassName
    */
-  @Explain(displayName = "serde")
+  @Explain(displayName = "serde", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public String getSerdeClassName() {
     return properties.getProperty(serdeConstants.SERIALIZATION_LIB);
   }
 
-  @Explain(displayName = "name")
+  @Explain(displayName = "name", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public String getTableName() {
     return properties
         .getProperty(hive_metastoreConstants.META_TABLE_NAME);
   }
 
-  @Explain(displayName = "input format")
+  @Explain(displayName = "input format", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public String getInputFileFormatClassName() {
     return getInputFileFormatClass().getName();
   }
 
-  @Explain(displayName = "output format")
+  @Explain(displayName = "output format", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public String getOutputFileFormatClassName() {
     return getOutputFileFormatClass().getName();
   }

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/TableScanDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/TableScanDesc.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/TableScanDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/TableScanDesc.java Wed Apr  8 00:05:54 2015
@@ -27,13 +27,15 @@ import org.apache.hadoop.hive.ql.exec.PT
 import org.apache.hadoop.hive.ql.metadata.Table;
 import org.apache.hadoop.hive.ql.metadata.VirtualColumn;
 import org.apache.hadoop.hive.ql.parse.TableSample;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
+
 
 /**
  * Table Scan Descriptor Currently, data is only read from a base source as part
  * of map-reduce framework. So, nothing is stored in the descriptor. But, more
  * things will be added here as table scan is invoked as part of local work.
  **/
-@Explain(displayName = "TableScan")
+@Explain(displayName = "TableScan", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
 public class TableScanDesc extends AbstractOperatorDesc {
   private static final long serialVersionUID = 1L;
 
@@ -125,7 +127,7 @@ public class TableScanDesc extends Abstr
     return new TableScanDesc(getAlias(), vcs, this.tableMetadata);
   }
 
-  @Explain(displayName = "alias")
+  @Explain(displayName = "alias", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public String getAlias() {
     return alias;
   }
@@ -193,7 +195,7 @@ public class TableScanDesc extends Abstr
     this.gatherStats = gatherStats;
   }
 
-  @Explain(displayName = "GatherStats", normalExplain = false)
+  @Explain(displayName = "GatherStats", explainLevels = { Level.EXTENDED })
   public boolean isGatherStats() {
     return gatherStats;
   }
@@ -218,7 +220,7 @@ public class TableScanDesc extends Abstr
     statsAggKeyPrefix = k;
   }
 
-  @Explain(displayName = "Statistics Aggregation Key Prefix", normalExplain = false)
+  @Explain(displayName = "Statistics Aggregation Key Prefix", explainLevels = { Level.EXTENDED })
   public String getStatsAggPrefix() {
     return statsAggKeyPrefix;
   }

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/TezWork.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/TezWork.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/TezWork.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/TezWork.java Wed Apr  8 00:05:54 2015
@@ -36,6 +36,8 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.hive.ql.plan.TezEdgeProperty.EdgeType;
 import org.apache.hadoop.mapred.JobConf;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
+
 
 /**
  * TezWork. This class encapsulates all the work objects that can be executed
@@ -44,7 +46,7 @@ import org.apache.hadoop.mapred.JobConf;
  *
  */
 @SuppressWarnings("serial")
-@Explain(displayName = "Tez")
+@Explain(displayName = "Tez", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
 public class TezWork extends AbstractOperatorDesc {
 
   public enum VertexType {
@@ -87,7 +89,7 @@ public class TezWork extends AbstractOpe
   /**
    * getWorkMap returns a map of "vertex name" to BaseWork
    */
-  @Explain(displayName = "Vertices")
+  @Explain(displayName = "Vertices", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public Map<String, BaseWork> getWorkMap() {
     Map<String, BaseWork> result = new LinkedHashMap<String, BaseWork>();
     for (BaseWork w: getAllWork()) {
@@ -286,7 +288,7 @@ public class TezWork extends AbstractOpe
     }
   }
 
-  @Explain(displayName = "Edges")
+  @Explain(displayName = "Edges", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public Map<String, List<Dependency>> getDependencyMap() {
     Map<String, List<Dependency>> result = new LinkedHashMap<String, List<Dependency>>();
     for (Map.Entry<BaseWork, List<BaseWork>> entry: invertedWorkGraph.entrySet()) {

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/TruncateTableDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/TruncateTableDesc.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/TruncateTableDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/TruncateTableDesc.java Wed Apr  8 00:05:54 2015
@@ -22,11 +22,13 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
+
 
 /**
  * Truncates managed table or partition
  */
-@Explain(displayName = "Truncate Table or Partition")
+@Explain(displayName = "Truncate Table or Partition", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
 public class TruncateTableDesc extends DDLDesc {
 
   private static final long serialVersionUID = 1L;
@@ -46,7 +48,7 @@ public class TruncateTableDesc extends D
     this.partSpec = partSpec;
   }
 
-  @Explain(displayName = "TableName")
+  @Explain(displayName = "TableName", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public String getTableName() {
     return tableName;
   }
@@ -55,7 +57,7 @@ public class TruncateTableDesc extends D
     this.tableName = tableName;
   }
 
-  @Explain(displayName = "Partition Spec")
+  @Explain(displayName = "Partition Spec", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public Map<String, String> getPartSpec() {
     return partSpec;
   }

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/UDTFDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/UDTFDesc.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/UDTFDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/UDTFDesc.java Wed Apr  8 00:05:54 2015
@@ -19,6 +19,8 @@
 package org.apache.hadoop.hive.ql.plan;
 
 import org.apache.hadoop.hive.ql.udf.generic.GenericUDTF;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
+
 
 /**
  * All member variables should have a setters and getters of the form get<member
@@ -26,7 +28,7 @@ import org.apache.hadoop.hive.ql.udf.gen
  * time.
  *
  */
-@Explain(displayName = "UDTF Operator")
+@Explain(displayName = "UDTF Operator", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
 public class UDTFDesc extends AbstractOperatorDesc {
   private static final long serialVersionUID = 1L;
 
@@ -49,7 +51,7 @@ public class UDTFDesc extends AbstractOp
     this.genericUDTF = genericUDTF;
   }
 
-  @Explain(displayName = "function name")
+  @Explain(displayName = "function name", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public String getUDTFName() {
     return genericUDTF.toString();
   }

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/UnionDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/UnionDesc.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/UnionDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/UnionDesc.java Wed Apr  8 00:05:54 2015
@@ -17,13 +17,15 @@
  */
 
 package org.apache.hadoop.hive.ql.plan;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
+
 
 
 /**
  * unionDesc is a empty class currently. However, union has more than one input
  * (as compared with forward), and therefore, we need a separate class.
  **/
-@Explain(displayName = "Union")
+@Explain(displayName = "Union", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
 public class UnionDesc extends AbstractOperatorDesc {
   private static final long serialVersionUID = 1L;
   private transient int numInputs;

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/UnionWork.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/UnionWork.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/UnionWork.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/UnionWork.java Wed Apr  8 00:05:54 2015
@@ -25,7 +25,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.HashSet;
+
 import org.apache.hadoop.hive.ql.plan.BaseWork;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
 import org.apache.hadoop.hive.ql.exec.Operator;
 import org.apache.hadoop.hive.ql.exec.UnionOperator;
 import org.apache.hadoop.mapred.JobConf;
@@ -47,8 +49,8 @@ public class UnionWork extends BaseWork
     super(name);
   }
 
-  @Explain(displayName = "Vertex")
   @Override
+  @Explain(displayName = "Vertex", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public String getName() {
     return super.getName();
   }

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/UnlockDatabaseDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/UnlockDatabaseDesc.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/UnlockDatabaseDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/UnlockDatabaseDesc.java Wed Apr  8 00:05:54 2015
@@ -19,12 +19,14 @@
 package org.apache.hadoop.hive.ql.plan;
 
 import java.io.Serializable;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
+
 
 /**
  * UnlockDatabaseDesc.
  *
  */
-@Explain(displayName = "Unlock Database")
+@Explain(displayName = "Unlock Database", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
 public class UnlockDatabaseDesc extends DDLDesc implements Serializable {
   private static final long serialVersionUID = 1L;
 
@@ -34,7 +36,7 @@ public class UnlockDatabaseDesc extends
     this.databaseName = databaseName;
   }
 
-  @Explain(displayName = "database")
+  @Explain(displayName = "database", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public String getDatabaseName() {
     return databaseName;
   }

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/UnlockTableDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/UnlockTableDesc.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/UnlockTableDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/UnlockTableDesc.java Wed Apr  8 00:05:54 2015
@@ -22,12 +22,14 @@ import java.io.Serializable;
 import java.util.Map;
 
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
+
 
 /**
  * UnlockTableDesc.
  *
  */
-@Explain(displayName = "Unlock Table")
+@Explain(displayName = "Unlock Table", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
 public class UnlockTableDesc extends DDLDesc implements Serializable {
   private static final long serialVersionUID = 1L;
 

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ptf/PTFExpressionDef.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ptf/PTFExpressionDef.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ptf/PTFExpressionDef.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ptf/PTFExpressionDef.java Wed Apr  8 00:05:54 2015
@@ -22,6 +22,7 @@ import org.apache.hadoop.hive.ql.exec.Ex
 import org.apache.hadoop.hive.ql.exec.PTFUtils;
 import org.apache.hadoop.hive.ql.plan.Explain;
 import org.apache.hadoop.hive.ql.plan.ExprNodeDesc;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
 
 public class PTFExpressionDef {
@@ -59,7 +60,7 @@ public class PTFExpressionDef {
     this.exprNode = exprNode;
   }
 
-  @Explain(displayName = "expr")
+  @Explain(displayName = "expr", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public String getExprNodeExplain() {
     return exprNode == null ? null : exprNode.getExprString();
   }

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ptf/PTFQueryInputDef.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ptf/PTFQueryInputDef.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ptf/PTFQueryInputDef.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ptf/PTFQueryInputDef.java Wed Apr  8 00:05:54 2015
@@ -20,13 +20,14 @@ package org.apache.hadoop.hive.ql.plan.p
 
 import org.apache.hadoop.hive.ql.parse.PTFInvocationSpec.PTFQueryInputType;
 import org.apache.hadoop.hive.ql.plan.Explain;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
 
-@Explain(displayName = "Input definition")
+@Explain(displayName = "Input definition", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
 public class PTFQueryInputDef extends PTFInputDef {
   private String destination;
   private PTFQueryInputType type;
 
-  @Explain(displayName = "destination")
+  @Explain(displayName = "destination", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public String getDestination() {
     return destination;
   }
@@ -43,7 +44,7 @@ public class PTFQueryInputDef extends PT
     this.type = type;
   }
 
-  @Explain(displayName = "type")
+  @Explain(displayName = "type", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public String getTypeExplain() {
     return type.name();
   }

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ptf/PartitionedTableFunctionDef.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ptf/PartitionedTableFunctionDef.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ptf/PartitionedTableFunctionDef.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ptf/PartitionedTableFunctionDef.java Wed Apr  8 00:05:54 2015
@@ -23,9 +23,10 @@ import java.util.List;
 
 import org.apache.hadoop.hive.ql.parse.PTFInvocationSpec;
 import org.apache.hadoop.hive.ql.plan.Explain;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
 import org.apache.hadoop.hive.ql.udf.ptf.TableFunctionEvaluator;
 
-@Explain(displayName = "Partition table definition")
+@Explain(displayName = "Partition table definition", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
 public class PartitionedTableFunctionDef extends PTFInputDef {
   private String name;
   private String resolverClassName;
@@ -40,7 +41,7 @@ public class PartitionedTableFunctionDef
   
   private transient List<String> referencedColumns;
 
-  @Explain(displayName = "name")
+  @Explain(displayName = "name", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public String getName() {
     return name;
   }
@@ -83,7 +84,7 @@ public class PartitionedTableFunctionDef
     return partition;
   }
 
-  @Explain(displayName = "partition by")
+  @Explain(displayName = "partition by", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public String getPartitionExplain() {
     if (partition == null || partition.getExpressions() == null) {
       return null;
@@ -110,7 +111,7 @@ public class PartitionedTableFunctionDef
     this.order = order;
   }
 
-  @Explain(displayName = "order by")
+  @Explain(displayName = "order by", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public String getOrderExplain() {
     if (order == null || order.getExpressions() == null) {
       return null;
@@ -144,7 +145,7 @@ public class PartitionedTableFunctionDef
     this.args = args;
   }
 
-  @Explain(displayName = "arguments")
+  @Explain(displayName = "arguments", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public String getArgsExplain() {
     if (args == null) {
       return null;
@@ -188,7 +189,7 @@ public class PartitionedTableFunctionDef
     this.resolverClassName = resolverClassName;
   }
 
-  @Explain(displayName = "referenced columns")
+  @Explain(displayName = "referenced columns", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
   public List<String> getReferencedColumns() {
     return referencedColumns;
   }

Modified: hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/parse/TestUpdateDeleteSemanticAnalyzer.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/parse/TestUpdateDeleteSemanticAnalyzer.java?rev=1671979&r1=1671978&r2=1671979&view=diff
==============================================================================
--- hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/parse/TestUpdateDeleteSemanticAnalyzer.java (original)
+++ hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/parse/TestUpdateDeleteSemanticAnalyzer.java Wed Apr  8 00:05:54 2015
@@ -297,7 +297,7 @@ public class TestUpdateDeleteSemanticAna
     fs.create(tmp);
     fs.deleteOnExit(tmp);
     ExplainWork work = new ExplainWork(tmp, sem.getParseContext(), sem.getRootTasks(),
-        sem.getFetchTask(), astStringTree, sem, true, false, false, false, false);
+        sem.getFetchTask(), astStringTree, sem, true, false, false, false, false, false, null);
     ExplainTask task = new ExplainTask();
     task.setWork(work);
     task.initialize(conf, plan, null);