hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prasan...@apache.org
Subject svn commit: r1670534 [2/8] - in /hive/branches/llap: ./ beeline/src/java/org/apache/hive/beeline/ conf/ data/files/ hcatalog/hcatalog-pig-adapter/ hcatalog/hcatalog-pig-adapter/src/test/java/org/apache/hive/hcatalog/pig/ hcatalog/src/test/e2e/templeton...
Date Wed, 01 Apr 2015 01:15:52 GMT
Modified: hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java?rev=1670534&r1=1670533&r2=1670534&view=diff
==============================================================================
--- hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java (original)
+++ hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java Wed Apr  1 01:15:50 2015
@@ -24,6 +24,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URLClassLoader;
 import java.sql.Timestamp;
 import java.util.ArrayList;
@@ -32,6 +33,7 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -269,6 +271,9 @@ public class SessionState {
    */
   private Timestamp queryCurrentTimestamp;
 
+  private ResourceMaps resourceMaps;
+
+  private DependencyResolver dependencyResolver;
   /**
    * Get the lineage state stored in this session.
    *
@@ -334,6 +339,8 @@ public class SessionState {
     this.userName = userName;
     isSilent = conf.getBoolVar(HiveConf.ConfVars.HIVESESSIONSILENT);
     ls = new LineageState();
+    resourceMaps = new ResourceMaps();
+    dependencyResolver = new DependencyResolver();
     // Must be deterministic order map for consistent q-test output across Java versions
     overriddenConfigurations = new LinkedHashMap<String, String>();
     overriddenConfigurations.putAll(HiveConf.getConfSystemProperties());
@@ -1119,8 +1126,7 @@ public class SessionState {
     return null;
   }
 
-  private final HashMap<ResourceType, Set<String>> resource_map =
-      new HashMap<ResourceType, Set<String>>();
+
 
   public String add_resource(ResourceType t, String value) throws RuntimeException {
     return add_resource(t, value, false);
@@ -1143,37 +1149,88 @@ public class SessionState {
 
   public List<String> add_resources(ResourceType t, Collection<String> values, boolean convertToUnix)
       throws RuntimeException {
-    Set<String> resourceMap = getResourceMap(t);
-
+    Set<String> resourceSet = resourceMaps.getResourceSet(t);
+    Map<String, Set<String>> resourcePathMap = resourceMaps.getResourcePathMap(t);
+    Map<String, Set<String>> reverseResourcePathMap = resourceMaps.getReverseResourcePathMap(t);
     List<String> localized = new ArrayList<String>();
     try {
       for (String value : values) {
-        localized.add(downloadResource(value, convertToUnix));
-      }
+        String key;
+
+        //get the local path of downloaded jars.
+        List<URI> downloadedURLs = resolveAndDownload(t, value, convertToUnix);
+
+        if (getURLType(value).equals("ivy")) {
+          // get the key to store in map
+          key = new URI(value).getAuthority();
+        } else {
+          // for local file and hdfs, key and value are same.
+          key = downloadedURLs.get(0).toString();
+        }
+        Set<String> downloadedValues = new HashSet<String>();
+
+        for (URI uri : downloadedURLs) {
+          String resourceValue = uri.toString();
+          downloadedValues.add(resourceValue);
+          localized.add(resourceValue);
+          if (reverseResourcePathMap.containsKey(resourceValue)) {
+            if (!reverseResourcePathMap.get(resourceValue).contains(key)) {
+              reverseResourcePathMap.get(resourceValue).add(key);
+            }
+          } else {
+            Set<String> addSet = new HashSet<String>();
+            addSet.add(key);
+            reverseResourcePathMap.put(resourceValue, addSet);
 
-      t.preHook(resourceMap, localized);
+          }
+        }
+        resourcePathMap.put(key, downloadedValues);
+      }
+      t.preHook(resourceSet, localized);
 
     } catch (RuntimeException e) {
-      getConsole().printError(e.getMessage(), "\n"
-          + org.apache.hadoop.util.StringUtils.stringifyException(e));
+      getConsole().printError(e.getMessage(), "\n" + org.apache.hadoop.util.StringUtils.stringifyException(e));
       throw e;
+    } catch (URISyntaxException e) {
+      getConsole().printError(e.getMessage());
+      throw new RuntimeException(e);
+    } catch (IOException e) {
+      getConsole().printError(e.getMessage());
+      throw new RuntimeException(e);
     }
-
     getConsole().printInfo("Added resources: " + values);
-    resourceMap.addAll(localized);
-
+    resourceSet.addAll(localized);
     return localized;
   }
 
-  private Set<String> getResourceMap(ResourceType t) {
-    Set<String> result = resource_map.get(t);
-    if (result == null) {
-      result = new HashSet<String>();
-      resource_map.put(t, result);
+  private static String getURLType(String value) throws URISyntaxException {
+    URI uri = new URI(value);
+    String scheme = uri.getScheme() == null ? null : uri.getScheme().toLowerCase();
+    if (scheme == null || scheme.equals("file")) {
+      return "file";
+    } else if (scheme.equals("hdfs") || scheme.equals("ivy")) {
+      return scheme;
+    } else {
+      throw new RuntimeException("invalid url: " + uri + ", expecting ( file | hdfs | ivy)  as url scheme. ");
+    }
+  }
+
+  List<URI> resolveAndDownload(ResourceType t, String value, boolean convertToUnix) throws URISyntaxException,
+      IOException {
+    URI uri = new URI(value);
+    if (getURLType(value).equals("file")) {
+      return Arrays.asList(uri);
+    } else if (getURLType(value).equals("ivy")) {
+      return dependencyResolver.downloadDependencies(uri);
+    } else if (getURLType(value).equals("hdfs")) {
+      return Arrays.asList(new URI(downloadResource(value, convertToUnix)));
+    } else {
+      throw new RuntimeException("Invalid url " + uri);
     }
-    return result;
   }
 
+
+
   /**
    * Returns  true if it is from any external File Systems except local
    */
@@ -1218,16 +1275,49 @@ public class SessionState {
     return value;
   }
 
-  public void delete_resources(ResourceType t, List<String> value) {
-    Set<String> resources = resource_map.get(t);
-    if (resources != null && !resources.isEmpty()) {
-      t.postHook(resources, value);
-      resources.removeAll(value);
+  public void delete_resources(ResourceType t, List<String> values) {
+    Set<String> resources = resourceMaps.getResourceSet(t);
+    if (resources == null || resources.isEmpty()) {
+      return;
+    }
+
+    Map<String, Set<String>> resourcePathMap = resourceMaps.getResourcePathMap(t);
+    Map<String, Set<String>> reverseResourcePathMap = resourceMaps.getReverseResourcePathMap(t);
+    List<String> deleteList = new LinkedList<String>();
+    for (String value : values) {
+      String key = value;
+      try {
+        if (getURLType(value).equals("ivy")) {
+          key = new URI(value).getAuthority();
+        }
+      } catch (URISyntaxException e) {
+        throw new RuntimeException("Invalid uri string " + value + ", " + e.getMessage());
+      }
+
+      // get all the dependencies to delete
+
+      Set<String> resourcePaths = resourcePathMap.get(key);
+      if (resourcePaths == null) {
+        return;
+      }
+      for (String resourceValue : resourcePaths) {
+        reverseResourcePathMap.get(resourceValue).remove(key);
+
+        // delete a dependency only if no other resource depends on it.
+        if (reverseResourcePathMap.get(resourceValue).isEmpty()) {
+          deleteList.add(resourceValue);
+          reverseResourcePathMap.remove(resourceValue);
+        }
+      }
+      resourcePathMap.remove(key);
     }
+    t.postHook(resources, deleteList);
+    resources.removeAll(deleteList);
   }
 
+
   public Set<String> list_resource(ResourceType t, List<String> filter) {
-    Set<String> orig = resource_map.get(t);
+    Set<String> orig = resourceMaps.getResourceSet(t);
     if (orig == null) {
       return null;
     }
@@ -1245,10 +1335,10 @@ public class SessionState {
   }
 
   public void delete_resources(ResourceType t) {
-    Set<String> resources = resource_map.get(t);
+    Set<String> resources = resourceMaps.getResourceSet(t);
     if (resources != null && !resources.isEmpty()) {
       delete_resources(t, new ArrayList<String>(resources));
-      resource_map.remove(t);
+      resourceMaps.getResourceMap().remove(t);
     }
   }
 
@@ -1512,3 +1602,51 @@ public class SessionState {
     return queryCurrentTimestamp;
   }
 }
+
+class ResourceMaps {
+
+  private final Map<SessionState.ResourceType, Set<String>> resource_map;
+  //Given jar to add is stored as key  and all its transitive dependencies as value. Used for deleting transitive dependencies.
+  private final Map<SessionState.ResourceType, Map<String, Set<String>>> resource_path_map;
+  // stores all the downloaded resources as key and the jars which depend on these resources as values in form of a list. Used for deleting transitive dependencies.
+  private final Map<SessionState.ResourceType, Map<String, Set<String>>> reverse_resource_path_map;
+
+  public ResourceMaps() {
+    resource_map = new HashMap<SessionState.ResourceType, Set<String>>();
+    resource_path_map = new HashMap<SessionState.ResourceType, Map<String, Set<String>>>();
+    reverse_resource_path_map = new HashMap<SessionState.ResourceType, Map<String, Set<String>>>();
+
+  }
+
+  public Map<SessionState.ResourceType, Set<String>> getResourceMap() {
+    return resource_map;
+  }
+
+  public Set<String> getResourceSet(SessionState.ResourceType t) {
+    Set<String> result = resource_map.get(t);
+    if (result == null) {
+      result = new HashSet<String>();
+      resource_map.put(t, result);
+    }
+    return result;
+  }
+
+  public Map<String, Set<String>> getResourcePathMap(SessionState.ResourceType t) {
+    Map<String, Set<String>> result = resource_path_map.get(t);
+    if (result == null) {
+      result = new HashMap<String, Set<String>>();
+      resource_path_map.put(t, result);
+    }
+    return result;
+  }
+
+  public Map<String, Set<String>> getReverseResourcePathMap(SessionState.ResourceType t) {
+    Map<String, Set<String>> result = reverse_resource_path_map.get(t);
+    if (result == null) {
+      result = new HashMap<String, Set<String>>();
+      reverse_resource_path_map.put(t, result);
+    }
+    return result;
+  }
+
+}

Modified: hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFFormatNumber.java
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFFormatNumber.java?rev=1670534&r1=1670533&r2=1670534&view=diff
==============================================================================
--- hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFFormatNumber.java (original)
+++ hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFFormatNumber.java Wed Apr  1 01:15:50 2015
@@ -147,7 +147,13 @@ public class GenericUDFFormatNumber exte
 
   @Override
   public Object evaluate(DeferredObject[] arguments) throws HiveException {
-    int dValue = ((IntObjectInspector) argumentOIs[1]).get(arguments[1].get());
+    Object arg0;
+    Object arg1;
+    if ((arg0 = arguments[0].get()) == null || (arg1 = arguments[1].get()) == null) {
+      return null;
+    }
+
+    int dValue = ((IntObjectInspector) argumentOIs[1]).get(arg1);
 
     if (dValue < 0) {
       throw new HiveException("Argument 2 of function FORMAT_NUMBER must be >= 0, but \""
@@ -181,26 +187,26 @@ public class GenericUDFFormatNumber exte
     switch (xObjectInspector.getPrimitiveCategory()) {
       case VOID:
       case DOUBLE:
-        xDoubleValue = ((DoubleObjectInspector) argumentOIs[0]).get(arguments[0].get());
+        xDoubleValue = ((DoubleObjectInspector) argumentOIs[0]).get(arg0);
         resultText.set(numberFormat.format(xDoubleValue));
         break;
       case FLOAT:
-        xFloatValue = ((FloatObjectInspector) argumentOIs[0]).get(arguments[0].get());
+        xFloatValue = ((FloatObjectInspector) argumentOIs[0]).get(arg0);
         resultText.set(numberFormat.format(xFloatValue));
         break;
       case DECIMAL:
         xDecimalValue = ((HiveDecimalObjectInspector) argumentOIs[0])
-            .getPrimitiveJavaObject(arguments[0].get());
+            .getPrimitiveJavaObject(arg0);
         resultText.set(numberFormat.format(xDecimalValue.bigDecimalValue()));
         break;
       case BYTE:
       case SHORT:
       case INT:
-        xIntValue = ((IntObjectInspector) argumentOIs[0]).get(arguments[0].get());
+        xIntValue = ((IntObjectInspector) argumentOIs[0]).get(arg0);
         resultText.set(numberFormat.format(xIntValue));
         break;
       case LONG:
-        xLongValue = ((LongObjectInspector) argumentOIs[0]).get(arguments[0].get());
+        xLongValue = ((LongObjectInspector) argumentOIs[0]).get(arg0);
         resultText.set(numberFormat.format(xLongValue));
         break;
       default:

Modified: hive/branches/llap/ql/src/test/queries/clientpositive/avro_compression_enabled.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/avro_compression_enabled.q?rev=1670534&r1=1670533&r2=1670534&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/avro_compression_enabled.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/avro_compression_enabled.q Wed Apr  1 01:15:50 2015
@@ -29,7 +29,7 @@ TBLPROPERTIES ('avro.schema.literal'='{
     {
       "name":"extra_field",
       "type":"string",
-      "doc:":"an extra field not in the original file",
+      "doc":"an extra field not in the original file",
       "default":"fishfingers and custard"
     }
   ]

Modified: hive/branches/llap/ql/src/test/queries/clientpositive/avro_evolved_schemas.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/avro_evolved_schemas.q?rev=1670534&r1=1670533&r2=1670534&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/avro_evolved_schemas.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/avro_evolved_schemas.q Wed Apr  1 01:15:50 2015
@@ -30,7 +30,7 @@ TBLPROPERTIES ('avro.schema.literal'='{
     {
       "name":"extra_field",
       "type":"string",
-      "doc:":"an extra field not in the original file",
+      "doc":"an extra field not in the original file",
       "default":"fishfingers and custard"
     }
   ]

Modified: hive/branches/llap/ql/src/test/queries/clientpositive/avro_joins.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/avro_joins.q?rev=1670534&r1=1670533&r2=1670534&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/avro_joins.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/avro_joins.q Wed Apr  1 01:15:50 2015
@@ -31,7 +31,7 @@ TBLPROPERTIES ('avro.schema.literal'='{
     {
       "name":"extra_field",
       "type":"string",
-      "doc:":"an extra field not in the original file",
+      "doc":"an extra field not in the original file",
       "default":"fishfingers and custard"
     }
   ]

Modified: hive/branches/llap/ql/src/test/queries/clientpositive/leadlag.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/leadlag.q?rev=1670534&r1=1670533&r2=1670534&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/leadlag.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/leadlag.q Wed Apr  1 01:15:50 2015
@@ -36,7 +36,10 @@ sum(p_size - lag(p_size,1)) over w1 as d
 from part 
 window w1 as (distribute by p_mfgr sort by p_name rows between 2 preceding and 2 following) ;
 
+set hive.cbo.enable=false;
 -- 6. testRankInLead
+-- disable cbo because of CALCITE-653
+
 select p_mfgr, p_name, p_size, r1,
 lead(r1,1,r1) over (distribute by p_mfgr sort by p_name) as deltaRank
 from (
@@ -45,6 +48,7 @@ rank() over(distribute by p_mfgr  sort b
 from part 
 ) a;
 
+set hive.cbo.enable=true;
 -- 7. testLeadWithPTF
 select p_mfgr, p_name, 
 rank() over(distribute by p_mfgr sort by p_name) as r, 

Modified: hive/branches/llap/ql/src/test/queries/clientpositive/parquet_columnar.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/parquet_columnar.q?rev=1670534&r1=1670533&r2=1670534&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/parquet_columnar.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/parquet_columnar.q Wed Apr  1 01:15:50 2015
@@ -5,8 +5,8 @@ DROP TABLE IF EXISTS parquet_columnar_ac
 DROP TABLE IF EXISTS parquet_columnar_renamed;
 
 CREATE TABLE parquet_columnar_access_stage (
-    s string, 
-    i int, 
+    s string,
+    i int,
     f float
   ) ROW FORMAT DELIMITED
   FIELDS TERMINATED BY '|';
@@ -15,12 +15,14 @@ CREATE TABLE parquet_columnar_access (
     s string,
     x int,
     y int,
-    f float
+    f float,
+    address struct<intVals:int,strVals:string>
   ) STORED AS PARQUET;
 
 LOAD DATA LOCAL INPATH '../../data/files/parquet_columnar.txt' OVERWRITE INTO TABLE parquet_columnar_access_stage;
 
-INSERT OVERWRITE TABLE parquet_columnar_access SELECT s, i, (i + 1), f FROM parquet_columnar_access_stage;
+INSERT OVERWRITE TABLE parquet_columnar_access SELECT s, i, (i + 1), f, named_struct('intVals',
+i,'strVals',s) FROM parquet_columnar_access_stage;
 SELECT * FROM parquet_columnar_access;
 
 ALTER TABLE parquet_columnar_access REPLACE COLUMNS (s1 string, x1 int, y1 int, f1 float);

Modified: hive/branches/llap/ql/src/test/queries/clientpositive/udaf_percentile_approx_23.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/udaf_percentile_approx_23.q?rev=1670534&r1=1670533&r2=1670534&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/udaf_percentile_approx_23.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/udaf_percentile_approx_23.q Wed Apr  1 01:15:50 2015
@@ -88,11 +88,11 @@ select * from t12;
 set hive.cbo.enable=false;
 
 -- NaN
-explain 
+explain
 select percentile_approx(case when key < 100 then cast('NaN' as double) else key end, 0.5) from bucket;
 select percentile_approx(case when key < 100 then cast('NaN' as double) else key end, 0.5) from bucket;
 
 -- with CBO
-explain 
-select percentile_approx(key, 0.5) from bucket;
+explain
 select percentile_approx(key, 0.5) from bucket;
+select percentile_approx(key, 0.5) between 255.0 and 257.0 from bucket;

Modified: hive/branches/llap/ql/src/test/queries/clientpositive/udf_format_number.q
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/queries/clientpositive/udf_format_number.q?rev=1670534&r1=1670533&r2=1670534&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/queries/clientpositive/udf_format_number.q (original)
+++ hive/branches/llap/ql/src/test/queries/clientpositive/udf_format_number.q Wed Apr  1 01:15:50 2015
@@ -71,3 +71,9 @@ SELECT format_number(12332.123456BD, 4),
     format_number(-12332.2BD, 0),
     format_number(CAST(12332.567 AS DECIMAL(8, 1)), 4)
 FROM src tablesample (1 rows);
+
+-- nulls
+SELECT
+  format_number(cast(null as int), 0),
+  format_number(12332.123456BD, cast(null as int)),
+  format_number(cast(null as int), cast(null as int));

Modified: hive/branches/llap/ql/src/test/results/clientpositive/alter_partition_coltype.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/alter_partition_coltype.q.out?rev=1670534&r1=1670533&r2=1670534&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/alter_partition_coltype.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/alter_partition_coltype.q.out Wed Apr  1 01:15:50 2015
@@ -568,7 +568,7 @@ STAGE PLANS:
               name: default.alter_coltype
             name: default.alter_coltype
       Truncated Path -> Alias:
-        /alter_coltype/dt=100/ts=3.0 [$hdt$_0:$hdt$_0:alter_coltype]
+        /alter_coltype/dt=100/ts=3.0 [$hdt$_0:alter_coltype]
       Needs Tagging: false
       Reduce Operator Tree:
         Group By Operator

Modified: hive/branches/llap/ql/src/test/results/clientpositive/annotate_stats_select.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/annotate_stats_select.q.out?rev=1670534&r1=1670533&r2=1670534&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/annotate_stats_select.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/annotate_stats_select.q.out Wed Apr  1 01:15:50 2015
@@ -531,7 +531,7 @@ STAGE PLANS:
           alias: alltypes_orc
           Statistics: Num rows: 2 Data size: 1686 Basic stats: COMPLETE Column stats: COMPLETE
           Select Operator
-            expressions: CAST( '58.174' AS decimal(10,0)) (type: decimal(10,0))
+            expressions: 58 (type: decimal(10,0))
             outputColumnNames: _col0
             Statistics: Num rows: 2 Data size: 224 Basic stats: COMPLETE Column stats: COMPLETE
             ListSink
@@ -556,10 +556,10 @@ STAGE PLANS:
             Select Operator
               expressions: array(1,2,3) (type: array<int>)
               outputColumnNames: _col0
-              Statistics: Num rows: 2 Data size: 240 Basic stats: COMPLETE Column stats: COMPLETE
+              Statistics: Num rows: 2 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 2 Data size: 240 Basic stats: COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 2 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -591,10 +591,10 @@ STAGE PLANS:
             Select Operator
               expressions: str_to_map('a=1 b=2 c=3',' ','=') (type: map<string,string>)
               outputColumnNames: _col0
-              Statistics: Num rows: 2 Data size: 1840 Basic stats: COMPLETE Column stats: COMPLETE
+              Statistics: Num rows: 2 Data size: 1508 Basic stats: COMPLETE Column stats: COMPLETE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 2 Data size: 1840 Basic stats: COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 2 Data size: 1508 Basic stats: COMPLETE Column stats: COMPLETE
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat

Modified: hive/branches/llap/ql/src/test/results/clientpositive/auto_join1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/auto_join1.q.out?rev=1670534&r1=1670533&r2=1670534&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/auto_join1.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/auto_join1.q.out Wed Apr  1 01:15:50 2015
@@ -24,11 +24,11 @@ STAGE PLANS:
   Stage: Stage-5
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        $hdt$_0:$hdt$_0:src1 
+        $hdt$_0:src1 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        $hdt$_0:$hdt$_0:src1 
+        $hdt$_0:src1 
           TableScan
             alias: src1
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE

Modified: hive/branches/llap/ql/src/test/results/clientpositive/auto_join10.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/auto_join10.q.out?rev=1670534&r1=1670533&r2=1670534&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/auto_join10.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/auto_join10.q.out Wed Apr  1 01:15:50 2015
@@ -23,11 +23,11 @@ STAGE PLANS:
   Stage: Stage-5
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        $hdt$_0:$hdt$_0:$hdt$_0:src 
+        $hdt$_0:$hdt$_0:src 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        $hdt$_0:$hdt$_0:$hdt$_0:src 
+        $hdt$_0:$hdt$_0:src 
           TableScan
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE

Modified: hive/branches/llap/ql/src/test/results/clientpositive/auto_join11.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/auto_join11.q.out?rev=1670534&r1=1670533&r2=1670534&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/auto_join11.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/auto_join11.q.out Wed Apr  1 01:15:50 2015
@@ -23,11 +23,11 @@ STAGE PLANS:
   Stage: Stage-5
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        $hdt$_0:$hdt$_0:$hdt$_0:src 
+        $hdt$_0:$hdt$_0:src 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        $hdt$_0:$hdt$_0:$hdt$_0:src 
+        $hdt$_0:$hdt$_0:src 
           TableScan
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE

Modified: hive/branches/llap/ql/src/test/results/clientpositive/auto_join12.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/auto_join12.q.out?rev=1670534&r1=1670533&r2=1670534&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/auto_join12.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/auto_join12.q.out Wed Apr  1 01:15:50 2015
@@ -29,14 +29,14 @@ STAGE PLANS:
   Stage: Stage-7
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:src 
+        $hdt$_0:$hdt$_0:$hdt$_0:src 
           Fetch Operator
             limit: -1
-        $hdt$_0:$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:src 
+        $hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:src 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:src 
+        $hdt$_0:$hdt$_0:$hdt$_0:src 
           TableScan
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
@@ -51,7 +51,7 @@ STAGE PLANS:
                   keys:
                     0 _col0 (type: string)
                     1 _col0 (type: string)
-        $hdt$_0:$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:src 
+        $hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:src 
           TableScan
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE

Modified: hive/branches/llap/ql/src/test/results/clientpositive/auto_join13.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/auto_join13.q.out?rev=1670534&r1=1670533&r2=1670534&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/auto_join13.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/auto_join13.q.out Wed Apr  1 01:15:50 2015
@@ -29,14 +29,14 @@ STAGE PLANS:
   Stage: Stage-7
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        $hdt$_0:$hdt$_0:$hdt$_0:src 
+        $hdt$_0:$hdt$_0:src 
           Fetch Operator
             limit: -1
-        $hdt$_0:$hdt$_0:$hdt$_1:$hdt$_1:src 
+        $hdt$_0:$hdt$_1:$hdt$_1:src 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        $hdt$_0:$hdt$_0:$hdt$_0:src 
+        $hdt$_0:$hdt$_0:src 
           TableScan
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
@@ -51,7 +51,7 @@ STAGE PLANS:
                   keys:
                     0 UDFToDouble(_col0) (type: double)
                     1 (UDFToDouble(_col2) + UDFToDouble(_col0)) (type: double)
-        $hdt$_0:$hdt$_0:$hdt$_1:$hdt$_1:src 
+        $hdt$_0:$hdt$_1:$hdt$_1:src 
           TableScan
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE

Modified: hive/branches/llap/ql/src/test/results/clientpositive/auto_join14.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/auto_join14.q.out?rev=1670534&r1=1670533&r2=1670534&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/auto_join14.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/auto_join14.q.out Wed Apr  1 01:15:50 2015
@@ -28,11 +28,11 @@ STAGE PLANS:
   Stage: Stage-5
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        $hdt$_0:$hdt$_1:src 
+        $hdt$_1:src 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        $hdt$_0:$hdt$_1:src 
+        $hdt$_1:src 
           TableScan
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE

Modified: hive/branches/llap/ql/src/test/results/clientpositive/auto_join22.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/auto_join22.q.out?rev=1670534&r1=1670533&r2=1670534&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/auto_join22.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/auto_join22.q.out Wed Apr  1 01:15:50 2015
@@ -13,14 +13,14 @@ STAGE PLANS:
   Stage: Stage-8
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:src4 
+        $hdt$_0:$hdt$_0:$hdt$_0:src4 
           Fetch Operator
             limit: -1
-        $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_1:src4 
+        $hdt$_0:$hdt$_1:src4 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:src4 
+        $hdt$_0:$hdt$_0:$hdt$_0:src4 
           TableScan
             alias: src4
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
@@ -35,7 +35,7 @@ STAGE PLANS:
                   keys:
                     0 _col0 (type: string)
                     1 _col0 (type: string)
-        $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_1:src4 
+        $hdt$_0:$hdt$_1:src4 
           TableScan
             alias: src4
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE

Modified: hive/branches/llap/ql/src/test/results/clientpositive/auto_join26.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/auto_join26.q.out?rev=1670534&r1=1670533&r2=1670534&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/auto_join26.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/auto_join26.q.out Wed Apr  1 01:15:50 2015
@@ -28,11 +28,11 @@ STAGE PLANS:
   Stage: Stage-6
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        $hdt$_0:$hdt$_0:$hdt$_1:x 
+        $hdt$_0:$hdt$_1:x 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        $hdt$_0:$hdt$_0:$hdt$_1:x 
+        $hdt$_0:$hdt$_1:x 
           TableScan
             alias: x
             Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE

Modified: hive/branches/llap/ql/src/test/results/clientpositive/auto_join_nulls.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/auto_join_nulls.q.out?rev=1670534&r1=1670533&r2=1670534&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/auto_join_nulls.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/auto_join_nulls.q.out Wed Apr  1 01:15:50 2015
@@ -34,7 +34,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@myinput1
 #### A masked pattern was here ####
 13630578
-Warning: Map Join MAPJOIN[18][bigTable=?] in task 'Stage-2:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[17][bigTable=?] in task 'Stage-2:MAPRED' is a cross product
 PREHOOK: query: SELECT sum(hash(a.key,a.value,b.key,b.value)) FROM myinput1 a RIGHT OUTER JOIN myinput1 b
 PREHOOK: type: QUERY
 PREHOOK: Input: default@myinput1

Modified: hive/branches/llap/ql/src/test/results/clientpositive/auto_join_without_localtask.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/auto_join_without_localtask.q.out?rev=1670534&r1=1670533&r2=1670534&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/auto_join_without_localtask.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/auto_join_without_localtask.q.out Wed Apr  1 01:15:50 2015
@@ -270,11 +270,11 @@ STAGE PLANS:
   Stage: Stage-14
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        $hdt$_0:$hdt$_1:a 
+        $hdt$_1:a 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        $hdt$_0:$hdt$_1:a 
+        $hdt$_1:a 
           TableScan
             alias: a
             Filter Operator
@@ -319,11 +319,11 @@ STAGE PLANS:
   Stage: Stage-12
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        $hdt$_0:$hdt$_2:a 
+        $hdt$_2:a 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        $hdt$_0:$hdt$_2:a 
+        $hdt$_2:a 
           TableScan
             alias: a
             Filter Operator
@@ -406,11 +406,11 @@ STAGE PLANS:
       Local Work:
         Map Reduce Local Work
           Alias -> Map Local Tables:
-            $hdt$_0:$INTNAME 
+            $INTNAME 
               Fetch Operator
                 limit: -1
           Alias -> Map Local Operator Tree:
-            $hdt$_0:$INTNAME 
+            $INTNAME 
               TableScan
 
   Stage: Stage-2
@@ -457,11 +457,11 @@ STAGE PLANS:
   Stage: Stage-15
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        $hdt$_0:$hdt$_0:a 
+        $hdt$_0:a 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        $hdt$_0:$hdt$_0:a 
+        $hdt$_0:a 
           TableScan
             alias: a
             Filter Operator
@@ -639,11 +639,11 @@ STAGE PLANS:
   Stage: Stage-13
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        $hdt$_0:$hdt$_1:$hdt$_2:a 
+        $hdt$_1:$hdt$_2:a 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        $hdt$_0:$hdt$_1:$hdt$_2:a 
+        $hdt$_1:$hdt$_2:a 
           TableScan
             alias: a
             Filter Operator
@@ -714,11 +714,11 @@ STAGE PLANS:
       Local Work:
         Map Reduce Local Work
           Alias -> Map Local Tables:
-            $hdt$_0:$INTNAME 
+            $INTNAME 
               Fetch Operator
                 limit: -1
           Alias -> Map Local Operator Tree:
-            $hdt$_0:$INTNAME 
+            $INTNAME 
               TableScan
 
   Stage: Stage-2
@@ -748,11 +748,11 @@ STAGE PLANS:
   Stage: Stage-12
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        $hdt$_0:$hdt$_0:a 
+        $hdt$_0:a 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        $hdt$_0:$hdt$_0:a 
+        $hdt$_0:a 
           TableScan
             alias: a
             Filter Operator
@@ -836,11 +836,11 @@ STAGE PLANS:
   Stage: Stage-14
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        $hdt$_0:$hdt$_1:$hdt$_1:a 
+        $hdt$_1:$hdt$_1:a 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        $hdt$_0:$hdt$_1:$hdt$_1:a 
+        $hdt$_1:$hdt$_1:a 
           TableScan
             alias: a
             Filter Operator

Modified: hive/branches/llap/ql/src/test/results/clientpositive/avro_add_column.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/avro_add_column.q.out?rev=1670534&r1=1670533&r2=1670534&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/avro_add_column.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/avro_add_column.q.out Wed Apr  1 01:15:50 2015
@@ -24,8 +24,8 @@ PREHOOK: Input: default@doctors
 POSTHOOK: query: DESCRIBE doctors
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: default@doctors
-number              	int                 	from deserializer   
-first_name          	string              	from deserializer   
+number              	int                 	                    
+first_name          	string              	                    
 PREHOOK: query: ALTER TABLE doctors ADD COLUMNS (last_name string)
 PREHOOK: type: ALTERTABLE_ADDCOLS
 PREHOOK: Input: default@doctors
@@ -40,9 +40,9 @@ PREHOOK: Input: default@doctors
 POSTHOOK: query: DESCRIBE doctors
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: default@doctors
-number              	int                 	from deserializer   
-first_name          	string              	from deserializer   
-last_name           	string              	from deserializer   
+number              	int                 	                    
+first_name          	string              	                    
+last_name           	string              	                    
 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/doctors.avro' INTO TABLE doctors
 PREHOOK: type: LOAD
 #### A masked pattern was here ####

Modified: hive/branches/llap/ql/src/test/results/clientpositive/avro_add_column2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/avro_add_column2.q.out?rev=1670534&r1=1670533&r2=1670534&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/avro_add_column2.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/avro_add_column2.q.out Wed Apr  1 01:15:50 2015
@@ -50,8 +50,8 @@ POSTHOOK: query: INSERT INTO TABLE docto
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@doctors
 POSTHOOK: Output: default@doctors_copy
-POSTHOOK: Lineage: doctors_copy.first_name SIMPLE [(doctors)doctors.FieldSchema(name:first_name, type:string, comment:from deserializer), ]
-POSTHOOK: Lineage: doctors_copy.number SIMPLE [(doctors)doctors.FieldSchema(name:number, type:int, comment:from deserializer), ]
+POSTHOOK: Lineage: doctors_copy.first_name SIMPLE [(doctors)doctors.FieldSchema(name:first_name, type:string, comment:), ]
+POSTHOOK: Lineage: doctors_copy.number SIMPLE [(doctors)doctors.FieldSchema(name:number, type:int, comment:), ]
 PREHOOK: query: ALTER TABLE doctors_copy ADD COLUMNS (last_name string)
 PREHOOK: type: ALTERTABLE_ADDCOLS
 PREHOOK: Input: default@doctors_copy
@@ -74,9 +74,9 @@ PREHOOK: Input: default@doctors_copy
 POSTHOOK: query: DESCRIBE doctors_copy
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: default@doctors_copy
-number              	int                 	from deserializer   
-first_name          	string              	from deserializer   
-last_name           	string              	from deserializer   
+number              	int                 	                    
+first_name          	string              	                    
+last_name           	string              	                    
 PREHOOK: query: SELECT * FROM doctors_copy
 PREHOOK: type: QUERY
 PREHOOK: Input: default@doctors_copy

Modified: hive/branches/llap/ql/src/test/results/clientpositive/avro_add_column3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/avro_add_column3.q.out?rev=1670534&r1=1670533&r2=1670534&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/avro_add_column3.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/avro_add_column3.q.out Wed Apr  1 01:15:50 2015
@@ -52,8 +52,8 @@ POSTHOOK: query: INSERT INTO TABLE docto
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@doctors
 POSTHOOK: Output: default@doctors_copy@part=1
-POSTHOOK: Lineage: doctors_copy PARTITION(part=1).first_name SIMPLE [(doctors)doctors.FieldSchema(name:first_name, type:string, comment:from deserializer), ]
-POSTHOOK: Lineage: doctors_copy PARTITION(part=1).number SIMPLE [(doctors)doctors.FieldSchema(name:number, type:int, comment:from deserializer), ]
+POSTHOOK: Lineage: doctors_copy PARTITION(part=1).first_name SIMPLE [(doctors)doctors.FieldSchema(name:first_name, type:string, comment:), ]
+POSTHOOK: Lineage: doctors_copy PARTITION(part=1).number SIMPLE [(doctors)doctors.FieldSchema(name:number, type:int, comment:), ]
 PREHOOK: query: ALTER TABLE doctors_copy ADD COLUMNS (last_name string)
 PREHOOK: type: ALTERTABLE_ADDCOLS
 PREHOOK: Input: default@doctors_copy
@@ -68,9 +68,9 @@ PREHOOK: Input: default@doctors_copy
 POSTHOOK: query: DESCRIBE doctors_copy
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: default@doctors_copy
-number              	int                 	from deserializer   
-first_name          	string              	from deserializer   
-last_name           	string              	from deserializer   
+number              	int                 	                    
+first_name          	string              	                    
+last_name           	string              	                    
 part                	int                 	                    
 	 	 
 # Partition Information	 	 

Modified: hive/branches/llap/ql/src/test/results/clientpositive/avro_change_schema.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/avro_change_schema.q.out?rev=1670534&r1=1670533&r2=1670534&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/avro_change_schema.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/avro_change_schema.q.out Wed Apr  1 01:15:50 2015
@@ -38,8 +38,8 @@ PREHOOK: Input: default@avro2
 POSTHOOK: query: DESCRIBE avro2
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: default@avro2
-string1             	string              	from deserializer   
-string2             	string              	from deserializer   
+string1             	string              	                    
+string2             	string              	                    
 PREHOOK: query: ALTER TABLE avro2 SET TBLPROPERTIES ('avro.schema.literal'='{ "namespace": "org.apache.hive",
   "name": "second_schema",
   "type": "record",
@@ -68,6 +68,6 @@ PREHOOK: Input: default@avro2
 POSTHOOK: query: DESCRIBE avro2
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: default@avro2
-int1                	int                 	from deserializer   
-float1              	float               	from deserializer   
-double1             	double              	from deserializer   
+int1                	int                 	                    
+float1              	float               	                    
+double1             	double              	                    

Modified: hive/branches/llap/ql/src/test/results/clientpositive/avro_compression_enabled.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/avro_compression_enabled.q.out?rev=1670534&r1=1670533&r2=1670534&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/avro_compression_enabled.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/avro_compression_enabled.q.out Wed Apr  1 01:15:50 2015
@@ -29,7 +29,7 @@ TBLPROPERTIES ('avro.schema.literal'='{
     {
       "name":"extra_field",
       "type":"string",
-      "doc:":"an extra field not in the original file",
+      "doc":"an extra field not in the original file",
       "default":"fishfingers and custard"
     }
   ]
@@ -68,7 +68,7 @@ TBLPROPERTIES ('avro.schema.literal'='{
     {
       "name":"extra_field",
       "type":"string",
-      "doc:":"an extra field not in the original file",
+      "doc":"an extra field not in the original file",
       "default":"fishfingers and custard"
     }
   ]

Modified: hive/branches/llap/ql/src/test/results/clientpositive/avro_decimal.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/avro_decimal.q.out?rev=1670534&r1=1670533&r2=1670534&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/avro_decimal.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/avro_decimal.q.out Wed Apr  1 01:15:50 2015
@@ -79,8 +79,8 @@ PREHOOK: Input: default@avro_dec
 POSTHOOK: query: DESC avro_dec
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: default@avro_dec
-name                	string              	from deserializer   
-value               	decimal(5,2)        	from deserializer   
+name                	string              	                    
+value               	decimal(5,2)        	                    
 PREHOOK: query: INSERT OVERWRITE TABLE avro_dec select name, value from dec
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dec
@@ -153,8 +153,8 @@ PREHOOK: Input: default@avro_dec1
 POSTHOOK: query: DESC avro_dec1
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: default@avro_dec1
-name                	string              	from deserializer   
-value               	decimal(4,1)        	from deserializer   
+name                	string              	                    
+value               	decimal(4,1)        	                    
 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/dec.avro' into TABLE avro_dec1
 PREHOOK: type: LOAD
 #### A masked pattern was here ####

Modified: hive/branches/llap/ql/src/test/results/clientpositive/avro_decimal_native.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/avro_decimal_native.q.out?rev=1670534&r1=1670533&r2=1670534&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/avro_decimal_native.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/avro_decimal_native.q.out Wed Apr  1 01:15:50 2015
@@ -65,8 +65,8 @@ PREHOOK: Input: default@avro_dec
 POSTHOOK: query: DESC avro_dec
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: default@avro_dec
-name                	string              	from deserializer   
-value               	decimal(5,2)        	from deserializer   
+name                	string              	                    
+value               	decimal(5,2)        	                    
 PREHOOK: query: INSERT OVERWRITE TABLE avro_dec SELECT name, value FROM dec
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dec
@@ -121,8 +121,8 @@ PREHOOK: Input: default@avro_dec1
 POSTHOOK: query: DESC avro_dec1
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: default@avro_dec1
-name                	string              	from deserializer   
-value               	decimal(4,1)        	from deserializer   
+name                	string              	                    
+value               	decimal(4,1)        	                    
 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/dec.avro' INTO TABLE avro_dec1
 PREHOOK: type: LOAD
 #### A masked pattern was here ####

Modified: hive/branches/llap/ql/src/test/results/clientpositive/avro_evolved_schemas.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/avro_evolved_schemas.q.out?rev=1670534&r1=1670533&r2=1670534&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/avro_evolved_schemas.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/avro_evolved_schemas.q.out Wed Apr  1 01:15:50 2015
@@ -30,7 +30,7 @@ TBLPROPERTIES ('avro.schema.literal'='{
     {
       "name":"extra_field",
       "type":"string",
-      "doc:":"an extra field not in the original file",
+      "doc":"an extra field not in the original file",
       "default":"fishfingers and custard"
     }
   ]
@@ -70,7 +70,7 @@ TBLPROPERTIES ('avro.schema.literal'='{
     {
       "name":"extra_field",
       "type":"string",
-      "doc:":"an extra field not in the original file",
+      "doc":"an extra field not in the original file",
       "default":"fishfingers and custard"
     }
   ]
@@ -84,10 +84,10 @@ PREHOOK: Input: default@doctors_with_new
 POSTHOOK: query: DESCRIBE doctors_with_new_field
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: default@doctors_with_new_field
-number              	int                 	from deserializer   
-first_name          	string              	from deserializer   
-last_name           	string              	from deserializer   
-extra_field         	string              	from deserializer   
+number              	int                 	Order of playing the role
+first_name          	string              	first name of actor playing role
+last_name           	string              	last name of actor playing role
+extra_field         	string              	an extra field not in the original file
 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/doctors.avro' INTO TABLE doctors_with_new_field
 PREHOOK: type: LOAD
 #### A masked pattern was here ####

Modified: hive/branches/llap/ql/src/test/results/clientpositive/avro_joins.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/avro_joins.q.out?rev=1670534&r1=1670533&r2=1670534&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/avro_joins.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/avro_joins.q.out Wed Apr  1 01:15:50 2015
@@ -31,7 +31,7 @@ TBLPROPERTIES ('avro.schema.literal'='{
     {
       "name":"extra_field",
       "type":"string",
-      "doc:":"an extra field not in the original file",
+      "doc":"an extra field not in the original file",
       "default":"fishfingers and custard"
     }
   ]
@@ -72,7 +72,7 @@ TBLPROPERTIES ('avro.schema.literal'='{
     {
       "name":"extra_field",
       "type":"string",
-      "doc:":"an extra field not in the original file",
+      "doc":"an extra field not in the original file",
       "default":"fishfingers and custard"
     }
   ]
@@ -86,10 +86,10 @@ PREHOOK: Input: default@doctors4
 POSTHOOK: query: DESCRIBE doctors4
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: default@doctors4
-number              	int                 	from deserializer   
-first_name          	string              	from deserializer   
-last_name           	string              	from deserializer   
-extra_field         	string              	from deserializer   
+number              	int                 	Order of playing the role
+first_name          	string              	first name of actor playing role
+last_name           	string              	last name of actor playing role
+extra_field         	string              	an extra field not in the original file
 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/doctors.avro' INTO TABLE doctors4
 PREHOOK: type: LOAD
 #### A masked pattern was here ####
@@ -166,9 +166,9 @@ PREHOOK: Input: default@episodes
 POSTHOOK: query: DESCRIBE episodes
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: default@episodes
-title               	string              	from deserializer   
-air_date            	string              	from deserializer   
-doctor              	int                 	from deserializer   
+title               	string              	episode title       
+air_date            	string              	initial date        
+doctor              	int                 	main actor playing the Doctor in episode
 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/episodes.avro' INTO TABLE episodes
 PREHOOK: type: LOAD
 #### A masked pattern was here ####

Modified: hive/branches/llap/ql/src/test/results/clientpositive/avro_joins_native.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/avro_joins_native.q.out?rev=1670534&r1=1670533&r2=1670534&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/avro_joins_native.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/avro_joins_native.q.out Wed Apr  1 01:15:50 2015
@@ -28,9 +28,9 @@ PREHOOK: Input: default@doctors4
 POSTHOOK: query: DESCRIBE doctors4
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: default@doctors4
-number              	int                 	from deserializer   
-first_name          	string              	from deserializer   
-last_name           	string              	from deserializer   
+number              	int                 	Order of playing the role
+first_name          	string              	first name of actor playing role
+last_name           	string              	last name of actor playing role
 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/doctors.avro' INTO TABLE doctors4
 PREHOOK: type: LOAD
 #### A masked pattern was here ####
@@ -61,9 +61,9 @@ PREHOOK: Input: default@episodes
 POSTHOOK: query: DESCRIBE episodes
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: default@episodes
-title               	string              	from deserializer   
-air_date            	string              	from deserializer   
-doctor              	int                 	from deserializer   
+title               	string              	episode title       
+air_date            	string              	initial date        
+doctor              	int                 	main actor playing the Doctor in episode
 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/episodes.avro' INTO TABLE episodes
 PREHOOK: type: LOAD
 #### A masked pattern was here ####

Modified: hive/branches/llap/ql/src/test/results/clientpositive/avro_native.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/avro_native.q.out?rev=1670534&r1=1670533&r2=1670534&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/avro_native.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/avro_native.q.out Wed Apr  1 01:15:50 2015
@@ -26,9 +26,9 @@ PREHOOK: Input: default@doctors
 POSTHOOK: query: DESCRIBE doctors
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: default@doctors
-number              	int                 	from deserializer   
-first_name          	string              	from deserializer   
-last_name           	string              	from deserializer   
+number              	int                 	                    
+first_name          	string              	                    
+last_name           	string              	                    
 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/doctors.avro' INTO TABLE doctors
 PREHOOK: type: LOAD
 #### A masked pattern was here ####

Modified: hive/branches/llap/ql/src/test/results/clientpositive/avro_partitioned.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/avro_partitioned.q.out?rev=1670534&r1=1670533&r2=1670534&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/avro_partitioned.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/avro_partitioned.q.out Wed Apr  1 01:15:50 2015
@@ -150,27 +150,27 @@ POSTHOOK: Output: default@episodes_parti
 POSTHOOK: Output: default@episodes_partitioned@doctor_pt=5
 POSTHOOK: Output: default@episodes_partitioned@doctor_pt=6
 POSTHOOK: Output: default@episodes_partitioned@doctor_pt=9
-POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=11).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=11).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=11).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=1).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=1).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=1).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=2).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=2).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=2).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=4).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=4).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=4).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=5).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=5).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=5).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=6).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=6).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=6).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=9).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=9).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=9).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:from deserializer), ]
+POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=11).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:initial date), ]
+POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=11).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:main actor playing the Doctor in episode), ]
+POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=11).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:episode title), ]
+POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=1).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:initial date), ]
+POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=1).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:main actor playing the Doctor in episode), ]
+POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=1).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:episode title), ]
+POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=2).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:initial date), ]
+POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=2).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:main actor playing the Doctor in episode), ]
+POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=2).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:episode title), ]
+POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=4).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:initial date), ]
+POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=4).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:main actor playing the Doctor in episode), ]
+POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=4).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:episode title), ]
+POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=5).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:initial date), ]
+POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=5).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:main actor playing the Doctor in episode), ]
+POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=5).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:episode title), ]
+POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=6).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:initial date), ]
+POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=6).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:main actor playing the Doctor in episode), ]
+POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=6).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:episode title), ]
+POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=9).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:initial date), ]
+POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=9).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:main actor playing the Doctor in episode), ]
+POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=9).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:episode title), ]
 PREHOOK: query: SELECT * FROM episodes_partitioned WHERE doctor_pt > 6
 PREHOOK: type: QUERY
 PREHOOK: Input: default@episodes_partitioned
