You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by xu...@apache.org on 2015/02/12 22:34:20 UTC

svn commit: r1659410 [1/6] - in /hive/trunk: accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/ accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/ accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/mr/ accumulo-handler/src/...

Author: xuefu
Date: Thu Feb 12 21:34:18 2015
New Revision: 1659410

URL: http://svn.apache.org/r1659410
Log:
HIVE-9500: Support nested structs over 24 levels (Aihua via Xuefu)

Modified:
    hive/trunk/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/AccumuloRowSerializer.java
    hive/trunk/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/AccumuloSerDe.java
    hive/trunk/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/AccumuloSerDeParameters.java
    hive/trunk/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/DefaultAccumuloRowIdFactory.java
    hive/trunk/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/TestLazyAccumuloRow.java
    hive/trunk/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/mr/TestHiveAccumuloTableOutputFormat.java
    hive/trunk/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/TestAccumuloRowSerializer.java
    hive/trunk/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/TestAccumuloSerDe.java
    hive/trunk/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/TestDefaultAccumuloRowIdFactory.java
    hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/MultiDelimitSerDe.java
    hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/DefaultHBaseKeyFactory.java
    hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseLazyObjectFactory.java
    hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseRowSerializer.java
    hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDe.java
    hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDeParameters.java
    hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/struct/DefaultHBaseValueFactory.java
    hive/trunk/hbase-handler/src/test/org/apache/hadoop/hive/hbase/TestHBaseSerDe.java
    hive/trunk/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/DelimitedInputWriter.java
    hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/index/HiveIndexResult.java
    hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PlanUtils.java
    hive/trunk/ql/src/test/results/clientpositive/alter_partition_coltype.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_2.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_3.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_4.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_7.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_8.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucket_map_join_1.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucket_map_join_2.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucket_map_join_spark4.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketcontext_1.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketcontext_2.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketcontext_3.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketcontext_4.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketcontext_5.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketcontext_6.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketcontext_7.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketcontext_8.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin10.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin11.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin12.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin13.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin7.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin8.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin9.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out
    hive/trunk/ql/src/test/results/clientpositive/columnstats_partlvl.q.out
    hive/trunk/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out
    hive/trunk/ql/src/test/results/clientpositive/combine2.q.out
    hive/trunk/ql/src/test/results/clientpositive/combine2_hadoop20.q.out
    hive/trunk/ql/src/test/results/clientpositive/combine2_win.q.out
    hive/trunk/ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out
    hive/trunk/ql/src/test/results/clientpositive/display_colstats_tbllvl.q.out
    hive/trunk/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out
    hive/trunk/ql/src/test/results/clientpositive/encrypted/encryption_join_with_different_encryption_keys.q.out
    hive/trunk/ql/src/test/results/clientpositive/filter_join_breaktask.q.out
    hive/trunk/ql/src/test/results/clientpositive/groupby_sort_1.q.out
    hive/trunk/ql/src/test/results/clientpositive/groupby_sort_1_23.q.out
    hive/trunk/ql/src/test/results/clientpositive/groupby_sort_skew_1.q.out
    hive/trunk/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out
    hive/trunk/ql/src/test/results/clientpositive/input23.q.out
    hive/trunk/ql/src/test/results/clientpositive/input42.q.out
    hive/trunk/ql/src/test/results/clientpositive/input_part7.q.out
    hive/trunk/ql/src/test/results/clientpositive/input_part9.q.out
    hive/trunk/ql/src/test/results/clientpositive/join_filters_overlap.q.out
    hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_1.q.out
    hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_11.q.java1.7.out
    hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_12.q.java1.7.out
    hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_13.q.java1.7.out
    hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_14.q.out
    hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_2.q.java1.7.out
    hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_3.q.out
    hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_4.q.java1.7.out
    hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_5.q.java1.7.out
    hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_9.q.java1.7.out
    hive/trunk/ql/src/test/results/clientpositive/list_bucket_query_multiskew_1.q.out
    hive/trunk/ql/src/test/results/clientpositive/list_bucket_query_multiskew_2.q.out
    hive/trunk/ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out
    hive/trunk/ql/src/test/results/clientpositive/list_bucket_query_oneskew_1.q.out
    hive/trunk/ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out
    hive/trunk/ql/src/test/results/clientpositive/list_bucket_query_oneskew_3.q.out
    hive/trunk/ql/src/test/results/clientpositive/louter_join_ppr.q.out
    hive/trunk/ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out
    hive/trunk/ql/src/test/results/clientpositive/metadataonly1.q.out
    hive/trunk/ql/src/test/results/clientpositive/optimize_nullscan.q.out
    hive/trunk/ql/src/test/results/clientpositive/outer_join_ppr.q.java1.7.out
    hive/trunk/ql/src/test/results/clientpositive/pcr.q.out
    hive/trunk/ql/src/test/results/clientpositive/ppd_join_filter.q.out
    hive/trunk/ql/src/test/results/clientpositive/ppd_union_view.q.out
    hive/trunk/ql/src/test/results/clientpositive/ppd_vc.q.out
    hive/trunk/ql/src/test/results/clientpositive/ppr_allchildsarenull.q.out
    hive/trunk/ql/src/test/results/clientpositive/push_or.q.out
    hive/trunk/ql/src/test/results/clientpositive/rand_partitionpruner1.q.out
    hive/trunk/ql/src/test/results/clientpositive/rand_partitionpruner3.q.out
    hive/trunk/ql/src/test/results/clientpositive/regexp_extract.q.out
    hive/trunk/ql/src/test/results/clientpositive/router_join_ppr.q.out
    hive/trunk/ql/src/test/results/clientpositive/sample10.q.out
    hive/trunk/ql/src/test/results/clientpositive/sample6.q.out
    hive/trunk/ql/src/test/results/clientpositive/sample8.q.out
    hive/trunk/ql/src/test/results/clientpositive/sample9.q.out
    hive/trunk/ql/src/test/results/clientpositive/serde_user_properties.q.out
    hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin_11.q.out
    hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin_13.q.out
    hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin_15.q.out
    hive/trunk/ql/src/test/results/clientpositive/sort_merge_join_desc_5.q.out
    hive/trunk/ql/src/test/results/clientpositive/sort_merge_join_desc_6.q.out
    hive/trunk/ql/src/test/results/clientpositive/sort_merge_join_desc_7.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/auto_join_reordering_values.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_1.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_11.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_12.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_2.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_3.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_4.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_5.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_7.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_8.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/bucket_map_join_1.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/bucket_map_join_2.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/bucket_map_join_spark4.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/bucketmapjoin10.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/bucketmapjoin11.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/bucketmapjoin12.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/bucketmapjoin13.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/bucketmapjoin7.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/bucketmapjoin8.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/bucketmapjoin9.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/bucketmapjoin_negative3.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/filter_join_breaktask.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/groupby_sort_skew_1_23.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/join_filters_overlap.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/louter_join_ppr.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/mapjoin_mapjoin.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/optimize_nullscan.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/outer_join_ppr.q.java1.7.out
    hive/trunk/ql/src/test/results/clientpositive/spark/outer_join_ppr.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/pcr.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/ppd_join_filter.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/router_join_ppr.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/sample10.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/sample6.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/sample8.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/smb_mapjoin_13.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/smb_mapjoin_15.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/sort_merge_join_desc_5.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/sort_merge_join_desc_6.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/sort_merge_join_desc_7.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/transform_ppr1.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/transform_ppr2.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/union_ppr.q.out
    hive/trunk/ql/src/test/results/clientpositive/spark/vectorized_ptf.q.out
    hive/trunk/ql/src/test/results/clientpositive/temp_table_display_colstats_tbllvl.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_1.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_11.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_12.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_2.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_3.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_4.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_5.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_7.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_8.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/filter_join_breaktask.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/mapjoin_mapjoin.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/metadataonly1.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/optimize_nullscan.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/transform_ppr1.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/transform_ppr2.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/unionDistinct_1.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/vectorized_ptf.q.out
    hive/trunk/ql/src/test/results/clientpositive/transform_ppr1.q.out
    hive/trunk/ql/src/test/results/clientpositive/transform_ppr2.q.out
    hive/trunk/ql/src/test/results/clientpositive/truncate_column_list_bucket.q.out
    hive/trunk/ql/src/test/results/clientpositive/udf_explode.q.out
    hive/trunk/ql/src/test/results/clientpositive/udtf_explode.q.out
    hive/trunk/ql/src/test/results/clientpositive/union24.q.out
    hive/trunk/ql/src/test/results/clientpositive/unionDistinct_1.q.out
    hive/trunk/ql/src/test/results/clientpositive/union_ppr.q.out
    hive/trunk/ql/src/test/results/clientpositive/vectorized_ptf.q.out
    hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/DelimitedJSONSerDe.java
    hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/columnar/ColumnarSerDe.java
    hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/columnar/LazyBinaryColumnarSerDe.java
    hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyFactory.java
    hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySimpleSerDe.java
    hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyUtils.java
    hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/lazy/TestLazyArrayMapStruct.java
    hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/lazy/TestLazySimpleSerDe.java
    hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestCrossMapEqualComparer.java
    hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestSimpleMapEqualComparer.java

Modified: hive/trunk/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/AccumuloRowSerializer.java
URL: http://svn.apache.org/viewvc/hive/trunk/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/AccumuloRowSerializer.java?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/AccumuloRowSerializer.java (original)
+++ hive/trunk/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/AccumuloRowSerializer.java Thu Feb 12 21:34:18 2015
@@ -30,8 +30,8 @@ import org.apache.hadoop.hive.accumulo.c
 import org.apache.hadoop.hive.serde2.ByteStream;
 import org.apache.hadoop.hive.serde2.SerDeException;
 import org.apache.hadoop.hive.serde2.SerDeUtils;
-import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe.SerDeParameters;
 import org.apache.hadoop.hive.serde2.lazy.LazyUtils;
+import org.apache.hadoop.hive.serde2.lazy.LazySerDeParameters;
 import org.apache.hadoop.hive.serde2.objectinspector.ListObjectInspector;
 import org.apache.hadoop.hive.serde2.objectinspector.MapObjectInspector;
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
@@ -56,12 +56,12 @@ public class AccumuloRowSerializer {
 
   private final int rowIdOffset;
   private final ByteStream.Output output;
-  private final SerDeParameters serDeParams;
+  private final LazySerDeParameters serDeParams;
   private final List<ColumnMapping> mappings;
   private final ColumnVisibility visibility;
   private final AccumuloRowIdFactory rowIdFactory;
 
-  public AccumuloRowSerializer(int primaryKeyOffset, SerDeParameters serDeParams,
+  public AccumuloRowSerializer(int primaryKeyOffset, LazySerDeParameters serDeParams,
       List<ColumnMapping> mappings, ColumnVisibility visibility, AccumuloRowIdFactory rowIdFactory) {
     Preconditions.checkArgument(primaryKeyOffset >= 0,
         "A valid offset to the mapping for the Accumulo RowID is required, received "
@@ -254,7 +254,7 @@ public class AccumuloRowSerializer {
 
   /**
    * Recursively serialize an Object using its {@link ObjectInspector}, respecting the
-   * separators defined by the {@link SerDeParameters}.
+   * separators defined by the {@link LazySerDeParameters}.
    * @param oi ObjectInspector for the current object
    * @param value The current object
    * @param output A buffer output is written to

Modified: hive/trunk/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/AccumuloSerDe.java
URL: http://svn.apache.org/viewvc/hive/trunk/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/AccumuloSerDe.java?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/AccumuloSerDe.java (original)
+++ hive/trunk/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/AccumuloSerDe.java Thu Feb 12 21:34:18 2015
@@ -32,7 +32,7 @@ import org.apache.hadoop.hive.serde2.Ser
 import org.apache.hadoop.hive.serde2.SerDeException;
 import org.apache.hadoop.hive.serde2.SerDeStats;
 import org.apache.hadoop.hive.serde2.lazy.LazyFactory;
-import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe.SerDeParameters;
+import org.apache.hadoop.hive.serde2.lazy.LazySerDeParameters;
 import org.apache.hadoop.hive.serde2.lazy.objectinspector.LazyObjectInspectorFactory;
 import org.apache.hadoop.hive.serde2.lazy.objectinspector.LazySimpleStructObjectInspector;
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
@@ -57,7 +57,7 @@ public class AccumuloSerDe implements Se
   public void initialize(Configuration conf, Properties properties) throws SerDeException {
     accumuloSerDeParameters = new AccumuloSerDeParameters(conf, properties, getClass().getName());
 
-    final SerDeParameters serDeParams = accumuloSerDeParameters.getSerDeParameters();
+    final LazySerDeParameters serDeParams = accumuloSerDeParameters.getSerDeParameters();
     final List<ColumnMapping> mappings = accumuloSerDeParameters.getColumnMappings();
     final List<TypeInfo> columnTypes = accumuloSerDeParameters.getHiveColumnTypes();
     final AccumuloRowIdFactory factory = accumuloSerDeParameters.getRowIdFactory();
@@ -83,7 +83,7 @@ public class AccumuloSerDe implements Se
   }
 
   protected ArrayList<ObjectInspector> getColumnObjectInspectors(List<TypeInfo> columnTypes,
-      SerDeParameters serDeParams, List<ColumnMapping> mappings, AccumuloRowIdFactory factory)
+      LazySerDeParameters serDeParams, List<ColumnMapping> mappings, AccumuloRowIdFactory factory)
       throws SerDeException {
     ArrayList<ObjectInspector> columnObjectInspectors = new ArrayList<ObjectInspector>(
         columnTypes.size());

Modified: hive/trunk/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/AccumuloSerDeParameters.java
URL: http://svn.apache.org/viewvc/hive/trunk/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/AccumuloSerDeParameters.java?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/AccumuloSerDeParameters.java (original)
+++ hive/trunk/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/AccumuloSerDeParameters.java Thu Feb 12 21:34:18 2015
@@ -30,8 +30,7 @@ import org.apache.hadoop.hive.accumulo.c
 import org.apache.hadoop.hive.accumulo.columns.HiveAccumuloRowIdColumnMapping;
 import org.apache.hadoop.hive.serde.serdeConstants;
 import org.apache.hadoop.hive.serde2.SerDeException;
-import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe;
-import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe.SerDeParameters;
+import org.apache.hadoop.hive.serde2.lazy.LazySerDeParameters;
 import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo;
 import org.apache.hadoop.util.ReflectionUtils;
 import org.apache.log4j.Logger;
@@ -62,7 +61,7 @@ public class AccumuloSerDeParameters ext
 
   private Properties tableProperties;
   private String serdeName;
-  private SerDeParameters lazySerDeParameters;
+  private LazySerDeParameters lazySerDeParameters;
   private AccumuloRowIdFactory rowIdFactory;
 
   public AccumuloSerDeParameters(Configuration conf, Properties tableProperties, String serdeName)
@@ -71,7 +70,7 @@ public class AccumuloSerDeParameters ext
     this.tableProperties = tableProperties;
     this.serdeName = serdeName;
 
-    lazySerDeParameters = LazySimpleSerDe.initSerdeParams(conf, tableProperties, serdeName);
+    lazySerDeParameters = new LazySerDeParameters(conf, tableProperties, serdeName);
 
     // The default encoding for this table when not otherwise specified
     String defaultStorage = tableProperties.getProperty(DEFAULT_STORAGE_TYPE);
@@ -134,7 +133,7 @@ public class AccumuloSerDeParameters ext
     return new DefaultAccumuloRowIdFactory();
   }
 
-  public SerDeParameters getSerDeParameters() {
+  public LazySerDeParameters getSerDeParameters() {
     return lazySerDeParameters;
   }
 

Modified: hive/trunk/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/DefaultAccumuloRowIdFactory.java
URL: http://svn.apache.org/viewvc/hive/trunk/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/DefaultAccumuloRowIdFactory.java?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/DefaultAccumuloRowIdFactory.java (original)
+++ hive/trunk/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/DefaultAccumuloRowIdFactory.java Thu Feb 12 21:34:18 2015
@@ -29,7 +29,7 @@ import org.apache.hadoop.hive.serde2.Byt
 import org.apache.hadoop.hive.serde2.SerDeException;
 import org.apache.hadoop.hive.serde2.lazy.LazyFactory;
 import org.apache.hadoop.hive.serde2.lazy.LazyObjectBase;
-import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe;
+import org.apache.hadoop.hive.serde2.lazy.LazySerDeParameters;
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
 import org.apache.hadoop.hive.serde2.objectinspector.StructField;
 import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo;
@@ -42,7 +42,7 @@ import org.apache.hadoop.hive.serde2.typ
 public class DefaultAccumuloRowIdFactory implements AccumuloRowIdFactory {
 
   protected AccumuloSerDeParameters accumuloSerDeParams;
-  protected LazySimpleSerDe.SerDeParameters serdeParams;
+  protected LazySerDeParameters serdeParams;
   protected Properties properties;
   protected HiveAccumuloRowIdColumnMapping rowIdMapping;
   protected AccumuloRowSerializer serializer;

Modified: hive/trunk/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/TestLazyAccumuloRow.java
URL: http://svn.apache.org/viewvc/hive/trunk/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/TestLazyAccumuloRow.java?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/TestLazyAccumuloRow.java (original)
+++ hive/trunk/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/TestLazyAccumuloRow.java Thu Feb 12 21:34:18 2015
@@ -33,7 +33,7 @@ import org.apache.hadoop.hive.serde2.Ser
 import org.apache.hadoop.hive.serde2.SerDeUtils;
 import org.apache.hadoop.hive.serde2.lazy.LazyFactory;
 import org.apache.hadoop.hive.serde2.lazy.LazyInteger;
-import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe;
+import org.apache.hadoop.hive.serde2.lazy.LazySerDeParameters;
 import org.apache.hadoop.hive.serde2.lazy.LazyString;
 import org.apache.hadoop.hive.serde2.lazy.objectinspector.LazySimpleStructObjectInspector;
 import org.apache.hadoop.hive.serde2.lazydio.LazyDioInteger;
@@ -58,7 +58,7 @@ public class TestLazyAccumuloRow {
         TypeInfoFactory.intTypeInfo, TypeInfoFactory.intTypeInfo, TypeInfoFactory.intTypeInfo);
 
     LazySimpleStructObjectInspector objectInspector = (LazySimpleStructObjectInspector) LazyFactory
-        .createLazyStructInspector(columns, types, LazySimpleSerDe.DefaultSeparators, new Text(
+        .createLazyStructInspector(columns, types, LazySerDeParameters.DefaultSeparators, new Text(
             "\\N"), false, false, (byte) '\\');
 
     DefaultAccumuloRowIdFactory rowIdFactory = new DefaultAccumuloRowIdFactory();
@@ -119,7 +119,7 @@ public class TestLazyAccumuloRow {
         TypeInfoFactory.intTypeInfo, TypeInfoFactory.intTypeInfo, TypeInfoFactory.intTypeInfo);
 
     LazySimpleStructObjectInspector objectInspector = (LazySimpleStructObjectInspector) LazyFactory
-        .createLazyStructInspector(columns, types, LazySimpleSerDe.DefaultSeparators, new Text(
+        .createLazyStructInspector(columns, types, LazySerDeParameters.DefaultSeparators, new Text(
             "\\N"), false, false, (byte) '\\');
 
     DefaultAccumuloRowIdFactory rowIdFactory = new DefaultAccumuloRowIdFactory();
@@ -202,7 +202,7 @@ public class TestLazyAccumuloRow {
         TypeInfoFactory.getPrimitiveTypeInfo(serdeConstants.STRING_TYPE_NAME));
 
     LazySimpleStructObjectInspector objectInspector = (LazySimpleStructObjectInspector) LazyFactory
-        .createLazyStructInspector(columns, types, LazySimpleSerDe.DefaultSeparators, new Text(
+        .createLazyStructInspector(columns, types, LazySerDeParameters.DefaultSeparators, new Text(
             "\\N"), false, false, (byte) '\\');
 
     DefaultAccumuloRowIdFactory rowIdFactory = new DefaultAccumuloRowIdFactory();

Modified: hive/trunk/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/mr/TestHiveAccumuloTableOutputFormat.java
URL: http://svn.apache.org/viewvc/hive/trunk/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/mr/TestHiveAccumuloTableOutputFormat.java?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/mr/TestHiveAccumuloTableOutputFormat.java (original)
+++ hive/trunk/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/mr/TestHiveAccumuloTableOutputFormat.java Thu Feb 12 21:34:18 2015
@@ -43,7 +43,7 @@ import org.apache.hadoop.hive.accumulo.s
 import org.apache.hadoop.hive.serde.serdeConstants;
 import org.apache.hadoop.hive.serde2.lazy.ByteArrayRef;
 import org.apache.hadoop.hive.serde2.lazy.LazyFactory;
-import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe.SerDeParameters;
+import org.apache.hadoop.hive.serde2.lazy.LazySerDeParameters;
 import org.apache.hadoop.hive.serde2.lazy.LazyStruct;
 import org.apache.hadoop.hive.serde2.lazy.objectinspector.LazyMapObjectInspector;
 import org.apache.hadoop.hive.serde2.lazy.objectinspector.LazyObjectInspectorFactory;
@@ -150,7 +150,7 @@ public class TestHiveAccumuloTableOutput
     tableProperties.setProperty(serdeConstants.LIST_COLUMN_TYPES, Joiner.on(',').join(types));
     AccumuloSerDeParameters accumuloSerDeParams = new AccumuloSerDeParameters(new Configuration(),
         tableProperties, AccumuloSerDe.class.getSimpleName());
-    SerDeParameters serDeParams = accumuloSerDeParams.getSerDeParameters();
+    LazySerDeParameters serDeParams = accumuloSerDeParams.getSerDeParameters();
 
     AccumuloRowSerializer serializer = new AccumuloRowSerializer(0, serDeParams,
         accumuloSerDeParams.getColumnMappings(), AccumuloSerDeParameters.DEFAULT_VISIBILITY_LABEL,
@@ -243,7 +243,7 @@ public class TestHiveAccumuloTableOutput
     tableProperties.setProperty(serdeConstants.LIST_COLUMN_TYPES, Joiner.on(',').join(types));
     AccumuloSerDeParameters accumuloSerDeParams = new AccumuloSerDeParameters(new Configuration(),
         tableProperties, AccumuloSerDe.class.getSimpleName());
-    SerDeParameters serDeParams = accumuloSerDeParams.getSerDeParameters();
+    LazySerDeParameters serDeParams = accumuloSerDeParams.getSerDeParameters();
 
     AccumuloRowSerializer serializer = new AccumuloRowSerializer(0, serDeParams,
         accumuloSerDeParams.getColumnMappings(), new ColumnVisibility("foo"),
@@ -332,7 +332,7 @@ public class TestHiveAccumuloTableOutput
     tableProperties.setProperty(serdeConstants.LIST_COLUMN_TYPES, Joiner.on(',').join(types));
     AccumuloSerDeParameters accumuloSerDeParams = new AccumuloSerDeParameters(new Configuration(),
         tableProperties, AccumuloSerDe.class.getSimpleName());
-    SerDeParameters serDeParams = accumuloSerDeParams.getSerDeParameters();
+    LazySerDeParameters serDeParams = accumuloSerDeParams.getSerDeParameters();
 
     AccumuloRowSerializer serializer = new AccumuloRowSerializer(0, serDeParams,
         accumuloSerDeParams.getColumnMappings(), AccumuloSerDeParameters.DEFAULT_VISIBILITY_LABEL,
@@ -432,7 +432,7 @@ public class TestHiveAccumuloTableOutput
     tableProperties.setProperty(AccumuloSerDeParameters.DEFAULT_STORAGE_TYPE, ColumnEncoding.BINARY.getName());
     AccumuloSerDeParameters accumuloSerDeParams = new AccumuloSerDeParameters(new Configuration(),
         tableProperties, AccumuloSerDe.class.getSimpleName());
-    SerDeParameters serDeParams = accumuloSerDeParams.getSerDeParameters();
+    LazySerDeParameters serDeParams = accumuloSerDeParams.getSerDeParameters();
 
     AccumuloRowSerializer serializer = new AccumuloRowSerializer(0, serDeParams,
         accumuloSerDeParams.getColumnMappings(), AccumuloSerDeParameters.DEFAULT_VISIBILITY_LABEL,

Modified: hive/trunk/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/TestAccumuloRowSerializer.java
URL: http://svn.apache.org/viewvc/hive/trunk/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/TestAccumuloRowSerializer.java?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/TestAccumuloRowSerializer.java (original)
+++ hive/trunk/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/TestAccumuloRowSerializer.java Thu Feb 12 21:34:18 2015
@@ -35,7 +35,7 @@ import org.apache.hadoop.hive.serde2.Byt
 import org.apache.hadoop.hive.serde2.SerDeException;
 import org.apache.hadoop.hive.serde2.lazy.ByteArrayRef;
 import org.apache.hadoop.hive.serde2.lazy.LazyFactory;
-import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe.SerDeParameters;
+import org.apache.hadoop.hive.serde2.lazy.LazySerDeParameters;
 import org.apache.hadoop.hive.serde2.lazy.LazyStruct;
 import org.apache.hadoop.hive.serde2.lazy.objectinspector.LazyMapObjectInspector;
 import org.apache.hadoop.hive.serde2.lazy.objectinspector.LazyObjectInspectorFactory;
@@ -109,7 +109,7 @@ public class TestAccumuloRowSerializer {
     tableProperties.setProperty(serdeConstants.LIST_COLUMN_TYPES, Joiner.on(',').join(typeNames));
     AccumuloSerDeParameters accumuloSerDeParams = new AccumuloSerDeParameters(new Configuration(),
         tableProperties, AccumuloSerDe.class.getSimpleName());
-    SerDeParameters serDeParams = accumuloSerDeParams.getSerDeParameters();
+    LazySerDeParameters serDeParams = accumuloSerDeParams.getSerDeParameters();
 
     LazySimpleStructObjectInspector oi = (LazySimpleStructObjectInspector) LazyFactory
         .createLazyStructInspector(columns, types, serDeParams.getSeparators(),
@@ -178,7 +178,7 @@ public class TestAccumuloRowSerializer {
     tableProperties.setProperty(serdeConstants.LIST_COLUMN_TYPES, Joiner.on(',').join(typeNames));
     AccumuloSerDeParameters accumuloSerDeParams = new AccumuloSerDeParameters(new Configuration(),
         tableProperties, AccumuloSerDe.class.getSimpleName());
-    SerDeParameters serDeParams = accumuloSerDeParams.getSerDeParameters();
+    LazySerDeParameters serDeParams = accumuloSerDeParams.getSerDeParameters();
 
     LazySimpleStructObjectInspector oi = (LazySimpleStructObjectInspector) LazyFactory
         .createLazyStructInspector(columns, types, serDeParams.getSeparators(),
@@ -251,7 +251,7 @@ public class TestAccumuloRowSerializer {
     tableProperties.setProperty(serdeConstants.LIST_COLUMN_TYPES, Joiner.on(',').join(typeNames));
     AccumuloSerDeParameters accumuloSerDeParams = new AccumuloSerDeParameters(new Configuration(),
         tableProperties, AccumuloSerDe.class.getSimpleName());
-    SerDeParameters serDeParams = accumuloSerDeParams.getSerDeParameters();
+    LazySerDeParameters serDeParams = accumuloSerDeParams.getSerDeParameters();
 
     TypeInfo stringTypeInfo = TypeInfoFactory.getPrimitiveTypeInfo(serdeConstants.STRING_TYPE_NAME);
     LazyStringObjectInspector stringOI = (LazyStringObjectInspector) LazyFactory

Modified: hive/trunk/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/TestAccumuloSerDe.java
URL: http://svn.apache.org/viewvc/hive/trunk/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/TestAccumuloSerDe.java?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/TestAccumuloSerDe.java (original)
+++ hive/trunk/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/TestAccumuloSerDe.java Thu Feb 12 21:34:18 2015
@@ -44,7 +44,7 @@ import org.apache.hadoop.hive.serde2.laz
 import org.apache.hadoop.hive.serde2.lazy.LazyArray;
 import org.apache.hadoop.hive.serde2.lazy.LazyFactory;
 import org.apache.hadoop.hive.serde2.lazy.LazyMap;
-import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe.SerDeParameters;
+import org.apache.hadoop.hive.serde2.lazy.LazySerDeParameters;
 import org.apache.hadoop.hive.serde2.lazy.LazyString;
 import org.apache.hadoop.hive.serde2.lazy.LazyStruct;
 import org.apache.hadoop.hive.serde2.lazy.objectinspector.LazyMapObjectInspector;
@@ -389,7 +389,7 @@ public class TestAccumuloSerDe {
     tableProperties.setProperty(serdeConstants.LIST_COLUMN_TYPES, Joiner.on(',').join(types));
     AccumuloSerDeParameters accumuloSerDeParams = new AccumuloSerDeParameters(new Configuration(),
         tableProperties, AccumuloSerDe.class.getSimpleName());
-    SerDeParameters serDeParams = accumuloSerDeParams.getSerDeParameters();
+    LazySerDeParameters serDeParams = accumuloSerDeParams.getSerDeParameters();
 
     byte[] seps = serDeParams.getSeparators();
 

Modified: hive/trunk/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/TestDefaultAccumuloRowIdFactory.java
URL: http://svn.apache.org/viewvc/hive/trunk/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/TestDefaultAccumuloRowIdFactory.java?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/TestDefaultAccumuloRowIdFactory.java (original)
+++ hive/trunk/accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/TestDefaultAccumuloRowIdFactory.java Thu Feb 12 21:34:18 2015
@@ -25,7 +25,7 @@ import org.apache.hadoop.hive.accumulo.c
 import org.apache.hadoop.hive.serde.serdeConstants;
 import org.apache.hadoop.hive.serde2.SerDeException;
 import org.apache.hadoop.hive.serde2.lazy.LazyObjectBase;
-import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe.SerDeParameters;
+import org.apache.hadoop.hive.serde2.lazy.LazySerDeParameters;
 import org.apache.hadoop.hive.serde2.lazy.LazyString;
 import org.apache.hadoop.hive.serde2.lazy.objectinspector.LazyMapObjectInspector;
 import org.apache.hadoop.hive.serde2.lazy.objectinspector.LazySimpleStructObjectInspector;
@@ -33,8 +33,6 @@ import org.apache.hadoop.hive.serde2.laz
 import org.apache.hadoop.hive.serde2.lazy.objectinspector.primitive.LazyPrimitiveObjectInspectorFactory;
 import org.apache.hadoop.hive.serde2.lazy.objectinspector.primitive.LazyStringObjectInspector;
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.primitive.JavaStringObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory;
 import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo;
 import org.junit.Assert;
 import org.junit.Test;
@@ -60,7 +58,7 @@ public class TestDefaultAccumuloRowIdFac
     AccumuloRowIdFactory factory = accumuloSerDe.getParams().getRowIdFactory();
     List<TypeInfo> columnTypes = accumuloSerDe.getParams().getHiveColumnTypes();
     ColumnMapper mapper = accumuloSerDe.getParams().getColumnMapper();
-    SerDeParameters serDeParams = accumuloSerDe.getParams().getSerDeParameters();
+    LazySerDeParameters serDeParams = accumuloSerDe.getParams().getSerDeParameters();
 
     List<ObjectInspector> OIs = accumuloSerDe.getColumnObjectInspectors(columnTypes, serDeParams, mapper.getColumnMappings(), factory);
 
@@ -85,7 +83,7 @@ public class TestDefaultAccumuloRowIdFac
     AccumuloRowIdFactory factory = accumuloSerDe.getParams().getRowIdFactory();
     List<TypeInfo> columnTypes = accumuloSerDe.getParams().getHiveColumnTypes();
     ColumnMapper mapper = accumuloSerDe.getParams().getColumnMapper();
-    SerDeParameters serDeParams = accumuloSerDe.getParams().getSerDeParameters();
+    LazySerDeParameters serDeParams = accumuloSerDe.getParams().getSerDeParameters();
 
     List<ObjectInspector> OIs = accumuloSerDe.getColumnObjectInspectors(columnTypes, serDeParams, mapper.getColumnMappings(), factory);
 

Modified: hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/MultiDelimitSerDe.java
URL: http://svn.apache.org/viewvc/hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/MultiDelimitSerDe.java?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/MultiDelimitSerDe.java (original)
+++ hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/MultiDelimitSerDe.java Thu Feb 12 21:34:18 2015
@@ -35,6 +35,7 @@ import org.apache.hadoop.hive.serde2.laz
 import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe;
 import org.apache.hadoop.hive.serde2.lazy.LazyStruct;
 import org.apache.hadoop.hive.serde2.lazy.LazyUtils;
+import org.apache.hadoop.hive.serde2.lazy.LazySerDeParameters;
 import org.apache.hadoop.hive.serde2.objectinspector.ListObjectInspector;
 import org.apache.hadoop.hive.serde2.objectinspector.MapObjectInspector;
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
@@ -62,7 +63,8 @@ import org.apache.hadoop.io.Writable;
     serdeConstants.SERIALIZATION_LAST_COLUMN_TAKES_REST,
     serdeConstants.ESCAPE_CHAR,
     serdeConstants.SERIALIZATION_ENCODING,
-    LazySimpleSerDe.SERIALIZATION_EXTEND_NESTING_LEVELS})
+    LazySerDeParameters.SERIALIZATION_EXTEND_NESTING_LEVELS,
+    LazySerDeParameters.SERIALIZATION_EXTEND_ADDITIONAL_NESTING_LEVELS})
 public class MultiDelimitSerDe extends AbstractSerDe {
   private static final Log LOG = LogFactory.getLog(MultiDelimitSerDe.class.getName());
   private static final byte[] DEFAULT_SEPARATORS = {(byte) 1, (byte) 2, (byte) 3};
@@ -85,7 +87,7 @@ public class MultiDelimitSerDe extends A
   // The wrapper for byte array
   private ByteArrayRef byteArrayRef;
 
-  private LazySimpleSerDe.SerDeParameters serdeParams = null;
+  private LazySerDeParameters serdeParams = null;
   // The output stream of serialized objects
   private final ByteStream.Output serializeStream = new ByteStream.Output();
   // The Writable to return in serialize
@@ -94,7 +96,7 @@ public class MultiDelimitSerDe extends A
   @Override
   public void initialize(Configuration conf, Properties tbl) throws SerDeException {
     // get the SerDe parameters
-    serdeParams = LazySimpleSerDe.initSerdeParams(conf, tbl, getClass().getName());
+    serdeParams = new LazySerDeParameters(conf, tbl, getClass().getName());
 
     fieldDelimited = tbl.getProperty(serdeConstants.FIELD_DELIM);
     if (fieldDelimited == null || fieldDelimited.isEmpty()) {
@@ -103,12 +105,12 @@ public class MultiDelimitSerDe extends A
 
     // get the collection separator and map key separator
     // TODO: use serdeConstants.COLLECTION_DELIM when the typo is fixed
-    collSep = LazySimpleSerDe.getByte(tbl.getProperty(COLLECTION_DELIM),
+    collSep = LazyUtils.getByte(tbl.getProperty(COLLECTION_DELIM),
         DEFAULT_SEPARATORS[1]);
-    keySep = LazySimpleSerDe.getByte(tbl.getProperty(serdeConstants.MAPKEY_DELIM),
+    keySep = LazyUtils.getByte(tbl.getProperty(serdeConstants.MAPKEY_DELIM),
         DEFAULT_SEPARATORS[2]);
-    serdeParams.getSeparators()[1] = collSep;
-    serdeParams.getSeparators()[2] = keySep;
+    serdeParams.setSeparator(1, collSep);
+    serdeParams.setSeparator(2, keySep);
 
     // Create the ObjectInspectors for the fields
     cachedObjectInspector = LazyFactory.createLazyStructInspector(serdeParams

Modified: hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/DefaultHBaseKeyFactory.java
URL: http://svn.apache.org/viewvc/hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/DefaultHBaseKeyFactory.java?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/DefaultHBaseKeyFactory.java (original)
+++ hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/DefaultHBaseKeyFactory.java Thu Feb 12 21:34:18 2015
@@ -22,10 +22,11 @@ import java.io.IOException;
 import java.util.Properties;
 
 import com.google.common.annotations.VisibleForTesting;
+
 import org.apache.hadoop.hive.serde2.SerDeException;
 import org.apache.hadoop.hive.serde2.lazy.LazyFactory;
 import org.apache.hadoop.hive.serde2.lazy.LazyObjectBase;
-import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe.SerDeParameters;
+import org.apache.hadoop.hive.serde2.lazy.LazySerDeParameters;
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
 import org.apache.hadoop.hive.serde2.objectinspector.StructField;
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory.ObjectInspectorOptions;
@@ -33,7 +34,7 @@ import org.apache.hadoop.hive.serde2.typ
 
 public class DefaultHBaseKeyFactory extends AbstractHBaseKeyFactory implements HBaseKeyFactory {
 
-  protected SerDeParameters serdeParams;
+  protected LazySerDeParameters serdeParams;
   protected HBaseRowSerializer serializer;
 
   @Override
@@ -59,7 +60,7 @@ public class DefaultHBaseKeyFactory exte
   }
 
   @VisibleForTesting
-  static DefaultHBaseKeyFactory forTest(SerDeParameters params, ColumnMappings mappings) {
+  static DefaultHBaseKeyFactory forTest(LazySerDeParameters params, ColumnMappings mappings) {
     DefaultHBaseKeyFactory factory = new DefaultHBaseKeyFactory();
     factory.serdeParams = params;
     factory.keyMapping = mappings.getKeyMapping();

Modified: hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseLazyObjectFactory.java
URL: http://svn.apache.org/viewvc/hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseLazyObjectFactory.java?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseLazyObjectFactory.java (original)
+++ hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseLazyObjectFactory.java Thu Feb 12 21:34:18 2015
@@ -23,7 +23,7 @@ import java.util.List;
 
 import org.apache.hadoop.hive.hbase.struct.HBaseValueFactory;
 import org.apache.hadoop.hive.serde2.SerDeException;
-import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe.SerDeParameters;
+import org.apache.hadoop.hive.serde2.lazy.LazySerDeParameters;
 import org.apache.hadoop.hive.serde2.lazy.objectinspector.LazyObjectInspectorFactory;
 import org.apache.hadoop.hive.serde2.lazy.objectinspector.primitive.LazyObjectInspectorParameters;
 import org.apache.hadoop.hive.serde2.lazy.objectinspector.primitive.LazyObjectInspectorParametersImpl;
@@ -37,7 +37,7 @@ import org.apache.hadoop.io.Text;
 public class HBaseLazyObjectFactory {
 
   public static ObjectInspector createLazyHBaseStructInspector(
-      SerDeParameters serdeParams, int index, HBaseKeyFactory keyFactory, List<HBaseValueFactory> valueFactories) throws SerDeException {
+      LazySerDeParameters serdeParams, int index, HBaseKeyFactory keyFactory, List<HBaseValueFactory> valueFactories) throws SerDeException {
     List<TypeInfo> columnTypes = serdeParams.getColumnTypes();
     ArrayList<ObjectInspector> columnObjectInspectors = new ArrayList<ObjectInspector>(
         columnTypes.size());

Modified: hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseRowSerializer.java
URL: http://svn.apache.org/viewvc/hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseRowSerializer.java?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseRowSerializer.java (original)
+++ hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseRowSerializer.java Thu Feb 12 21:34:18 2015
@@ -27,8 +27,8 @@ import org.apache.hadoop.hive.hbase.Colu
 import org.apache.hadoop.hive.serde2.ByteStream;
 import org.apache.hadoop.hive.serde2.SerDeException;
 import org.apache.hadoop.hive.serde2.SerDeUtils;
-import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe;
 import org.apache.hadoop.hive.serde2.lazy.LazyUtils;
+import org.apache.hadoop.hive.serde2.lazy.LazySerDeParameters;
 import org.apache.hadoop.hive.serde2.objectinspector.ListObjectInspector;
 import org.apache.hadoop.hive.serde2.objectinspector.MapObjectInspector;
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
@@ -44,7 +44,7 @@ public class HBaseRowSerializer {
 
   private final HBaseKeyFactory keyFactory;
   private final HBaseSerDeParameters hbaseParam;
-  private final LazySimpleSerDe.SerDeParameters serdeParam;
+  private final LazySerDeParameters serdeParam;
 
   private final int keyIndex;
   private final int timestampIndex;
@@ -54,9 +54,7 @@ public class HBaseRowSerializer {
   private final byte[] separators;      // the separators array
   private final boolean escaped;        // whether we need to escape the data when writing out
   private final byte escapeChar;        // which char to use as the escape char, e.g. '\\'
-  private final boolean[] needsEscape;  // which chars need to be escaped. This array should have size
-                                        // of 128. Negative byte values (or byte values >= 128) are
-                                        // never escaped.
+  private final boolean[] needsEscape;  // which chars need to be escaped. 
 
   private final long putTimestamp;
   private final ByteStream.Output output = new ByteStream.Output();

Modified: hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDe.java
URL: http://svn.apache.org/viewvc/hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDe.java?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDe.java (original)
+++ hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDe.java Thu Feb 12 21:34:18 2015
@@ -34,7 +34,7 @@ import org.apache.hadoop.hive.serde2.Ser
 import org.apache.hadoop.hive.serde2.SerDeException;
 import org.apache.hadoop.hive.serde2.SerDeSpec;
 import org.apache.hadoop.hive.serde2.SerDeStats;
-import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe;
+import org.apache.hadoop.hive.serde2.lazy.LazySerDeParameters;
 import org.apache.hadoop.hive.serde2.lazy.objectinspector.LazySimpleStructObjectInspector;
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
 import org.apache.hadoop.io.Writable;
@@ -51,7 +51,8 @@ import org.apache.hadoop.mapred.JobConf;
     serdeConstants.SERIALIZATION_LAST_COLUMN_TAKES_REST,
     serdeConstants.ESCAPE_CHAR,
     serdeConstants.SERIALIZATION_ENCODING,
-    LazySimpleSerDe.SERIALIZATION_EXTEND_NESTING_LEVELS,
+    LazySerDeParameters.SERIALIZATION_EXTEND_NESTING_LEVELS,
+    LazySerDeParameters.SERIALIZATION_EXTEND_ADDITIONAL_NESTING_LEVELS,
     HBaseSerDe.HBASE_COLUMNS_MAPPING,
     HBaseSerDe.HBASE_TABLE_NAME,
     HBaseSerDe.HBASE_TABLE_DEFAULT_STORAGE_TYPE,
@@ -240,7 +241,7 @@ public class HBaseSerDe extends Abstract
     return new ColumnMappings(columnsMapping, rowKeyIndex, timestampIndex);
   }
 
-  public LazySimpleSerDe.SerDeParameters getSerdeParams() {
+  public LazySerDeParameters getSerdeParams() {
     return serdeParams.getSerdeParams();
   }
 

Modified: hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDeParameters.java
URL: http://svn.apache.org/viewvc/hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDeParameters.java?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDeParameters.java (original)
+++ hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDeParameters.java Thu Feb 12 21:34:18 2015
@@ -33,8 +33,7 @@ import org.apache.hadoop.hive.hbase.stru
 import org.apache.hadoop.hive.serde.serdeConstants;
 import org.apache.hadoop.hive.serde2.SerDeException;
 import org.apache.hadoop.hive.serde2.avro.AvroSerdeUtils;
-import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe;
-import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe.SerDeParameters;
+import org.apache.hadoop.hive.serde2.lazy.LazySerDeParameters;
 import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo;
 import org.apache.hadoop.util.ReflectionUtils;
 
@@ -50,7 +49,7 @@ public class HBaseSerDeParameters {
   public static final String AVRO_SERIALIZATION_TYPE = "avro";
   public static final String STRUCT_SERIALIZATION_TYPE = "struct";
 
-  private final SerDeParameters serdeParams;
+  private final LazySerDeParameters serdeParams;
 
   private final Configuration job;
 
@@ -92,7 +91,7 @@ public class HBaseSerDeParameters {
           columnMappings.toTypesString(tbl, job, autogenerate));
     }
 
-    this.serdeParams = LazySimpleSerDe.initSerdeParams(job, tbl, serdeName);
+    this.serdeParams = new LazySerDeParameters(job, tbl, serdeName);
     this.putTimestamp = Long.valueOf(tbl.getProperty(HBaseSerDe.HBASE_PUT_TIMESTAMP, "-1"));
 
     columnMappings.setHiveColumnDescription(serdeName, serdeParams.getColumnNames(),
@@ -114,7 +113,7 @@ public class HBaseSerDeParameters {
     return serdeParams.getColumnTypes();
   }
 
-  public SerDeParameters getSerdeParams() {
+  public LazySerDeParameters getSerdeParams() {
     return serdeParams;
   }
 

Modified: hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/struct/DefaultHBaseValueFactory.java
URL: http://svn.apache.org/viewvc/hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/struct/DefaultHBaseValueFactory.java?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/struct/DefaultHBaseValueFactory.java (original)
+++ hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/struct/DefaultHBaseValueFactory.java Thu Feb 12 21:34:18 2015
@@ -27,7 +27,7 @@ import org.apache.hadoop.hive.hbase.HBas
 import org.apache.hadoop.hive.serde2.SerDeException;
 import org.apache.hadoop.hive.serde2.lazy.LazyFactory;
 import org.apache.hadoop.hive.serde2.lazy.LazyObjectBase;
-import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe;
+import org.apache.hadoop.hive.serde2.lazy.LazySerDeParameters;
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory.ObjectInspectorOptions;
 import org.apache.hadoop.hive.serde2.objectinspector.StructField;
@@ -38,7 +38,7 @@ import org.apache.hadoop.hive.serde2.typ
  * */
 public class DefaultHBaseValueFactory implements HBaseValueFactory {
 
-  protected LazySimpleSerDe.SerDeParameters serdeParams;
+  protected LazySerDeParameters serdeParams;
   protected ColumnMappings columnMappings;
   protected HBaseSerDeParameters hbaseParams;
   protected Properties properties;

Modified: hive/trunk/hbase-handler/src/test/org/apache/hadoop/hive/hbase/TestHBaseSerDe.java
URL: http://svn.apache.org/viewvc/hive/trunk/hbase-handler/src/test/org/apache/hadoop/hive/hbase/TestHBaseSerDe.java?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/hbase-handler/src/test/org/apache/hadoop/hive/hbase/TestHBaseSerDe.java (original)
+++ hive/trunk/hbase-handler/src/test/org/apache/hadoop/hive/hbase/TestHBaseSerDe.java Thu Feb 12 21:34:18 2015
@@ -61,8 +61,8 @@ import org.apache.hadoop.hive.serde2.io.
 import org.apache.hadoop.hive.serde2.io.DoubleWritable;
 import org.apache.hadoop.hive.serde2.io.ShortWritable;
 import org.apache.hadoop.hive.serde2.lazy.LazyPrimitive;
-import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe;
 import org.apache.hadoop.hive.serde2.lazy.LazyStruct;
+import org.apache.hadoop.hive.serde2.lazy.LazySerDeParameters;
 import org.apache.hadoop.hive.serde2.objectinspector.StructField;
 import org.apache.hadoop.hive.serde2.objectinspector.StructObjectInspector;
 import org.apache.hadoop.io.BooleanWritable;
@@ -1413,7 +1413,7 @@ public class TestHBaseSerDe extends Test
         "org.apache.hadoop.hive.hbase.avro.Employee");
     tbl.setProperty(HBaseSerDe.HBASE_COLUMNS_MAPPING, "cola:prefixB_.*");
     tbl.setProperty(HBaseSerDe.HBASE_AUTOGENERATE_STRUCT, "true");
-    tbl.setProperty(LazySimpleSerDe.SERIALIZATION_EXTEND_NESTING_LEVELS, "true");
+    tbl.setProperty(LazySerDeParameters.SERIALIZATION_EXTEND_NESTING_LEVELS, "true");
 
     return tbl;
   }

Modified: hive/trunk/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/DelimitedInputWriter.java
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/DelimitedInputWriter.java?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/DelimitedInputWriter.java (original)
+++ hive/trunk/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/DelimitedInputWriter.java Thu Feb 12 21:34:18 2015
@@ -31,6 +31,7 @@ import org.apache.hadoop.hive.serde2.Ser
 import org.apache.hadoop.hive.serde2.SerDeException;
 import org.apache.hadoop.hive.serde2.SerDeUtils;
 import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe;
+import org.apache.hadoop.hive.serde2.lazy.LazySerDeParameters;
 import org.apache.hadoop.io.BytesWritable;
 
 import java.io.IOException;
@@ -89,7 +90,7 @@ public class DelimitedInputWriter extend
           throws ClassNotFoundException, ConnectionError, SerializationError,
                  InvalidColumn, StreamingException {
      this(colNamesForFields, delimiter, endPoint, conf,
-             (char) LazySimpleSerDe.DefaultSeparators[0]);
+             (char) LazySerDeParameters.DefaultSeparators[0]);
    }
 
   /**

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/index/HiveIndexResult.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/index/HiveIndexResult.java?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/index/HiveIndexResult.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/index/HiveIndexResult.java Thu Feb 12 21:34:18 2015
@@ -35,7 +35,7 @@ import org.apache.hadoop.hive.common.Fil
 import org.apache.hadoop.hive.conf.HiveConf;
 import org.apache.hadoop.hive.ql.metadata.HiveException;
 import org.apache.hadoop.hive.serde2.columnar.BytesRefWritable;
-import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe;
+import org.apache.hadoop.hive.serde2.lazy.LazySerDeParameters;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.mapred.FileSplit;
 import org.apache.hadoop.mapred.JobConf;
@@ -144,7 +144,7 @@ public class HiveIndexResult {
     int firstEnd = 0;
     int i = 0;
     for (int index = 0; index < bytes.length; index++) {
-      if (bytes[index] == LazySimpleSerDe.DefaultSeparators[0]) {
+      if (bytes[index] == LazySerDeParameters.DefaultSeparators[0]) {
         i++;
         firstEnd = index;
       }
@@ -169,7 +169,7 @@ public class HiveIndexResult {
     int currentStart = firstEnd + 1;
     int currentEnd = firstEnd + 1;
     for (; currentEnd < bytes.length; currentEnd++) {
-      if (bytes[currentEnd] == LazySimpleSerDe.DefaultSeparators[1]) {
+      if (bytes[currentEnd] == LazySerDeParameters.DefaultSeparators[1]) {
         String one_offset = new String(bytes, currentStart, currentEnd
             - currentStart);
         Long offset = Long.parseLong(one_offset);

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PlanUtils.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PlanUtils.java?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PlanUtils.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/PlanUtils.java Thu Feb 12 21:34:18 2015
@@ -62,6 +62,7 @@ import org.apache.hadoop.hive.serde2.Met
 import org.apache.hadoop.hive.serde2.binarysortable.BinarySortableSerDe;
 import org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe;
 import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe;
+import org.apache.hadoop.hive.serde2.lazy.LazySerDeParameters;
 import org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe;
 import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo;
 import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory;
@@ -287,7 +288,7 @@ public final class PlanUtils {
     tblDesc.getProperties().setProperty(serdeConstants.ESCAPE_CHAR, "\\");
     //enable extended nesting levels
     tblDesc.getProperties().setProperty(
-        LazySimpleSerDe.SERIALIZATION_EXTEND_NESTING_LEVELS, "true");
+    		LazySerDeParameters.SERIALIZATION_EXTEND_ADDITIONAL_NESTING_LEVELS, "true");
     return tblDesc;
   }
 

Modified: hive/trunk/ql/src/test/results/clientpositive/alter_partition_coltype.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/alter_partition_coltype.q.out?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/alter_partition_coltype.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/alter_partition_coltype.q.out Thu Feb 12 21:34:18 2015
@@ -255,7 +255,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -433,7 +433,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -590,7 +590,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out Thu Feb 12 21:34:18 2015
@@ -667,7 +667,7 @@ STAGE PLANS:
                       columns _col0,_col1
                       columns.types string:int
                       escape.delim \
-                      hive.serialization.extend.nesting.levels true
+                      hive.serialization.extend.additional.nesting.levels true
                       serialization.format 1
                       serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out Thu Feb 12 21:34:18 2015
@@ -294,7 +294,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -514,7 +514,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -856,7 +856,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -1173,7 +1173,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -1329,7 +1329,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out Thu Feb 12 21:34:18 2015
@@ -412,7 +412,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -762,7 +762,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -1071,7 +1071,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -1508,7 +1508,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out Thu Feb 12 21:34:18 2015
@@ -719,7 +719,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_2.q.out?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_2.q.out Thu Feb 12 21:34:18 2015
@@ -274,7 +274,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -618,7 +618,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -935,7 +935,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -1091,7 +1091,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_3.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_3.q.out?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_3.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_3.q.out Thu Feb 12 21:34:18 2015
@@ -225,7 +225,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -396,7 +396,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -782,7 +782,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -1052,7 +1052,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -1159,7 +1159,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_4.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_4.q.out?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_4.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_4.q.out Thu Feb 12 21:34:18 2015
@@ -241,7 +241,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -412,7 +412,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -798,7 +798,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -1068,7 +1068,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -1175,7 +1175,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out Thu Feb 12 21:34:18 2015
@@ -202,7 +202,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -363,7 +363,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -590,7 +590,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -751,7 +751,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -854,7 +854,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_7.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_7.q.out?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_7.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_7.q.out Thu Feb 12 21:34:18 2015
@@ -307,7 +307,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -529,7 +529,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -966,7 +966,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -1331,7 +1331,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -1487,7 +1487,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_8.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_8.q.out?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_8.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_8.q.out Thu Feb 12 21:34:18 2015
@@ -307,7 +307,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -529,7 +529,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -968,7 +968,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -1333,7 +1333,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -1489,7 +1489,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe

Modified: hive/trunk/ql/src/test/results/clientpositive/bucket_map_join_1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/bucket_map_join_1.q.out?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/bucket_map_join_1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/bucket_map_join_1.q.out Thu Feb 12 21:34:18 2015
@@ -237,7 +237,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe

Modified: hive/trunk/ql/src/test/results/clientpositive/bucket_map_join_2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/bucket_map_join_2.q.out?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/bucket_map_join_2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/bucket_map_join_2.q.out Thu Feb 12 21:34:18 2015
@@ -237,7 +237,7 @@ STAGE PLANS:
                   columns _col0
                   columns.types bigint
                   escape.delim \
-                  hive.serialization.extend.nesting.levels true
+                  hive.serialization.extend.additional.nesting.levels true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe