Fix describe element commands

Author: tanishq-chugh

ql/src/java/org/apache/hadoop/hive/ql/ddl/table/info/desc/DescTableOperation.java

@@ -201,23 +201,37 @@ private void getColumnDataColPathSpecified(Table table, Partition part, List<Fie
         }
         table.setParameters(tableProps);
       } else {
-        cols.addAll(getFilteredFieldsFromDeserializer(table, deserializer, colName));
-        colStats.addAll(context.getDb().getTableColumnStatistics(table, colNames, false));
+        addColsResolvedFromDeserializer(table, deserializer, colName, cols);
+        if (desc.isFormatted()) {
+          colStats.addAll(context.getDb().getTableColumnStatistics(table, colNames, false));
+        }
       }
     } else {
       List<String> partitions = new ArrayList<>();
       String partName = part.getName();
       partitions.add(partName);
-      cols.addAll(getFilteredFieldsFromDeserializer(table, deserializer, colName));
-      Map<String, List<ColumnStatisticsObj>> partitionColumnStatistics = context.getDb().getPartitionColumnStatistics(
-          table.getDbName(), table.getTableName(), partitions, colNames, false);
-      List<ColumnStatisticsObj> partitionColStat = partitionColumnStatistics.get(partName);
-      if (partitionColStat != null) {
-        colStats.addAll(partitionColStat);
+      addColsResolvedFromDeserializer(table, deserializer, colName, cols);
+      if (desc.isFormatted()) {
+        Map<String, List<ColumnStatisticsObj>> partitionColumnStatistics = context.getDb()
+            .getPartitionColumnStatistics(table.getDbName(), table.getTableName(), partitions,
+                colNames, false);
+        List<ColumnStatisticsObj> partitionColStat = partitionColumnStatistics.get(partName);
+        if (partitionColStat != null) {
+          colStats.addAll(partitionColStat);
+        }
       }
     }
   }
 
+  private void addColsResolvedFromDeserializer(Table table, Deserializer deserializer, String firstColName,
+      List<FieldSchema> cols) throws HiveException {
+    if (desc.getColumnPath().split("\\.").length > 3 || firstColName.startsWith("$")) {
+      cols.addAll(Hive.getFieldsFromDeserializer(desc.getColumnPath(), deserializer, context.getConf()));
+    } else {
+      cols.addAll(getFilteredFieldsFromDeserializer(table, deserializer, firstColName));
+    }
+  }
+
   private List<FieldSchema> getFilteredFieldsFromDeserializer(Table table, Deserializer deserializer,
       String targetColName) throws HiveException {
     List<FieldSchema> allFields = Hive.getFieldsFromDeserializer(table.getTableName(), deserializer, context.getConf());
@@ -257,7 +271,7 @@ private void getColumnDataForPartitionKeyColumn(Table table, List<FieldSchema> c
   private void getColumnsForNotPartitionKeyColumn(Table table, List<FieldSchema> cols, List<ColumnStatisticsObj> colStats,
       Deserializer deserializer, String colName, Map<String, String> tableProps)
       throws HiveException {
-    cols.addAll(getFilteredFieldsFromDeserializer(table, deserializer, colName));
+    addColsResolvedFromDeserializer(table, deserializer, colName, cols);
     if (desc.isFormatted()) {
       List<String> parts = context.getDb().getPartitionNames(table, (short) -1);
       AggrStats aggrStats = context.getDb().getAggrColStatsFor(table, Lists.newArrayList(colName.toLowerCase()),