@@ -360,27 +360,27 @@ POSTHOOK: Output: default@episodes_parti
 POSTHOOK: Output: default@episodes_partitioned_serdeproperties@doctor_pt=5
 POSTHOOK: Output: default@episodes_partitioned_serdeproperties@doctor_pt=6
 POSTHOOK: Output: default@episodes_partitioned_serdeproperties@doctor_pt=9
-POSTHOOK: Lineage: episodes_partitioned_serdeproperties PARTITION(doctor_pt=11).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned_serdeproperties PARTITION(doctor_pt=11).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned_serdeproperties PARTITION(doctor_pt=11).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned_serdeproperties PARTITION(doctor_pt=1).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned_serdeproperties PARTITION(doctor_pt=1).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned_serdeproperties PARTITION(doctor_pt=1).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned_serdeproperties PARTITION(doctor_pt=2).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned_serdeproperties PARTITION(doctor_pt=2).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned_serdeproperties PARTITION(doctor_pt=2).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned_serdeproperties PARTITION(doctor_pt=4).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned_serdeproperties PARTITION(doctor_pt=4).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned_serdeproperties PARTITION(doctor_pt=4).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned_serdeproperties PARTITION(doctor_pt=5).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned_serdeproperties PARTITION(doctor_pt=5).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned_serdeproperties PARTITION(doctor_pt=5).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned_serdeproperties PARTITION(doctor_pt=6).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned_serdeproperties PARTITION(doctor_pt=6).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned_serdeproperties PARTITION(doctor_pt=6).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned_serdeproperties PARTITION(doctor_pt=9).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned_serdeproperties PARTITION(doctor_pt=9).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned_serdeproperties PARTITION(doctor_pt=9).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:from deserializer), ]
+POSTHOOK: Lineage: episodes_partitioned_serdeproperties PARTITION(doctor_pt=11).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:initial date), ]
+POSTHOOK: Lineage: episodes_partitioned_serdeproperties PARTITION(doctor_pt=11).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:main actor playing the Doctor in episode), ]
+POSTHOOK: Lineage: episodes_partitioned_serdeproperties PARTITION(doctor_pt=11).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:episode title), ]
+POSTHOOK: Lineage: episodes_partitioned_serdeproperties PARTITION(doctor_pt=1).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:initial date), ]
+POSTHOOK: Lineage: episodes_partitioned_serdeproperties PARTITION(doctor_pt=1).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:main actor playing the Doctor in episode), ]
+POSTHOOK: Lineage: episodes_partitioned_serdeproperties PARTITION(doctor_pt=1).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:episode title), ]
+POSTHOOK: Lineage: episodes_partitioned_serdeproperties PARTITION(doctor_pt=2).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:initial date), ]
+POSTHOOK: Lineage: episodes_partitioned_serdeproperties PARTITION(doctor_pt=2).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:main actor playing the Doctor in episode), ]
+POSTHOOK: Lineage: episodes_partitioned_serdeproperties PARTITION(doctor_pt=2).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:episode title), ]
+POSTHOOK: Lineage: episodes_partitioned_serdeproperties PARTITION(doctor_pt=4).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:initial date), ]
+POSTHOOK: Lineage: episodes_partitioned_serdeproperties PARTITION(doctor_pt=4).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:main actor playing the Doctor in episode), ]
+POSTHOOK: Lineage: episodes_partitioned_serdeproperties PARTITION(doctor_pt=4).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:episode title), ]
+POSTHOOK: Lineage: episodes_partitioned_serdeproperties PARTITION(doctor_pt=5).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:initial date), ]
+POSTHOOK: Lineage: episodes_partitioned_serdeproperties PARTITION(doctor_pt=5).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:main actor playing the Doctor in episode), ]
+POSTHOOK: Lineage: episodes_partitioned_serdeproperties PARTITION(doctor_pt=5).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:episode title), ]
+POSTHOOK: Lineage: episodes_partitioned_serdeproperties PARTITION(doctor_pt=6).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:initial date), ]
+POSTHOOK: Lineage: episodes_partitioned_serdeproperties PARTITION(doctor_pt=6).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:main actor playing the Doctor in episode), ]
+POSTHOOK: Lineage: episodes_partitioned_serdeproperties PARTITION(doctor_pt=6).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:episode title), ]
+POSTHOOK: Lineage: episodes_partitioned_serdeproperties PARTITION(doctor_pt=9).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:initial date), ]
+POSTHOOK: Lineage: episodes_partitioned_serdeproperties PARTITION(doctor_pt=9).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:main actor playing the Doctor in episode), ]
+POSTHOOK: Lineage: episodes_partitioned_serdeproperties PARTITION(doctor_pt=9).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:episode title), ]
 PREHOOK: query: -- Evolve the table schema by adding new array field "cast_and_crew"
 ALTER TABLE episodes_partitioned_serdeproperties
 SET SERDE 'org.apache.hadoop.hive.serde2.avro.AvroSerDe'

