hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xu...@apache.org
Subject svn commit: r1659410 [5/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/...
Date Thu, 12 Feb 2015 21:34:20 GMT
Modified: hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_7.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_7.q.out?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_7.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_7.q.out Thu Feb 12 21:34:18 2015
@@ -441,7 +441,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
@@ -797,7 +797,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
@@ -1153,7 +1153,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/tez/auto_sortmerge_join_8.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_8.q.out?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_8.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_8.q.out Thu Feb 12 21:34:18 2015
@@ -441,7 +441,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
@@ -797,7 +797,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
@@ -1155,7 +1155,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/tez/filter_join_breaktask.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/tez/filter_join_breaktask.q.out?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/tez/filter_join_breaktask.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/tez/filter_join_breaktask.q.out Thu Feb 12 21:34:18 2015
@@ -398,7 +398,7 @@ STAGE PLANS:
                           columns _col0,_col1
                           columns.types int:string
                           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/tez/mapjoin_mapjoin.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/tez/mapjoin_mapjoin.q.out?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/tez/mapjoin_mapjoin.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/tez/mapjoin_mapjoin.q.out Thu Feb 12 21:34:18 2015
@@ -192,7 +192,7 @@ STAGE PLANS:
                                     columns _col0
                                     columns.types string
                                     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/tez/metadataonly1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/tez/metadataonly1.q.out?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/tez/metadataonly1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/tez/metadataonly1.q.out Thu Feb 12 21:34:18 2015
@@ -63,7 +63,7 @@ STAGE PLANS:
                         columns _col0
                         columns.types string
                         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
@@ -214,7 +214,7 @@ STAGE PLANS:
                         columns _col0
                         columns.types string
                         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
@@ -361,7 +361,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
@@ -508,7 +508,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
@@ -859,7 +859,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
@@ -1164,7 +1164,7 @@ STAGE PLANS:
                         columns _col0,_col1
                         columns.types string: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
@@ -1410,7 +1410,7 @@ STAGE PLANS:
                         columns _col0,_col1
                         columns.types string: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
@@ -1600,7 +1600,7 @@ STAGE PLANS:
                         columns _col0
                         columns.types string
                         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
@@ -1977,7 +1977,7 @@ STAGE PLANS:
                         columns _col0,_col1
                         columns.types string: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/tez/optimize_nullscan.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/tez/optimize_nullscan.q.out?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/tez/optimize_nullscan.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/tez/optimize_nullscan.q.out Thu Feb 12 21:34:18 2015
@@ -131,7 +131,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
@@ -533,7 +533,7 @@ STAGE PLANS:
                         columns _col0,_col1
                         columns.types string:string
                         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
@@ -950,7 +950,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
@@ -977,7 +977,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
@@ -1384,7 +1384,7 @@ STAGE PLANS:
                         columns _col0,_col1
                         columns.types string:string
                         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
@@ -1534,7 +1534,7 @@ STAGE PLANS:
                               columns _col0
                               columns.types string
                               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
@@ -1680,7 +1680,7 @@ STAGE PLANS:
                         columns _col0
                         columns.types string
                         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
@@ -1919,7 +1919,7 @@ STAGE PLANS:
                           columns _col0,_col1,_col2,_col3
                           columns.types string:string:string:string
                           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/tez/transform_ppr1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/tez/transform_ppr1.q.out?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/tez/transform_ppr1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/tez/transform_ppr1.q.out Thu Feb 12 21:34:18 2015
@@ -354,7 +354,7 @@ STAGE PLANS:
                         columns _col0,_col1
                         columns.types string:string
                         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/tez/transform_ppr2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/tez/transform_ppr2.q.out?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/tez/transform_ppr2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/tez/transform_ppr2.q.out Thu Feb 12 21:34:18 2015
@@ -262,7 +262,7 @@ STAGE PLANS:
                         columns _col0,_col1
                         columns.types string:string
                         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/tez/unionDistinct_1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/tez/unionDistinct_1.q.out?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/tez/unionDistinct_1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/tez/unionDistinct_1.q.out Thu Feb 12 21:34:18 2015
@@ -7989,7 +7989,7 @@ STAGE PLANS:
                         columns _col0,_col1
                         columns.types string: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
@@ -8540,7 +8540,7 @@ STAGE PLANS:
                         columns _col0,_col1
                         columns.types string: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
@@ -9091,7 +9091,7 @@ STAGE PLANS:
                         columns _col0,_col1
                         columns.types string: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/tez/vectorized_ptf.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/tez/vectorized_ptf.q.out?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/tez/vectorized_ptf.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/tez/vectorized_ptf.q.out Thu Feb 12 21:34:18 2015
@@ -340,7 +340,7 @@ STAGE PLANS:
                             columns _col0,_col1,_col2,_col3,_col4,_col5
                             columns.types string:string:int:int:int:double
                             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
@@ -718,7 +718,7 @@ STAGE PLANS:
                             columns _col0,_col1,_col2,_col3
                             columns.types string:string:int: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
@@ -927,7 +927,7 @@ STAGE PLANS:
                             columns _col0,_col1,_col2
                             columns.types string: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
@@ -1204,7 +1204,7 @@ STAGE PLANS:
                             columns _col0,_col1,_col2,_col3,_col4,_col5
                             columns.types string:string:int:int:int:double
                             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
@@ -1493,7 +1493,7 @@ STAGE PLANS:
                             columns _col0,_col1,_col2,_col3,_col4,_col5,_col6
                             columns.types string:string:int:int:int:int: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
@@ -1817,7 +1817,7 @@ STAGE PLANS:
                             columns _col0,_col1,_col2,_col3,_col4,_col5,_col6
                             columns.types string:string:int:int:int:int: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
@@ -2131,7 +2131,7 @@ STAGE PLANS:
                         columns _col0,_col1,_col2,_col3,_col4,_col5,_col6,_col7,_col8
                         columns.types int:string:string:string:string:int:string:double:string
                         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
@@ -2423,7 +2423,7 @@ STAGE PLANS:
                           columns _col0,_col1,_col2,_col3,_col4,_col5,_col6,_col7,_col8
                           columns.types int:string:string:string:string:int:string:double:string
                           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
@@ -2691,7 +2691,7 @@ STAGE PLANS:
                             columns _col0,_col1,_col2,_col3
                             columns.types string:string:int: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
@@ -2968,7 +2968,7 @@ STAGE PLANS:
                             columns _col0,_col1,_col2,_col3,_col4,_col5
                             columns.types string:string:int:int:int:double
                             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
@@ -3248,7 +3248,7 @@ STAGE PLANS:
                             columns _col0,_col1,_col2,_col3,_col4,_col5
                             columns.types string:string:int:int:int:double
                             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
@@ -3557,7 +3557,7 @@ STAGE PLANS:
                             columns _col0,_col1,_col2,_col3,_col4,_col5
                             columns.types string:string:int:int:int:double
                             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
@@ -3867,7 +3867,7 @@ STAGE PLANS:
                             columns _col0,_col1,_col2,_col3
                             columns.types string:string:bigint:double
                             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
@@ -4345,7 +4345,7 @@ STAGE PLANS:
                             columns _col0,_col1,_col2,_col3,_col4,_col5,_col6,_col7,_col8
                             columns.types string:string:int:int:bigint:double:double:int: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
@@ -4585,7 +4585,7 @@ STAGE PLANS:
                         columns _col0,_col1,_col2
                         columns.types string: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
@@ -4864,7 +4864,7 @@ STAGE PLANS:
                             columns _col0,_col1,_col2,_col3
                             columns.types string:string:double:double
                             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
@@ -5847,7 +5847,7 @@ STAGE PLANS:
                             columns _col0,_col1,_col2,_col3,_col4,_col5
                             columns.types string:string:int:int:int: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
@@ -6222,7 +6222,7 @@ STAGE PLANS:
                             columns _col0,_col1,_col2,_col3,_col4,_col5
                             columns.types string:string:int:int:int: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
@@ -6563,7 +6563,7 @@ STAGE PLANS:
                             columns _col0,_col1,_col2,_col3,_col4,_col5
                             columns.types string:string:int:int:int: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
@@ -6935,7 +6935,7 @@ STAGE PLANS:
                             columns _col0,_col1,_col2,_col3,_col4,_col5
                             columns.types string:string:int:int:int: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
@@ -7321,7 +7321,7 @@ STAGE PLANS:
                             columns _col0,_col1,_col2,_col3,_col4,_col5,_col6
                             columns.types string:string:int:int:int:bigint: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
@@ -7673,7 +7673,7 @@ STAGE PLANS:
                             columns _col0,_col1,_col2,_col3,_col4,_col5,_col6
                             columns.types string:string:int:int:int:bigint: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/transform_ppr1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/transform_ppr1.q.out?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/transform_ppr1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/transform_ppr1.q.out Thu Feb 12 21:34:18 2015
@@ -348,7 +348,7 @@ STAGE PLANS:
                   columns _col0,_col1
                   columns.types string:string
                   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/transform_ppr2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/transform_ppr2.q.out?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/transform_ppr2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/transform_ppr2.q.out Thu Feb 12 21:34:18 2015
@@ -256,7 +256,7 @@ STAGE PLANS:
                   columns _col0,_col1
                   columns.types string:string
                   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/truncate_column_list_bucket.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/truncate_column_list_bucket.q.out?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/truncate_column_list_bucket.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/truncate_column_list_bucket.q.out Thu Feb 12 21:34:18 2015
@@ -127,7 +127,7 @@ STAGE PLANS:
                         columns _col0,_col1,_col2
                         columns.types string:string:string
                         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
@@ -266,7 +266,7 @@ STAGE PLANS:
                         columns _col0,_col1,_col2
                         columns.types string:string:string
                         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/udf_explode.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_explode.q.out?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_explode.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_explode.q.out Thu Feb 12 21:34:18 2015
@@ -218,7 +218,7 @@ STAGE PLANS:
                   columns _col0,_col1
                   columns.types int: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
@@ -492,7 +492,7 @@ STAGE PLANS:
                   columns _col0,_col1,_col2
                   columns.types int:string: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/udtf_explode.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udtf_explode.q.out?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udtf_explode.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udtf_explode.q.out Thu Feb 12 21:34:18 2015
@@ -284,7 +284,7 @@ STAGE PLANS:
                   columns _col0,_col1
                   columns.types int: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
@@ -594,7 +594,7 @@ STAGE PLANS:
                   columns _col0,_col1,_col2
                   columns.types int:string: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/union24.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/union24.q.out?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/union24.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/union24.q.out Thu Feb 12 21:34:18 2015
@@ -320,7 +320,7 @@ STAGE PLANS:
                           columns _col0,_col1
                           columns.types string: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
@@ -355,7 +355,7 @@ STAGE PLANS:
                           columns _col0,_col1
                           columns.types string: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
@@ -390,7 +390,7 @@ STAGE PLANS:
                           columns _col0,_col1
                           columns.types string: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
@@ -415,7 +415,7 @@ STAGE PLANS:
                       columns _col0,_col1
                       columns.types string: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
@@ -969,7 +969,7 @@ STAGE PLANS:
                           columns _col0,_col1
                           columns.types string: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
@@ -1004,7 +1004,7 @@ STAGE PLANS:
                           columns _col0,_col1
                           columns.types string: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
@@ -1029,7 +1029,7 @@ STAGE PLANS:
                       columns _col0,_col1
                       columns.types string: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
@@ -1598,7 +1598,7 @@ STAGE PLANS:
                           columns _col0,_col1
                           columns.types string: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
@@ -1633,7 +1633,7 @@ STAGE PLANS:
                           columns _col0,_col1
                           columns.types string: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
@@ -1658,7 +1658,7 @@ STAGE PLANS:
                       columns _col0,_col1
                       columns.types string: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/unionDistinct_1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/unionDistinct_1.q.out?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/unionDistinct_1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/unionDistinct_1.q.out Thu Feb 12 21:34:18 2015
@@ -9004,7 +9004,7 @@ STAGE PLANS:
                   columns _col0,_col1
                   columns.types string: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
@@ -9705,7 +9705,7 @@ STAGE PLANS:
                   columns _col0,_col1
                   columns.types string: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
@@ -10189,7 +10189,7 @@ STAGE PLANS:
                   columns _col0,_col1
                   columns.types string: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/union_ppr.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/union_ppr.q.out?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/union_ppr.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/union_ppr.q.out Thu Feb 12 21:34:18 2015
@@ -282,7 +282,7 @@ STAGE PLANS:
                   columns _col0,_col1,_col2,_col3
                   columns.types string:string:string:string
                   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/vectorized_ptf.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/vectorized_ptf.q.out?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/vectorized_ptf.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/vectorized_ptf.q.out Thu Feb 12 21:34:18 2015
@@ -381,7 +381,7 @@ STAGE PLANS:
                       columns _col0,_col1,_col2,_col3,_col4,_col5
                       columns.types string:string:int:int:int:double
                       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
@@ -794,7 +794,7 @@ STAGE PLANS:
                       columns _col0,_col1,_col2,_col3
                       columns.types string:string:int: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
@@ -997,7 +997,7 @@ STAGE PLANS:
                       columns _col0,_col1,_col2
                       columns.types string: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
@@ -1315,7 +1315,7 @@ STAGE PLANS:
                       columns _col0,_col1,_col2,_col3,_col4,_col5
                       columns.types string:string:int:int:int:double
                       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
@@ -1645,7 +1645,7 @@ STAGE PLANS:
                       columns _col0,_col1,_col2,_col3,_col4,_col5,_col6
                       columns.types string:string:int:int:int:int: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
@@ -2056,7 +2056,7 @@ STAGE PLANS:
                       columns _col0,_col1,_col2,_col3,_col4,_col5,_col6
                       columns.types string:string:int:int:int:int: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
@@ -2403,7 +2403,7 @@ STAGE PLANS:
                   columns _col0,_col1,_col2,_col3,_col4,_col5,_col6,_col7,_col8
                   columns.types int:string:string:string:string:int:string:double:string
                   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
@@ -2749,7 +2749,7 @@ STAGE PLANS:
                     columns _col0,_col1,_col2,_col3,_col4,_col5,_col6,_col7,_col8
                     columns.types int:string:string:string:string:int:string:double:string
                     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
@@ -3037,7 +3037,7 @@ STAGE PLANS:
                       columns _col0,_col1,_col2,_col3
                       columns.types string:string:int: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
@@ -3355,7 +3355,7 @@ STAGE PLANS:
                       columns _col0,_col1,_col2,_col3,_col4,_col5
                       columns.types string:string:int:int:int:double
                       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
@@ -3676,7 +3676,7 @@ STAGE PLANS:
                       columns _col0,_col1,_col2,_col3,_col4,_col5
                       columns.types string:string:int:int:int:double
                       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
@@ -4073,7 +4073,7 @@ STAGE PLANS:
                       columns _col0,_col1,_col2,_col3,_col4,_col5
                       columns.types string:string:int:int:int:double
                       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
@@ -4424,7 +4424,7 @@ STAGE PLANS:
                       columns _col0,_col1,_col2,_col3
                       columns.types string:string:bigint:double
                       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
@@ -4982,7 +4982,7 @@ STAGE PLANS:
                       columns _col0,_col1,_col2,_col3,_col4,_col5,_col6,_col7,_col8
                       columns.types string:string:int:int:bigint:double:double:int: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
@@ -5263,7 +5263,7 @@ STAGE PLANS:
                   columns _col0,_col1,_col2
                   columns.types string: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
@@ -5582,7 +5582,7 @@ STAGE PLANS:
                       columns _col0,_col1,_col2,_col3
                       columns.types string:string:double:double
                       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
@@ -6784,7 +6784,7 @@ STAGE PLANS:
                       columns _col0,_col1,_col2,_col3,_col4,_col5
                       columns.types string:string:int:int:int: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
@@ -7294,7 +7294,7 @@ STAGE PLANS:
                       columns _col0,_col1,_col2,_col3,_col4,_col5
                       columns.types string:string:int:int:int: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
@@ -7723,7 +7723,7 @@ STAGE PLANS:
                       columns _col0,_col1,_col2,_col3,_col4,_col5
                       columns.types string:string:int:int:int: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
@@ -8230,7 +8230,7 @@ STAGE PLANS:
                       columns _col0,_col1,_col2,_col3,_col4,_col5
                       columns.types string:string:int:int:int: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
@@ -8704,7 +8704,7 @@ STAGE PLANS:
                       columns _col0,_col1,_col2,_col3,_col4,_col5,_col6
                       columns.types string:string:int:int:int:bigint: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
@@ -9144,7 +9144,7 @@ STAGE PLANS:
                       columns _col0,_col1,_col2,_col3,_col4,_col5,_col6
                       columns.types string:string:int:int:int:bigint: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/serde/src/java/org/apache/hadoop/hive/serde2/DelimitedJSONSerDe.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/DelimitedJSONSerDe.java?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/DelimitedJSONSerDe.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/DelimitedJSONSerDe.java Thu Feb 12 21:34:18 2015
@@ -24,6 +24,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.hive.serde.serdeConstants;
 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.ObjectInspector.Category;
 import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory;
@@ -53,7 +54,7 @@ public class DelimitedJSONSerDe extends
 
   @Override
   protected void serializeField(ByteStream.Output out, Object obj, ObjectInspector objInspector,
-      SerDeParameters serdeParams) throws SerDeException {
+      LazySerDeParameters serdeParams) throws SerDeException {
     if (!objInspector.getCategory().equals(Category.PRIMITIVE) || (objInspector.getTypeName().equalsIgnoreCase(serdeConstants.BINARY_TYPE_NAME))) {
       //do this for all complex types and binary
       try {

Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/columnar/ColumnarSerDe.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/columnar/ColumnarSerDe.java?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/columnar/ColumnarSerDe.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/columnar/ColumnarSerDe.java Thu Feb 12 21:34:18 2015
@@ -29,14 +29,12 @@ import org.apache.commons.logging.LogFac
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hive.serde.serdeConstants;
 import org.apache.hadoop.hive.serde2.ColumnProjectionUtils;
-import org.apache.hadoop.hive.serde2.SerDe;
 import org.apache.hadoop.hive.serde2.SerDeException;
 import org.apache.hadoop.hive.serde2.SerDeSpec;
 import org.apache.hadoop.hive.serde2.SerDeUtils;
 import org.apache.hadoop.hive.serde2.lazy.LazyFactory;
 import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe;
-import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe.SerDeParameters;
-import org.apache.hadoop.hive.serde2.lazy.objectinspector.primitive.LazyObjectInspectorParametersImpl;
+import org.apache.hadoop.hive.serde2.lazy.LazySerDeParameters;
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector.Category;
 import org.apache.hadoop.hive.serde2.objectinspector.StructField;
@@ -60,7 +58,9 @@ 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 ColumnarSerDe extends ColumnarSerDeBase {
 
   @Override
@@ -82,7 +82,7 @@ public class ColumnarSerDe extends Colum
   public ColumnarSerDe() throws SerDeException {
   }
 
-  protected SerDeParameters serdeParams = null;
+  protected LazySerDeParameters serdeParams = null;
 
   /**
    * Initialize the SerDe given the parameters.
@@ -92,7 +92,7 @@ public class ColumnarSerDe extends Colum
   @Override
   public void initialize(Configuration conf, Properties tbl) throws SerDeException {
 
-    serdeParams = LazySimpleSerDe.initSerdeParams(conf, tbl, getClass().getName());
+    serdeParams = new LazySerDeParameters(conf, tbl, getClass().getName());
 
     // Create the ObjectInspectors for the fields. Note: Currently
     // ColumnarObject uses same ObjectInpector as LazyStruct

Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/columnar/LazyBinaryColumnarSerDe.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/columnar/LazyBinaryColumnarSerDe.java?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/columnar/LazyBinaryColumnarSerDe.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/columnar/LazyBinaryColumnarSerDe.java Thu Feb 12 21:34:18 2015
@@ -26,8 +26,7 @@ import org.apache.hadoop.hive.serde.serd
 import org.apache.hadoop.hive.serde2.ColumnProjectionUtils;
 import org.apache.hadoop.hive.serde2.SerDeException;
 import org.apache.hadoop.hive.serde2.SerDeSpec;
-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.lazybinary.LazyBinaryFactory;
 import org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe;
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
@@ -63,8 +62,8 @@ public class LazyBinaryColumnarSerDe ext
 
   @Override
   public void initialize(Configuration conf, Properties tbl) throws SerDeException {
-    SerDeParameters serdeParams = new SerDeParameters();
-    LazyUtils.extractColumnInfo(tbl, serdeParams, getClass().getName());
+    LazySerDeParameters serdeParams = new LazySerDeParameters(conf, tbl, getClass().getName());
+    
     columnNames = serdeParams.getColumnNames();
     columnTypes = serdeParams.getColumnTypes();
 

Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyFactory.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyFactory.java?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyFactory.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyFactory.java Thu Feb 12 21:34:18 2015
@@ -220,9 +220,9 @@ public final class LazyFactory {
    */
   @Deprecated
   public static ObjectInspector createLazyObjectInspector(TypeInfo typeInfo,
-      byte[] separator, int separatorIndex, Text nullSequence, boolean escaped,
+  		byte[] separators, int separatorIndex, Text nullSequence, boolean escaped,
       byte escapeChar, ObjectInspectorOptions option) throws SerDeException {
-    return createLazyObjectInspector(typeInfo, separator, separatorIndex, nullSequence,
+    return createLazyObjectInspector(typeInfo, separators, separatorIndex, nullSequence,
         escaped, escapeChar, false, option);
   }
   
@@ -245,9 +245,9 @@ public final class LazyFactory {
    */
   @Deprecated
   public static ObjectInspector createLazyObjectInspector(TypeInfo typeInfo,
-      byte[] separator, int separatorIndex, Text nullSequence, boolean escaped,
+  		byte[] separators, int separatorIndex, Text nullSequence, boolean escaped,
       byte escapeChar) throws SerDeException {
-    return createLazyObjectInspector(typeInfo, separator, separatorIndex, nullSequence,
+    return createLazyObjectInspector(typeInfo, separators, separatorIndex, nullSequence,
         escaped, escapeChar, false, ObjectInspectorOptions.JAVA);
   }
 
@@ -267,9 +267,9 @@ public final class LazyFactory {
    */
   @Deprecated
   public static ObjectInspector createLazyObjectInspector(TypeInfo typeInfo,
-      byte[] separator, int separatorIndex, Text nullSequence, boolean escaped,
+  		byte[] separators, int separatorIndex, Text nullSequence, boolean escaped,
       byte escapeChar, boolean extendedBooleanLiteral) throws SerDeException {
-    return createLazyObjectInspector(typeInfo, separator, separatorIndex, nullSequence, escaped,
+    return createLazyObjectInspector(typeInfo, separators, separatorIndex, nullSequence, escaped,
         escapeChar, extendedBooleanLiteral, ObjectInspectorOptions.JAVA);
   }
   
@@ -289,10 +289,10 @@ public final class LazyFactory {
    */
   @Deprecated
   public static ObjectInspector createLazyObjectInspector(TypeInfo typeInfo,
-      byte[] separator, int separatorIndex, Text nullSequence, boolean escaped,
+  		byte[] separators, int separatorIndex, Text nullSequence, boolean escaped,
       byte escapeChar, boolean extendedBooleanLiteral, ObjectInspectorOptions option) throws SerDeException {
     LazyObjectInspectorParametersImpl lazyParams = new LazyObjectInspectorParametersImpl(
-        escaped, escapeChar, extendedBooleanLiteral, null, separator, nullSequence);
+        escaped, escapeChar, extendedBooleanLiteral, null, separators, nullSequence);
     return createLazyObjectInspector(typeInfo, separatorIndex, lazyParams, option);
   }
 
@@ -332,7 +332,7 @@ public final class LazyFactory {
           .getListElementTypeInfo(), separatorIndex + 1,
           lazyParams, option), LazyUtils.getSeparator(lazyParams.getSeparators(), separatorIndex),
           lazyParams);
-    case STRUCT:
+   case STRUCT:
       StructTypeInfo structTypeInfo = (StructTypeInfo) typeInfo;
       List<String> fieldNames = structTypeInfo.getAllStructFieldNames();
       List<TypeInfo> fieldTypeInfos = structTypeInfo
@@ -347,7 +347,7 @@ public final class LazyFactory {
           fieldNames, fieldObjectInspectors, null,
           LazyUtils.getSeparator(lazyParams.getSeparators(), separatorIndex),
           lazyParams, option);
-    case UNION:
+   case UNION:
       UnionTypeInfo unionTypeInfo = (UnionTypeInfo) typeInfo;
       List<ObjectInspector> lazyOIs = new ArrayList<ObjectInspector>();
       for (TypeInfo uti : unionTypeInfo.getAllUnionObjectTypeInfos()) {
@@ -357,7 +357,7 @@ public final class LazyFactory {
       return LazyObjectInspectorFactory.getLazyUnionObjectInspector(lazyOIs,
           LazyUtils.getSeparator(lazyParams.getSeparators(), separatorIndex),
           lazyParams);
-    }
+   }
 
     throw new RuntimeException("Hive LazySerDe Internal error.");
   }
@@ -396,7 +396,7 @@ public final class LazyFactory {
    */
   @Deprecated
   public static ObjectInspector createLazyStructInspector(
-      List<String> columnNames, List<TypeInfo> typeInfos, byte[] separators,
+     List<String> columnNames, List<TypeInfo> typeInfos, byte[] separators,
       Text nullSequence, boolean lastColumnTakesRest, boolean escaped,
       byte escapeChar, boolean extendedBooleanLiteral) throws SerDeException {
     LazyObjectInspectorParametersImpl lazyParams = new LazyObjectInspectorParametersImpl(

Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySimpleSerDe.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySimpleSerDe.java?rev=1659410&r1=1659409&r2=1659410&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySimpleSerDe.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySimpleSerDe.java Thu Feb 12 21:34:18 2015
@@ -19,13 +19,14 @@
 package org.apache.hadoop.hive.serde2.lazy;
 
 import java.io.IOException;
-import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
+import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
@@ -33,7 +34,6 @@ import org.apache.hadoop.hive.conf.HiveC
 import org.apache.hadoop.hive.serde.serdeConstants;
 import org.apache.hadoop.hive.serde2.AbstractEncodingAwareSerDe;
 import org.apache.hadoop.hive.serde2.ByteStream;
-import org.apache.hadoop.hive.serde2.SerDe;
 import org.apache.hadoop.hive.serde2.SerDeException;
 import org.apache.hadoop.hive.serde2.SerDeSpec;
 import org.apache.hadoop.hive.serde2.SerDeStats;
@@ -58,6 +58,7 @@ import org.apache.hadoop.io.Text;
 import org.apache.hadoop.io.Writable;
 import org.apache.hive.common.util.HiveStringUtils;
 
+
 /**
  * LazySimpleSerDe can be used to read the same data format as
  * MetadataTypedColumnsetSerDe and TCTLSeparatedProtocol.
@@ -75,16 +76,15 @@ import org.apache.hive.common.util.HiveS
     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 LazySimpleSerDe extends AbstractEncodingAwareSerDe {
 
   public static final Log LOG = LogFactory.getLog(LazySimpleSerDe.class
       .getName());
 
-  public static final String SERIALIZATION_EXTEND_NESTING_LEVELS
-    = "hive.serialization.extend.nesting.levels";
-
-  public static final byte[] DefaultSeparators = {(byte) 1, (byte) 2, (byte) 3};
+  private LazySerDeParameters serdeParams = null;
 
   private ObjectInspector cachedObjectInspector;
 
@@ -97,11 +97,11 @@ public class LazySimpleSerDe extends Abs
   public String toString() {
     return getClass().toString()
         + "["
-        + Arrays.asList(serdeParams.separators)
+        + Arrays.asList(serdeParams.getSeparators())
         + ":"
-        + ((StructTypeInfo) serdeParams.rowTypeInfo).getAllStructFieldNames()
+        + ((StructTypeInfo) serdeParams.getRowTypeInfo()).getAllStructFieldNames()
         + ":"
-        + ((StructTypeInfo) serdeParams.rowTypeInfo)
+        + ((StructTypeInfo) serdeParams.getRowTypeInfo())
             .getAllStructFieldTypeInfos() + "]";
   }
 
@@ -109,100 +109,6 @@ public class LazySimpleSerDe extends Abs
   }
 
   /**
-   * Return the byte value of the number string.
-   *
-   * @param altValue
-   *          The string containing a number.
-   * @param defaultVal
-   *          If the altValue does not represent a number, return the
-   *          defaultVal.
-   */
-  public static byte getByte(String altValue, byte defaultVal) {
-    if (altValue != null && altValue.length() > 0) {
-      try {
-        return Byte.valueOf(altValue).byteValue();
-      } catch (NumberFormatException e) {
-        return (byte) altValue.charAt(0);
-      }
-    }
-    return defaultVal;
-  }
-
-  /**
-   * SerDeParameters.
-   *
-   */
-  public static class SerDeParameters implements LazyObjectInspectorParameters {
-    byte[] separators = DefaultSeparators;
-    String nullString;
-    Text nullSequence;
-    TypeInfo rowTypeInfo;
-    boolean lastColumnTakesRest;
-    List<String> columnNames;
-    List<TypeInfo> columnTypes;
-
-    boolean escaped;
-    byte escapeChar;
-    boolean[] needsEscape;
-
-    boolean extendedBooleanLiteral;
-    List<String> timestampFormats;
-
-    public SerDeParameters() {
-    }
-
-    public List<TypeInfo> getColumnTypes() {
-      return columnTypes;
-    }
-
-    public List<String> getColumnNames() {
-      return columnNames;
-    }
-
-    public byte[] getSeparators() {
-      return separators;
-    }
-
-    public String getNullString() {
-      return nullString;
-    }
-
-    public Text getNullSequence() {
-      return nullSequence;
-    }
-
-    public TypeInfo getRowTypeInfo() {
-      return rowTypeInfo;
-    }
-
-    public boolean isLastColumnTakesRest() {
-      return lastColumnTakesRest;
-    }
-
-    public boolean isEscaped() {
-      return escaped;
-    }
-
-    public byte getEscapeChar() {
-      return escapeChar;
-    }
-
-    public boolean[] getNeedsEscape() {
-      return needsEscape;
-    }
-
-    public boolean isExtendedBooleanLiteral() {
-      return extendedBooleanLiteral;
-    }
-
-    public List<String> getTimestampFormats() {
-      return timestampFormats;
-    }
-  }
-
-  SerDeParameters serdeParams = null;
-
-  /**
    * Initialize the SerDe given the parameters. serialization.format: separator
    * char or byte code (only supports byte-value up to 127) columns:
    * ","-separated column names columns.types: ",", ":", or ";"-separated column
@@ -216,8 +122,7 @@ public class LazySimpleSerDe extends Abs
 
     super.initialize(job, tbl);
 
-    serdeParams = LazySimpleSerDe.initSerdeParams(job, tbl, getClass()
-        .getName());
+    serdeParams = new LazySerDeParameters(job, tbl, getClass().getName());
 
     // Create the ObjectInspectors for the fields
     cachedObjectInspector = LazyFactory.createLazyStructInspector(serdeParams
@@ -227,10 +132,10 @@ public class LazySimpleSerDe extends Abs
         .createLazyObject(cachedObjectInspector);
 
     LOG.debug(getClass().getName() + " initialized with: columnNames="
-        + serdeParams.columnNames + " columnTypes=" + serdeParams.columnTypes
-        + " separator=" + Arrays.asList(serdeParams.separators)
-        + " nullstring=" + serdeParams.nullString + " lastColumnTakesRest="
-        + serdeParams.lastColumnTakesRest + " timestampFormats=" + serdeParams.timestampFormats);
+        + serdeParams.getColumnNames() + " columnTypes=" + serdeParams.getColumnTypes()
+        + " separator=" + Arrays.asList(serdeParams.getSeparators())
+        + " nullstring=" + serdeParams.getNullString() + " lastColumnTakesRest="
+        + serdeParams.isLastColumnTakesRest() + " timestampFormats=" + serdeParams.getTimestampFormats());
 
     serializedSize = 0;
     stats = new SerDeStats();
@@ -238,115 +143,6 @@ public class LazySimpleSerDe extends Abs
     lastOperationDeserialize = false;
   }
 
-  public static SerDeParameters initSerdeParams(Configuration job,
-      Properties tbl, String serdeName) throws SerDeException {
-    SerDeParameters serdeParams = new SerDeParameters();
-    // Read the separators: We use 8 levels of separators by default,
-    // and 24 if SERIALIZATION_EXTEND_NESTING_LEVELS is set to true
-    // The levels possible are the set of control chars that we can use as
-    // special delimiters, ie they should absent in the data or escaped.
-    // To increase this level further, we need to stop relying
-    // on single control chars delimiters
-
-    serdeParams.separators = new byte[8];
-    serdeParams.separators[0] = getByte(tbl.getProperty(serdeConstants.FIELD_DELIM,
-        tbl.getProperty(serdeConstants.SERIALIZATION_FORMAT)), DefaultSeparators[0]);
-    serdeParams.separators[1] = getByte(tbl
-        .getProperty(serdeConstants.COLLECTION_DELIM), DefaultSeparators[1]);
-    serdeParams.separators[2] = getByte(
-        tbl.getProperty(serdeConstants.MAPKEY_DELIM), DefaultSeparators[2]);
-    String extendedNesting =
-        tbl.getProperty(SERIALIZATION_EXTEND_NESTING_LEVELS);
-    if(extendedNesting == null || !extendedNesting.equalsIgnoreCase("true")){
-      //use the default smaller set of separators for backward compatibility
-      for (int i = 3; i < serdeParams.separators.length; i++) {
-        serdeParams.separators[i] = (byte) (i + 1);
-      }
-    }
-    else{
-      //If extended nesting is enabled, set the extended set of separator chars
-
-      final int MAX_CTRL_CHARS = 29;
-      byte[] extendedSeparators = new byte[MAX_CTRL_CHARS];
-      int extendedSeparatorsIdx = 0;
-
-      //get the first 3 separators that have already been set (defaults to 1,2,3)
-      for(int i = 0; i < 3; i++){
-        extendedSeparators[extendedSeparatorsIdx++] = serdeParams.separators[i];
-      }
-
-      for (byte asciival = 4; asciival <= MAX_CTRL_CHARS; asciival++) {
-
-        //use only control chars that are very unlikely to be part of the string
-        // the following might/likely to be used in text files for strings
-        // 9 (horizontal tab, HT, \t, ^I)
-        // 10 (line feed, LF, \n, ^J),
-        // 12 (form feed, FF, \f, ^L),
-        // 13 (carriage return, CR, \r, ^M),
-        // 27 (escape, ESC, \e [GCC only], ^[).
-
-        //reserving the following values for future dynamic level impl
-        // 30
-        // 31
-
-        switch(asciival){
-        case 9:
-        case 10:
-        case 12:
-        case 13:
-        case 27:
-          continue;
-        }
-        extendedSeparators[extendedSeparatorsIdx++] = asciival;
-      }
-
-      serdeParams.separators =
-          Arrays.copyOfRange(extendedSeparators, 0, extendedSeparatorsIdx);
-    }
-
-    serdeParams.nullString = tbl.getProperty(
-        serdeConstants.SERIALIZATION_NULL_FORMAT, "\\N");
-    serdeParams.nullSequence = new Text(serdeParams.nullString);
-
-    String lastColumnTakesRestString = tbl
-        .getProperty(serdeConstants.SERIALIZATION_LAST_COLUMN_TAKES_REST);
-    serdeParams.lastColumnTakesRest = (lastColumnTakesRestString != null && lastColumnTakesRestString
-        .equalsIgnoreCase("true"));
-
-    LazyUtils.extractColumnInfo(tbl, serdeParams, serdeName);
-
-    // Create the LazyObject for storing the rows
-    serdeParams.rowTypeInfo = TypeInfoFactory.getStructTypeInfo(
-        serdeParams.columnNames, serdeParams.columnTypes);
-
-    // Get the escape information
-    String escapeProperty = tbl.getProperty(serdeConstants.ESCAPE_CHAR);
-    serdeParams.escaped = (escapeProperty != null);
-    if (serdeParams.escaped) {
-      serdeParams.escapeChar = getByte(escapeProperty, (byte) '\\');
-    }
-    if (serdeParams.escaped) {
-      serdeParams.needsEscape = new boolean[128];
-      for (int i = 0; i < 128; i++) {
-        serdeParams.needsEscape[i] = false;
-      }
-      serdeParams.needsEscape[serdeParams.escapeChar] = true;
-      for (int i = 0; i < serdeParams.separators.length; i++) {
-        serdeParams.needsEscape[serdeParams.separators[i]] = true;
-      }
-    }
-
-    serdeParams.extendedBooleanLiteral = job == null ? false :
-        job.getBoolean(ConfVars.HIVE_LAZYSIMPLE_EXTENDED_BOOLEAN_LITERAL.varname, false);
-
-    String[] timestampFormatsArray =
-        HiveStringUtils.splitAndUnEscape(tbl.getProperty(serdeConstants.TIMESTAMP_FORMATS));
-    if (timestampFormatsArray != null) {
-      serdeParams.timestampFormats = Arrays.asList(timestampFormatsArray);
-    }
-    return serdeParams;
-  }
-
   // The object for storing row data
   LazyStruct cachedLazyStruct;
 
@@ -420,7 +216,7 @@ public class LazySimpleSerDe extends Abs
     StructObjectInspector soi = (StructObjectInspector) objInspector;
     List<? extends StructField> fields = soi.getAllStructFieldRefs();
     List<Object> list = soi.getStructFieldsDataAsList(obj);
-    List<? extends StructField> declaredFields = (serdeParams.rowTypeInfo != null && ((StructTypeInfo) serdeParams.rowTypeInfo)
+    List<? extends StructField> declaredFields = (serdeParams.getRowTypeInfo() != null && ((StructTypeInfo) serdeParams.getRowTypeInfo())
         .getAllStructFieldNames().size() > 0) ? ((StructObjectInspector) getObjectInspector())
         .getAllStructFieldRefs()
         : null;
@@ -432,7 +228,7 @@ public class LazySimpleSerDe extends Abs
     for (int i = 0; i < fields.size(); i++) {
       // Append the separator if needed.
       if (i > 0) {
-        serializeStream.write(serdeParams.separators[0]);
+        serializeStream.write(serdeParams.getSeparators()[0]);
       }
       // Get the field objectInspector and the field object.
       ObjectInspector foi = fields.get(i).getFieldObjectInspector();
@@ -441,7 +237,7 @@ public class LazySimpleSerDe extends Abs
       if (declaredFields != null && i >= declaredFields.size()) {
         throw new SerDeException("Error: expecting " + declaredFields.size()
             + " but asking for field " + i + "\n" + "data=" + obj + "\n"
-            + "tableType=" + serdeParams.rowTypeInfo.toString() + "\n"
+            + "tableType=" + serdeParams.getRowTypeInfo().toString() + "\n"
             + "dataType="
             + TypeInfoUtils.getTypeInfoFromObjectInspector(objInspector));
       }
@@ -460,10 +256,10 @@ public class LazySimpleSerDe extends Abs
   }
 
   protected void serializeField(ByteStream.Output out, Object obj, ObjectInspector objInspector,
-      SerDeParameters serdeParams) throws SerDeException {
+      LazySerDeParameters serdeParams) throws SerDeException {
     try {
-      serialize(out, obj, objInspector, serdeParams.separators, 1, serdeParams.nullSequence,
-          serdeParams.escaped, serdeParams.escapeChar, serdeParams.needsEscape);
+      serialize(out, obj, objInspector, serdeParams.getSeparators(), 1, serdeParams.getNullSequence(),
+          serdeParams.isEscaped(), serdeParams.getEscapeChar(), serdeParams.getNeedsEscape());
     } catch (IOException e) {
       throw new SerDeException(e);
     }
@@ -489,9 +285,7 @@ public class LazySimpleSerDe extends Abs
    * @param escapeChar
    *          Which char to use as the escape char, e.g. '\\'
    * @param needsEscape
-   *          Which chars needs to be escaped. This array should have size of
-   *          128. Negative byte values (or byte values >= 128) are never
-   *          escaped.
+   *          Which byte needs to be escaped for 256 bytes. 
    * @throws IOException
    * @throws SerDeException
    */



Mime
View raw message