Modified: hive/branches/llap/ql/src/test/results/clientpositive/avro_partitioned_native.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/avro_partitioned_native.q.out?rev=1670534&r1=1670533&r2=1670534&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/avro_partitioned_native.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/avro_partitioned_native.q.out Wed Apr  1 01:15:50 2015
@@ -60,27 +60,27 @@ POSTHOOK: Output: default@episodes_parti
 POSTHOOK: Output: default@episodes_partitioned@doctor_pt=5
 POSTHOOK: Output: default@episodes_partitioned@doctor_pt=6
 POSTHOOK: Output: default@episodes_partitioned@doctor_pt=9
-POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=11).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=11).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=11).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=1).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=1).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=1).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=2).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=2).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=2).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=4).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=4).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=4).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=5).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=5).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=5).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=6).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=6).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=6).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=9).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=9).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:from deserializer), ]
-POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=9).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:from deserializer), ]
+POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=11).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:initial date), ]
+POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=11).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:main actor playing the Doctor in episode), ]
+POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=11).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:episode title), ]
+POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=1).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:initial date), ]
+POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=1).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:main actor playing the Doctor in episode), ]
+POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=1).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:episode title), ]
+POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=2).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:initial date), ]
+POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=2).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:main actor playing the Doctor in episode), ]
+POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=2).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:episode title), ]
+POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=4).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:initial date), ]
+POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=4).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:main actor playing the Doctor in episode), ]
+POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=4).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:episode title), ]
+POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=5).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:initial date), ]
+POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=5).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:main actor playing the Doctor in episode), ]
+POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=5).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:episode title), ]
+POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=6).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:initial date), ]
+POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=6).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:main actor playing the Doctor in episode), ]
+POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=6).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:episode title), ]
+POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=9).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:initial date), ]
+POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=9).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:main actor playing the Doctor in episode), ]
+POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=9).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:episode title), ]
 PREHOOK: query: SELECT * FROM episodes_partitioned WHERE doctor_pt > 6
 PREHOOK: type: QUERY
 PREHOOK: Input: default@episodes_partitioned

Modified: hive/branches/llap/ql/src/test/results/clientpositive/avro_sanity_test.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/avro_sanity_test.q.out?rev=1670534&r1=1670533&r2=1670534&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/avro_sanity_test.q.out (original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/avro_sanity_test.q.out Wed Apr  1 01:15:50 2015
@@ -72,9 +72,9 @@ PREHOOK: Input: default@doctors
 POSTHOOK: query: DESCRIBE doctors
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Input: default@doctors
-number              	int                 	from deserializer   
-first_name          	string              	from deserializer   
-last_name           	string              	from deserializer   
+number              	int                 	Order of playing the role
+first_name          	string              	first name of actor playing role
+last_name           	string              	last name of actor playing role
 PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/doctors.avro' INTO TABLE doctors
 PREHOOK: type: LOAD
 #### A masked pattern was here ####



Mime
View raw message