hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sunc...@apache.org
Subject [1/4] hive git commit: HIVE-11785: Support escaping carriage return and new line for LazySimpleSerDe (Aihua Xu, reviewed by Chao Sun)
Date Fri, 16 Oct 2015 18:59:01 GMT
Repository: hive
Updated Branches:
  refs/heads/master 3ecbd02e9 -> 3e7d1c45f


http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_5.q.out b/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_5.q.out
index 4d85837..8f31e94 100644
--- a/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_5.q.out
+++ b/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_5.q.out
@@ -276,6 +276,7 @@ STAGE PLANS:
                         columns.types bigint
                         escape.delim \
                         hive.serialization.extend.additional.nesting.levels true
+                        serialization.escape.crlf true
                         serialization.format 1
                         serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -504,6 +505,7 @@ STAGE PLANS:
                         columns.types bigint
                         escape.delim \
                         hive.serialization.extend.additional.nesting.levels true
+                        serialization.escape.crlf true
                         serialization.format 1
                         serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -747,6 +749,7 @@ STAGE PLANS:
                         columns.types bigint
                         escape.delim \
                         hive.serialization.extend.additional.nesting.levels true
+                        serialization.escape.crlf true
                         serialization.format 1
                         serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe

http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_7.q.out b/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_7.q.out
index 2562cb0..4f06198 100644
--- a/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_7.q.out
+++ b/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_7.q.out
@@ -443,6 +443,7 @@ STAGE PLANS:
                         columns.types bigint
                         escape.delim \
                         hive.serialization.extend.additional.nesting.levels true
+                        serialization.escape.crlf true
                         serialization.format 1
                         serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -800,6 +801,7 @@ STAGE PLANS:
                         columns.types bigint
                         escape.delim \
                         hive.serialization.extend.additional.nesting.levels true
+                        serialization.escape.crlf true
                         serialization.format 1
                         serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -1157,6 +1159,7 @@ STAGE PLANS:
                         columns.types bigint
                         escape.delim \
                         hive.serialization.extend.additional.nesting.levels true
+                        serialization.escape.crlf true
                         serialization.format 1
                         serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe

http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_8.q.out b/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_8.q.out
index 31b0a97..2608c27 100644
--- a/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_8.q.out
+++ b/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_8.q.out
@@ -443,6 +443,7 @@ STAGE PLANS:
                         columns.types bigint
                         escape.delim \
                         hive.serialization.extend.additional.nesting.levels true
+                        serialization.escape.crlf true
                         serialization.format 1
                         serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -800,6 +801,7 @@ STAGE PLANS:
                         columns.types bigint
                         escape.delim \
                         hive.serialization.extend.additional.nesting.levels true
+                        serialization.escape.crlf true
                         serialization.format 1
                         serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -1159,6 +1161,7 @@ STAGE PLANS:
                         columns.types bigint
                         escape.delim \
                         hive.serialization.extend.additional.nesting.levels true
+                        serialization.escape.crlf true
                         serialization.format 1
                         serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe

http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/ql/src/test/results/clientpositive/tez/filter_join_breaktask.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/filter_join_breaktask.q.out b/ql/src/test/results/clientpositive/tez/filter_join_breaktask.q.out
index 99120bb..c683ca2 100644
--- a/ql/src/test/results/clientpositive/tez/filter_join_breaktask.q.out
+++ b/ql/src/test/results/clientpositive/tez/filter_join_breaktask.q.out
@@ -399,6 +399,7 @@ STAGE PLANS:
                           columns.types int:string
                           escape.delim \
                           hive.serialization.extend.additional.nesting.levels true
+                          serialization.escape.crlf true
                           serialization.format 1
                           serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                         serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe

http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/ql/src/test/results/clientpositive/tez/mapjoin_mapjoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/mapjoin_mapjoin.q.out b/ql/src/test/results/clientpositive/tez/mapjoin_mapjoin.q.out
index 0bf689b..f6e652d 100644
--- a/ql/src/test/results/clientpositive/tez/mapjoin_mapjoin.q.out
+++ b/ql/src/test/results/clientpositive/tez/mapjoin_mapjoin.q.out
@@ -121,6 +121,7 @@ STAGE PLANS:
                                   columns.types string
                                   escape.delim \
                                   hive.serialization.extend.additional.nesting.levels true
+                                  serialization.escape.crlf true
                                   serialization.format 1
                                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe

http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/ql/src/test/results/clientpositive/tez/metadataonly1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/metadataonly1.q.out b/ql/src/test/results/clientpositive/tez/metadataonly1.q.out
index b55cb7e..1fb166b 100644
--- a/ql/src/test/results/clientpositive/tez/metadataonly1.q.out
+++ b/ql/src/test/results/clientpositive/tez/metadataonly1.q.out
@@ -84,6 +84,7 @@ STAGE PLANS:
                         columns.types string
                         escape.delim \
                         hive.serialization.extend.additional.nesting.levels true
+                        serialization.escape.crlf true
                         serialization.format 1
                         serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -235,6 +236,7 @@ STAGE PLANS:
                         columns.types string
                         escape.delim \
                         hive.serialization.extend.additional.nesting.levels true
+                        serialization.escape.crlf true
                         serialization.format 1
                         serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -382,6 +384,7 @@ STAGE PLANS:
                         columns.types bigint
                         escape.delim \
                         hive.serialization.extend.additional.nesting.levels true
+                        serialization.escape.crlf true
                         serialization.format 1
                         serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -529,6 +532,7 @@ STAGE PLANS:
                         columns.types bigint
                         escape.delim \
                         hive.serialization.extend.additional.nesting.levels true
+                        serialization.escape.crlf true
                         serialization.format 1
                         serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -880,6 +884,7 @@ STAGE PLANS:
                         columns.types bigint
                         escape.delim \
                         hive.serialization.extend.additional.nesting.levels true
+                        serialization.escape.crlf true
                         serialization.format 1
                         serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -1185,6 +1190,7 @@ STAGE PLANS:
                         columns.types string:bigint
                         escape.delim \
                         hive.serialization.extend.additional.nesting.levels true
+                        serialization.escape.crlf true
                         serialization.format 1
                         serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -1431,6 +1437,7 @@ STAGE PLANS:
                         columns.types string:bigint
                         escape.delim \
                         hive.serialization.extend.additional.nesting.levels true
+                        serialization.escape.crlf true
                         serialization.format 1
                         serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -1621,6 +1628,7 @@ STAGE PLANS:
                         columns.types string
                         escape.delim \
                         hive.serialization.extend.additional.nesting.levels true
+                        serialization.escape.crlf true
                         serialization.format 1
                         serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -1998,6 +2006,7 @@ STAGE PLANS:
                         columns.types string:bigint
                         escape.delim \
                         hive.serialization.extend.additional.nesting.levels true
+                        serialization.escape.crlf true
                         serialization.format 1
                         serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe

http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/ql/src/test/results/clientpositive/tez/optimize_nullscan.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/optimize_nullscan.q.out b/ql/src/test/results/clientpositive/tez/optimize_nullscan.q.out
index 5bc43d5..bf9ba9b 100644
--- a/ql/src/test/results/clientpositive/tez/optimize_nullscan.q.out
+++ b/ql/src/test/results/clientpositive/tez/optimize_nullscan.q.out
@@ -155,6 +155,7 @@ STAGE PLANS:
                           columns.types bigint
                           escape.delim \
                           hive.serialization.extend.additional.nesting.levels true
+                          serialization.escape.crlf true
                           serialization.format 1
                           serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                         serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -557,6 +558,7 @@ STAGE PLANS:
                         columns.types string:string
                         escape.delim \
                         hive.serialization.extend.additional.nesting.levels true
+                        serialization.escape.crlf true
                         serialization.format 1
                         serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -976,6 +978,7 @@ STAGE PLANS:
                         columns.types bigint
                         escape.delim \
                         hive.serialization.extend.additional.nesting.levels true
+                        serialization.escape.crlf true
                         serialization.format 1
                         serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -1005,6 +1008,7 @@ STAGE PLANS:
                         columns.types bigint
                         escape.delim \
                         hive.serialization.extend.additional.nesting.levels true
+                        serialization.escape.crlf true
                         serialization.format 1
                         serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -1412,6 +1416,7 @@ STAGE PLANS:
                         columns.types string:string
                         escape.delim \
                         hive.serialization.extend.additional.nesting.levels true
+                        serialization.escape.crlf true
                         serialization.format 1
                         serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -1566,6 +1571,7 @@ STAGE PLANS:
                               columns.types string
                               escape.delim \
                               hive.serialization.extend.additional.nesting.levels true
+                              serialization.escape.crlf true
                               serialization.format 1
                               serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                             serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -1730,6 +1736,7 @@ STAGE PLANS:
                         columns.types string
                         escape.delim \
                         hive.serialization.extend.additional.nesting.levels true
+                        serialization.escape.crlf true
                         serialization.format 1
                         serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -1969,6 +1976,7 @@ STAGE PLANS:
                           columns.types string:string:string:string
                           escape.delim \
                           hive.serialization.extend.additional.nesting.levels true
+                          serialization.escape.crlf true
                           serialization.format 1
                           serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                         serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -2121,6 +2129,7 @@ STAGE PLANS:
                         columns.types bigint
                         escape.delim \
                         hive.serialization.extend.additional.nesting.levels true
+                        serialization.escape.crlf true
                         serialization.format 1
                         serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe

http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/ql/src/test/results/clientpositive/tez/transform_ppr1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/transform_ppr1.q.out b/ql/src/test/results/clientpositive/tez/transform_ppr1.q.out
index f2d3943..88c273b 100644
--- a/ql/src/test/results/clientpositive/tez/transform_ppr1.q.out
+++ b/ql/src/test/results/clientpositive/tez/transform_ppr1.q.out
@@ -355,6 +355,7 @@ STAGE PLANS:
                         columns.types string:string
                         escape.delim \
                         hive.serialization.extend.additional.nesting.levels true
+                        serialization.escape.crlf true
                         serialization.format 1
                         serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe

http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/ql/src/test/results/clientpositive/tez/transform_ppr2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/transform_ppr2.q.out b/ql/src/test/results/clientpositive/tez/transform_ppr2.q.out
index 02187fe..04fa2f9 100644
--- a/ql/src/test/results/clientpositive/tez/transform_ppr2.q.out
+++ b/ql/src/test/results/clientpositive/tez/transform_ppr2.q.out
@@ -263,6 +263,7 @@ STAGE PLANS:
                         columns.types string:string
                         escape.delim \
                         hive.serialization.extend.additional.nesting.levels true
+                        serialization.escape.crlf true
                         serialization.format 1
                         serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe

http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/ql/src/test/results/clientpositive/tez/unionDistinct_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/unionDistinct_1.q.out b/ql/src/test/results/clientpositive/tez/unionDistinct_1.q.out
index 5ed3d9e..2957cb2 100644
--- a/ql/src/test/results/clientpositive/tez/unionDistinct_1.q.out
+++ b/ql/src/test/results/clientpositive/tez/unionDistinct_1.q.out
@@ -8359,6 +8359,7 @@ STAGE PLANS:
                         columns.types string:bigint
                         escape.delim \
                         hive.serialization.extend.additional.nesting.levels true
+                        serialization.escape.crlf true
                         serialization.format 1
                         serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -8930,6 +8931,7 @@ STAGE PLANS:
                         columns.types string:bigint
                         escape.delim \
                         hive.serialization.extend.additional.nesting.levels true
+                        serialization.escape.crlf true
                         serialization.format 1
                         serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -9495,6 +9497,7 @@ STAGE PLANS:
                         columns.types string:bigint
                         escape.delim \
                         hive.serialization.extend.additional.nesting.levels true
+                        serialization.escape.crlf true
                         serialization.format 1
                         serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe

http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/ql/src/test/results/clientpositive/tez/vectorized_ptf.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/vectorized_ptf.q.out b/ql/src/test/results/clientpositive/tez/vectorized_ptf.q.out
index 17bcc26..687085d 100644
--- a/ql/src/test/results/clientpositive/tez/vectorized_ptf.q.out
+++ b/ql/src/test/results/clientpositive/tez/vectorized_ptf.q.out
@@ -385,6 +385,7 @@ STAGE PLANS:
                             columns.types string:string:int:int:int:double
                             escape.delim \
                             hive.serialization.extend.additional.nesting.levels true
+                            serialization.escape.crlf true
                             serialization.format 1
                             serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                           serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -794,6 +795,7 @@ STAGE PLANS:
                             columns.types string:string:int:int
                             escape.delim \
                             hive.serialization.extend.additional.nesting.levels true
+                            serialization.escape.crlf true
                             serialization.format 1
                             serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                           serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -1015,6 +1017,7 @@ STAGE PLANS:
                             columns.types string:string:int
                             escape.delim \
                             hive.serialization.extend.additional.nesting.levels true
+                            serialization.escape.crlf true
                             serialization.format 1
                             serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                           serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -1336,6 +1339,7 @@ STAGE PLANS:
                             columns.types string:string:int:int:int:double
                             escape.delim \
                             hive.serialization.extend.additional.nesting.levels true
+                            serialization.escape.crlf true
                             serialization.format 1
                             serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                           serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -1670,6 +1674,7 @@ STAGE PLANS:
                             columns.types string:string:int:int:int:int:int
                             escape.delim \
                             hive.serialization.extend.additional.nesting.levels true
+                            serialization.escape.crlf true
                             serialization.format 1
                             serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                           serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -2022,6 +2027,7 @@ STAGE PLANS:
                             columns.types string:string:int:int:int:int:int
                             escape.delim \
                             hive.serialization.extend.additional.nesting.levels true
+                            serialization.escape.crlf true
                             serialization.format 1
                             serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                           serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -2348,6 +2354,7 @@ STAGE PLANS:
                         columns.types int:string:string:string:string:int:string:double:string
                         escape.delim \
                         hive.serialization.extend.additional.nesting.levels true
+                        serialization.escape.crlf true
                         serialization.format 1
                         serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -2640,6 +2647,7 @@ STAGE PLANS:
                           columns.types int:string:string:string:string:int:string:double:string
                           escape.delim \
                           hive.serialization.extend.additional.nesting.levels true
+                          serialization.escape.crlf true
                           serialization.format 1
                           serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                         serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -2966,6 +2974,7 @@ STAGE PLANS:
                             columns.types string:string:int:int
                             escape.delim \
                             hive.serialization.extend.additional.nesting.levels true
+                            serialization.escape.crlf true
                             serialization.format 1
                             serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                           serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -3302,6 +3311,7 @@ STAGE PLANS:
                             columns.types string:string:int:int:int:double
                             escape.delim \
                             hive.serialization.extend.additional.nesting.levels true
+                            serialization.escape.crlf true
                             serialization.format 1
                             serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                           serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -3626,6 +3636,7 @@ STAGE PLANS:
                             columns.types string:string:int:int:int:double
                             escape.delim \
                             hive.serialization.extend.additional.nesting.levels true
+                            serialization.escape.crlf true
                             serialization.format 1
                             serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                           serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -4020,6 +4031,7 @@ STAGE PLANS:
                             columns.types string:string:int:int:int:double
                             escape.delim \
                             hive.serialization.extend.additional.nesting.levels true
+                            serialization.escape.crlf true
                             serialization.format 1
                             serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                           serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -4366,6 +4378,7 @@ STAGE PLANS:
                             columns.types string:string:bigint:double
                             escape.delim \
                             hive.serialization.extend.additional.nesting.levels true
+                            serialization.escape.crlf true
                             serialization.format 1
                             serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                           serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -4901,6 +4914,7 @@ STAGE PLANS:
                             columns.types string:string:int:int:bigint:double:double:int:int
                             escape.delim \
                             hive.serialization.extend.additional.nesting.levels true
+                            serialization.escape.crlf true
                             serialization.format 1
                             serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                           serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -5154,6 +5168,7 @@ STAGE PLANS:
                         columns.types string:string:int
                         escape.delim \
                         hive.serialization.extend.additional.nesting.levels true
+                        serialization.escape.crlf true
                         serialization.format 1
                         serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -5462,6 +5477,7 @@ STAGE PLANS:
                             columns.types string:string:double:double
                             escape.delim \
                             hive.serialization.extend.additional.nesting.levels true
+                            serialization.escape.crlf true
                             serialization.format 1
                             serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                           serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -6638,6 +6654,7 @@ STAGE PLANS:
                             columns.types string:string:int:int:int:bigint
                             escape.delim \
                             hive.serialization.extend.additional.nesting.levels true
+                            serialization.escape.crlf true
                             serialization.format 1
                             serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                           serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -7088,6 +7105,7 @@ STAGE PLANS:
                             columns.types string:string:int:int:int:bigint
                             escape.delim \
                             hive.serialization.extend.additional.nesting.levels true
+                            serialization.escape.crlf true
                             serialization.format 1
                             serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                           serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -7499,6 +7517,7 @@ STAGE PLANS:
                             columns.types string:string:int:int:int:bigint
                             escape.delim \
                             hive.serialization.extend.additional.nesting.levels true
+                            serialization.escape.crlf true
                             serialization.format 1
                             serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                           serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -7961,6 +7980,7 @@ STAGE PLANS:
                             columns.types string:string:int:int:int:bigint
                             escape.delim \
                             hive.serialization.extend.additional.nesting.levels true
+                            serialization.escape.crlf true
                             serialization.format 1
                             serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                           serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -8432,6 +8452,7 @@ STAGE PLANS:
                             columns.types string:string:int:int:int:bigint:bigint
                             escape.delim \
                             hive.serialization.extend.additional.nesting.levels true
+                            serialization.escape.crlf true
                             serialization.format 1
                             serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                           serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -8862,6 +8883,7 @@ STAGE PLANS:
                             columns.types string:string:int:int:int:bigint:bigint
                             escape.delim \
                             hive.serialization.extend.additional.nesting.levels true
+                            serialization.escape.crlf true
                             serialization.format 1
                             serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                           serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe

http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/ql/src/test/results/clientpositive/transform_ppr1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/transform_ppr1.q.out b/ql/src/test/results/clientpositive/transform_ppr1.q.out
index 99f7373..1a0f333 100644
--- a/ql/src/test/results/clientpositive/transform_ppr1.q.out
+++ b/ql/src/test/results/clientpositive/transform_ppr1.q.out
@@ -349,6 +349,7 @@ STAGE PLANS:
                   columns.types string:string
                   escape.delim \
                   hive.serialization.extend.additional.nesting.levels true
+                  serialization.escape.crlf true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe

http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/ql/src/test/results/clientpositive/transform_ppr2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/transform_ppr2.q.out b/ql/src/test/results/clientpositive/transform_ppr2.q.out
index 2549e7f..f307f94 100644
--- a/ql/src/test/results/clientpositive/transform_ppr2.q.out
+++ b/ql/src/test/results/clientpositive/transform_ppr2.q.out
@@ -257,6 +257,7 @@ STAGE PLANS:
                   columns.types string:string
                   escape.delim \
                   hive.serialization.extend.additional.nesting.levels true
+                  serialization.escape.crlf true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe

http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/ql/src/test/results/clientpositive/udf_explode.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/udf_explode.q.out b/ql/src/test/results/clientpositive/udf_explode.q.out
index ee38a2e..f3b6b92 100644
--- a/ql/src/test/results/clientpositive/udf_explode.q.out
+++ b/ql/src/test/results/clientpositive/udf_explode.q.out
@@ -294,6 +294,7 @@ STAGE PLANS:
                   columns.types int:bigint
                   escape.delim \
                   hive.serialization.extend.additional.nesting.levels true
+                  serialization.escape.crlf true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -643,6 +644,7 @@ STAGE PLANS:
                   columns.types int:string:bigint
                   escape.delim \
                   hive.serialization.extend.additional.nesting.levels true
+                  serialization.escape.crlf true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe

http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/ql/src/test/results/clientpositive/udtf_explode.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/udtf_explode.q.out b/ql/src/test/results/clientpositive/udtf_explode.q.out
index fa67a56..b612d21 100644
--- a/ql/src/test/results/clientpositive/udtf_explode.q.out
+++ b/ql/src/test/results/clientpositive/udtf_explode.q.out
@@ -360,6 +360,7 @@ STAGE PLANS:
                   columns.types int:bigint
                   escape.delim \
                   hive.serialization.extend.additional.nesting.levels true
+                  serialization.escape.crlf true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -682,6 +683,7 @@ STAGE PLANS:
                   columns.types int:string:bigint
                   escape.delim \
                   hive.serialization.extend.additional.nesting.levels true
+                  serialization.escape.crlf true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe

http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/ql/src/test/results/clientpositive/union24.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union24.q.out b/ql/src/test/results/clientpositive/union24.q.out
index 8c0c149..c0f8cd0 100644
--- a/ql/src/test/results/clientpositive/union24.q.out
+++ b/ql/src/test/results/clientpositive/union24.q.out
@@ -321,6 +321,7 @@ STAGE PLANS:
                           columns.types string:bigint
                           escape.delim \
                           hive.serialization.extend.additional.nesting.levels true
+                          serialization.escape.crlf true
                           serialization.format 1
                           serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                         serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -356,6 +357,7 @@ STAGE PLANS:
                           columns.types string:bigint
                           escape.delim \
                           hive.serialization.extend.additional.nesting.levels true
+                          serialization.escape.crlf true
                           serialization.format 1
                           serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                         serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -391,6 +393,7 @@ STAGE PLANS:
                           columns.types string:bigint
                           escape.delim \
                           hive.serialization.extend.additional.nesting.levels true
+                          serialization.escape.crlf true
                           serialization.format 1
                           serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                         serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -416,6 +419,7 @@ STAGE PLANS:
                       columns.types string:bigint
                       escape.delim \
                       hive.serialization.extend.additional.nesting.levels true
+                      serialization.escape.crlf true
                       serialization.format 1
                       serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -970,6 +974,7 @@ STAGE PLANS:
                           columns.types string:bigint
                           escape.delim \
                           hive.serialization.extend.additional.nesting.levels true
+                          serialization.escape.crlf true
                           serialization.format 1
                           serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                         serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -1005,6 +1010,7 @@ STAGE PLANS:
                           columns.types string:bigint
                           escape.delim \
                           hive.serialization.extend.additional.nesting.levels true
+                          serialization.escape.crlf true
                           serialization.format 1
                           serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                         serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -1030,6 +1036,7 @@ STAGE PLANS:
                       columns.types string:bigint
                       escape.delim \
                       hive.serialization.extend.additional.nesting.levels true
+                      serialization.escape.crlf true
                       serialization.format 1
                       serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -1599,6 +1606,7 @@ STAGE PLANS:
                           columns.types string:bigint
                           escape.delim \
                           hive.serialization.extend.additional.nesting.levels true
+                          serialization.escape.crlf true
                           serialization.format 1
                           serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                         serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -1634,6 +1642,7 @@ STAGE PLANS:
                           columns.types string:bigint
                           escape.delim \
                           hive.serialization.extend.additional.nesting.levels true
+                          serialization.escape.crlf true
                           serialization.format 1
                           serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                         serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -1659,6 +1668,7 @@ STAGE PLANS:
                       columns.types string:bigint
                       escape.delim \
                       hive.serialization.extend.additional.nesting.levels true
+                      serialization.escape.crlf true
                       serialization.format 1
                       serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe

http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/ql/src/test/results/clientpositive/unionDistinct_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/unionDistinct_1.q.out b/ql/src/test/results/clientpositive/unionDistinct_1.q.out
index fade3f7..591df42 100644
--- a/ql/src/test/results/clientpositive/unionDistinct_1.q.out
+++ b/ql/src/test/results/clientpositive/unionDistinct_1.q.out
@@ -9012,6 +9012,7 @@ STAGE PLANS:
                   columns.types string:bigint
                   escape.delim \
                   hive.serialization.extend.additional.nesting.levels true
+                  serialization.escape.crlf true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -9713,6 +9714,7 @@ STAGE PLANS:
                   columns.types string:bigint
                   escape.delim \
                   hive.serialization.extend.additional.nesting.levels true
+                  serialization.escape.crlf true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -10197,6 +10199,7 @@ STAGE PLANS:
                   columns.types string:bigint
                   escape.delim \
                   hive.serialization.extend.additional.nesting.levels true
+                  serialization.escape.crlf true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe

http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/ql/src/test/results/clientpositive/union_ppr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union_ppr.q.out b/ql/src/test/results/clientpositive/union_ppr.q.out
index 9d768c7..08f649e 100644
--- a/ql/src/test/results/clientpositive/union_ppr.q.out
+++ b/ql/src/test/results/clientpositive/union_ppr.q.out
@@ -283,6 +283,7 @@ STAGE PLANS:
                   columns.types string:string:string:string
                   escape.delim \
                   hive.serialization.extend.additional.nesting.levels true
+                  serialization.escape.crlf true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe

http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/ql/src/test/results/clientpositive/vectorized_ptf.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vectorized_ptf.q.out b/ql/src/test/results/clientpositive/vectorized_ptf.q.out
index e0622de..04dd4f8 100644
--- a/ql/src/test/results/clientpositive/vectorized_ptf.q.out
+++ b/ql/src/test/results/clientpositive/vectorized_ptf.q.out
@@ -426,6 +426,7 @@ STAGE PLANS:
                       columns.types string:string:int:int:int:double
                       escape.delim \
                       hive.serialization.extend.additional.nesting.levels true
+                      serialization.escape.crlf true
                       serialization.format 1
                       serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -869,6 +870,7 @@ STAGE PLANS:
                       columns.types string:string:int:int
                       escape.delim \
                       hive.serialization.extend.additional.nesting.levels true
+                      serialization.escape.crlf true
                       serialization.format 1
                       serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -1084,6 +1086,7 @@ STAGE PLANS:
                       columns.types string:string:int
                       escape.delim \
                       hive.serialization.extend.additional.nesting.levels true
+                      serialization.escape.crlf true
                       serialization.format 1
                       serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -1446,6 +1449,7 @@ STAGE PLANS:
                       columns.types string:string:int:int:int:double
                       escape.delim \
                       hive.serialization.extend.additional.nesting.levels true
+                      serialization.escape.crlf true
                       serialization.format 1
                       serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -1821,6 +1825,7 @@ STAGE PLANS:
                       columns.types string:string:int:int:int:int:int
                       escape.delim \
                       hive.serialization.extend.additional.nesting.levels true
+                      serialization.escape.crlf true
                       serialization.format 1
                       serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -2214,6 +2219,7 @@ STAGE PLANS:
                       columns.types string:string:int:int:int:int:int
                       escape.delim \
                       hive.serialization.extend.additional.nesting.levels true
+                      serialization.escape.crlf true
                       serialization.format 1
                       serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -2573,6 +2579,7 @@ STAGE PLANS:
                   columns.types int:string:string:string:string:int:string:double:string
                   escape.delim \
                   hive.serialization.extend.additional.nesting.levels true
+                  serialization.escape.crlf true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -2931,6 +2938,7 @@ STAGE PLANS:
                     columns.types int:string:string:string:string:int:string:double:string
                     escape.delim \
                     hive.serialization.extend.additional.nesting.levels true
+                    serialization.escape.crlf true
                     serialization.format 1
                     serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                   serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -3265,6 +3273,7 @@ STAGE PLANS:
                       columns.types string:string:int:int
                       escape.delim \
                       hive.serialization.extend.additional.nesting.levels true
+                      serialization.escape.crlf true
                       serialization.format 1
                       serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -3642,6 +3651,7 @@ STAGE PLANS:
                       columns.types string:string:int:int:int:double
                       escape.delim \
                       hive.serialization.extend.additional.nesting.levels true
+                      serialization.escape.crlf true
                       serialization.format 1
                       serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -4007,6 +4017,7 @@ STAGE PLANS:
                       columns.types string:string:int:int:int:double
                       escape.delim \
                       hive.serialization.extend.additional.nesting.levels true
+                      serialization.escape.crlf true
                       serialization.format 1
                       serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -4489,6 +4500,7 @@ STAGE PLANS:
                       columns.types string:string:int:int:int:double
                       escape.delim \
                       hive.serialization.extend.additional.nesting.levels true
+                      serialization.escape.crlf true
                       serialization.format 1
                       serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -4876,6 +4888,7 @@ STAGE PLANS:
                       columns.types string:string:bigint:double
                       escape.delim \
                       hive.serialization.extend.additional.nesting.levels true
+                      serialization.escape.crlf true
                       serialization.format 1
                       serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -5491,6 +5504,7 @@ STAGE PLANS:
                       columns.types string:string:int:int:bigint:double:double:int:int
                       escape.delim \
                       hive.serialization.extend.additional.nesting.levels true
+                      serialization.escape.crlf true
                       serialization.format 1
                       serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -5784,6 +5798,7 @@ STAGE PLANS:
                   columns.types string:string:int
                   escape.delim \
                   hive.serialization.extend.additional.nesting.levels true
+                  serialization.escape.crlf true
                   serialization.format 1
                   serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -6133,6 +6148,7 @@ STAGE PLANS:
                       columns.types string:string:double:double
                       escape.delim \
                       hive.serialization.extend.additional.nesting.levels true
+                      serialization.escape.crlf true
                       serialization.format 1
                       serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -7528,6 +7544,7 @@ STAGE PLANS:
                       columns.types string:string:int:int:int:bigint
                       escape.delim \
                       hive.serialization.extend.additional.nesting.levels true
+                      serialization.escape.crlf true
                       serialization.format 1
                       serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -8113,6 +8130,7 @@ STAGE PLANS:
                       columns.types string:string:int:int:int:bigint
                       escape.delim \
                       hive.serialization.extend.additional.nesting.levels true
+                      serialization.escape.crlf true
                       serialization.format 1
                       serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -8612,6 +8630,7 @@ STAGE PLANS:
                       columns.types string:string:int:int:int:bigint
                       escape.delim \
                       hive.serialization.extend.additional.nesting.levels true
+                      serialization.escape.crlf true
                       serialization.format 1
                       serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -9209,6 +9228,7 @@ STAGE PLANS:
                       columns.types string:string:int:int:int:bigint
                       escape.delim \
                       hive.serialization.extend.additional.nesting.levels true
+                      serialization.escape.crlf true
                       serialization.format 1
                       serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -9768,6 +9788,7 @@ STAGE PLANS:
                       columns.types string:string:int:int:int:bigint:bigint
                       escape.delim \
                       hive.serialization.extend.additional.nesting.levels true
+                      serialization.escape.crlf true
                       serialization.format 1
                       serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -10286,6 +10307,7 @@ STAGE PLANS:
                       columns.types string:string:int:int:int:bigint:bigint
                       escape.delim \
                       hive.serialization.extend.additional.nesting.levels true
+                      serialization.escape.crlf true
                       serialization.format 1
                       serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe

http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/serde/if/serde.thrift
----------------------------------------------------------------------
diff --git a/serde/if/serde.thrift b/serde/if/serde.thrift
index d828bac..40d5f47 100644
--- a/serde/if/serde.thrift
+++ b/serde/if/serde.thrift
@@ -27,6 +27,7 @@ const string SERIALIZATION_CLASS = "serialization.class"
 const string SERIALIZATION_FORMAT = "serialization.format"
 const string SERIALIZATION_DDL = "serialization.ddl"
 const string SERIALIZATION_NULL_FORMAT = "serialization.null.format"
+const string SERIALIZATION_ESCAPE_CRLF = "serialization.escape.crlf"
 const string SERIALIZATION_LAST_COLUMN_TAKES_REST = "serialization.last.column.takes.rest"
 const string SERIALIZATION_SORT_ORDER = "serialization.sort.order"
 const string SERIALIZATION_USE_JSON_OBJECTS = "serialization.use.json.object"

http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/serde/src/gen/thrift/gen-cpp/serde_constants.cpp
----------------------------------------------------------------------
diff --git a/serde/src/gen/thrift/gen-cpp/serde_constants.cpp b/serde/src/gen/thrift/gen-cpp/serde_constants.cpp
index 196a46f..d5d6999 100644
--- a/serde/src/gen/thrift/gen-cpp/serde_constants.cpp
+++ b/serde/src/gen/thrift/gen-cpp/serde_constants.cpp
@@ -21,6 +21,8 @@ serdeConstants::serdeConstants() {
 
   SERIALIZATION_NULL_FORMAT = "serialization.null.format";
 
+  SERIALIZATION_ESCAPE_CRLF = "serialization.escape.crlf";
+
   SERIALIZATION_LAST_COLUMN_TAKES_REST = "serialization.last.column.takes.rest";
 
   SERIALIZATION_SORT_ORDER = "serialization.sort.order";

http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/serde/src/gen/thrift/gen-cpp/serde_constants.h
----------------------------------------------------------------------
diff --git a/serde/src/gen/thrift/gen-cpp/serde_constants.h b/serde/src/gen/thrift/gen-cpp/serde_constants.h
index 36bd175..cd48926 100644
--- a/serde/src/gen/thrift/gen-cpp/serde_constants.h
+++ b/serde/src/gen/thrift/gen-cpp/serde_constants.h
@@ -20,6 +20,7 @@ class serdeConstants {
   std::string SERIALIZATION_FORMAT;
   std::string SERIALIZATION_DDL;
   std::string SERIALIZATION_NULL_FORMAT;
+  std::string SERIALIZATION_ESCAPE_CRLF;
   std::string SERIALIZATION_LAST_COLUMN_TAKES_REST;
   std::string SERIALIZATION_SORT_ORDER;
   std::string SERIALIZATION_USE_JSON_OBJECTS;

http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/serdeConstants.java
----------------------------------------------------------------------
diff --git a/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/serdeConstants.java b/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/serdeConstants.java
index f12d4c7..7902849 100644
--- a/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/serdeConstants.java
+++ b/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/serdeConstants.java
@@ -46,6 +46,8 @@ public class serdeConstants {
 
   public static final String SERIALIZATION_NULL_FORMAT = "serialization.null.format";
 
+  public static final String SERIALIZATION_ESCAPE_CRLF = "serialization.escape.crlf";
+
   public static final String SERIALIZATION_LAST_COLUMN_TAKES_REST = "serialization.last.column.takes.rest";
 
   public static final String SERIALIZATION_SORT_ORDER = "serialization.sort.order";

http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/serde/src/gen/thrift/gen-php/org/apache/hadoop/hive/serde/Types.php
----------------------------------------------------------------------
diff --git a/serde/src/gen/thrift/gen-php/org/apache/hadoop/hive/serde/Types.php b/serde/src/gen/thrift/gen-php/org/apache/hadoop/hive/serde/Types.php
index 2475cc8..94dc455 100644
--- a/serde/src/gen/thrift/gen-php/org/apache/hadoop/hive/serde/Types.php
+++ b/serde/src/gen/thrift/gen-php/org/apache/hadoop/hive/serde/Types.php
@@ -23,6 +23,7 @@ final class Constant extends \Thrift\Type\TConstant {
   static protected $SERIALIZATION_FORMAT;
   static protected $SERIALIZATION_DDL;
   static protected $SERIALIZATION_NULL_FORMAT;
+  static protected $SERIALIZATION_ESCAPE_CRLF;
   static protected $SERIALIZATION_LAST_COLUMN_TAKES_REST;
   static protected $SERIALIZATION_SORT_ORDER;
   static protected $SERIALIZATION_USE_JSON_OBJECTS;
@@ -84,6 +85,10 @@ final class Constant extends \Thrift\Type\TConstant {
     return "serialization.null.format";
   }
 
+  static protected function init_SERIALIZATION_ESCAPE_CRLF() {
+    return "serialization.escape.crlf";
+  }
+
   static protected function init_SERIALIZATION_LAST_COLUMN_TAKES_REST() {
     return "serialization.last.column.takes.rest";
   }

http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/serde/src/gen/thrift/gen-py/org_apache_hadoop_hive_serde/constants.py
----------------------------------------------------------------------
diff --git a/serde/src/gen/thrift/gen-py/org_apache_hadoop_hive_serde/constants.py b/serde/src/gen/thrift/gen-py/org_apache_hadoop_hive_serde/constants.py
index 27a6cdb..1673073 100644
--- a/serde/src/gen/thrift/gen-py/org_apache_hadoop_hive_serde/constants.py
+++ b/serde/src/gen/thrift/gen-py/org_apache_hadoop_hive_serde/constants.py
@@ -14,6 +14,7 @@ SERIALIZATION_CLASS = "serialization.class"
 SERIALIZATION_FORMAT = "serialization.format"
 SERIALIZATION_DDL = "serialization.ddl"
 SERIALIZATION_NULL_FORMAT = "serialization.null.format"
+SERIALIZATION_ESCAPE_CRLF = "serialization.escape.crlf"
 SERIALIZATION_LAST_COLUMN_TAKES_REST = "serialization.last.column.takes.rest"
 SERIALIZATION_SORT_ORDER = "serialization.sort.order"
 SERIALIZATION_USE_JSON_OBJECTS = "serialization.use.json.object"

http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/serde/src/gen/thrift/gen-rb/serde_constants.rb
----------------------------------------------------------------------
diff --git a/serde/src/gen/thrift/gen-rb/serde_constants.rb b/serde/src/gen/thrift/gen-rb/serde_constants.rb
index 2eb4754..56d9e76 100644
--- a/serde/src/gen/thrift/gen-rb/serde_constants.rb
+++ b/serde/src/gen/thrift/gen-rb/serde_constants.rb
@@ -17,6 +17,8 @@ SERIALIZATION_DDL = %q"serialization.ddl"
 
 SERIALIZATION_NULL_FORMAT = %q"serialization.null.format"
 
+SERIALIZATION_ESCAPE_CRLF = %q"serialization.escape.crlf"
+
 SERIALIZATION_LAST_COLUMN_TAKES_REST = %q"serialization.last.column.takes.rest"
 
 SERIALIZATION_SORT_ORDER = %q"serialization.sort.order"

http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/serde/src/java/org/apache/hadoop/hive/serde2/columnar/ColumnarSerDe.java
----------------------------------------------------------------------
diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/columnar/ColumnarSerDe.java b/serde/src/java/org/apache/hadoop/hive/serde2/columnar/ColumnarSerDe.java
index a611c05..0ca8e2d 100644
--- a/serde/src/java/org/apache/hadoop/hive/serde2/columnar/ColumnarSerDe.java
+++ b/serde/src/java/org/apache/hadoop/hive/serde2/columnar/ColumnarSerDe.java
@@ -55,6 +55,7 @@ import org.apache.hadoop.io.Writable;
     serdeConstants.LIST_COLUMNS, serdeConstants.LIST_COLUMN_TYPES,
     serdeConstants.FIELD_DELIM, serdeConstants.COLLECTION_DELIM, serdeConstants.MAPKEY_DELIM,
     serdeConstants.SERIALIZATION_FORMAT, serdeConstants.SERIALIZATION_NULL_FORMAT,
+    serdeConstants.SERIALIZATION_ESCAPE_CRLF,
     serdeConstants.SERIALIZATION_LAST_COLUMN_TAKES_REST,
     serdeConstants.ESCAPE_CHAR,
     serdeConstants.SERIALIZATION_ENCODING,
@@ -112,11 +113,6 @@ public class ColumnarSerDe extends ColumnarSerDeBase {
         cachedObjectInspector, notSkipIDs, serdeParams.getNullSequence());
 
     super.initialize(size);
-    LOG.debug("ColumnarSerDe initialized with: columnNames="
-        + serdeParams.getColumnNames() + " columnTypes="
-        + serdeParams.getColumnTypes() + " separator="
-        + Arrays.asList(serdeParams.getSeparators()) + " nullstring="
-        + serdeParams.getNullString());
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySerDeParameters.java
----------------------------------------------------------------------
diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySerDeParameters.java b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySerDeParameters.java
index 60d11a2..2ab6c5b 100644
--- a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySerDeParameters.java
+++ b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySerDeParameters.java
@@ -25,6 +25,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
 import org.apache.hadoop.hive.serde.serdeConstants;
@@ -41,6 +43,7 @@ import org.apache.hive.common.util.HiveStringUtils;
  *
  */
 public class LazySerDeParameters implements LazyObjectInspectorParameters {
+  public static final Log LOG = LogFactory.getLog(LazySerDeParameters.class.getName());
   public static final byte[] DefaultSeparators = {(byte) 1, (byte) 2, (byte) 3};
   public static final String SERIALIZATION_EXTEND_NESTING_LEVELS
   	= "hive.serialization.extend.nesting.levels";
@@ -53,10 +56,10 @@ public class LazySerDeParameters implements LazyObjectInspectorParameters {
   // The list of bytes used for the separators in the column (a nested struct 
   // such as Array<Array<int>> will use multiple separators).
   // The list of separators + escapeChar are the bytes required to be escaped.
-  private byte[] separators;	
+  private byte[] separators;
 
-  private String nullString;
   private Text nullSequence;
+
   private TypeInfo rowTypeInfo;
   private boolean lastColumnTakesRest;
   private List<String> columnNames;
@@ -64,7 +67,7 @@ public class LazySerDeParameters implements LazyObjectInspectorParameters {
 
   private boolean escaped;
   private byte escapeChar;
-  private boolean[] needsEscape = new boolean[256];  // A flag for each byte to indicate if escape is needed. 
+  private boolean[] needsEscape = new boolean[256];  // A flag for each byte to indicate if escape is needed.
 
   private boolean extendedBooleanLiteral;
   List<String> timestampFormats;
@@ -72,8 +75,8 @@ public class LazySerDeParameters implements LazyObjectInspectorParameters {
   public LazySerDeParameters(Configuration job, Properties tbl, String serdeName) throws SerDeException {
    this.tableProperties = tbl;
    this.serdeName = serdeName;
-  	
-    nullString = tbl.getProperty(
+
+    String nullString = tbl.getProperty(
         serdeConstants.SERIALIZATION_NULL_FORMAT, "\\N");
     nullSequence = new Text(nullString);
     
@@ -88,8 +91,8 @@ public class LazySerDeParameters implements LazyObjectInspectorParameters {
     rowTypeInfo = TypeInfoFactory.getStructTypeInfo(columnNames, columnTypes);
 
     collectSeparators(tbl);
-  	
-    // Get the escape information      
+
+    // Get the escape information
     String escapeProperty = tbl.getProperty(serdeConstants.ESCAPE_CHAR);
     escaped = (escapeProperty != null);
     if (escaped) {
@@ -98,8 +101,18 @@ public class LazySerDeParameters implements LazyObjectInspectorParameters {
       for (byte b : separators) {
         needsEscape[b & 0xFF] = true;         // Converts the negative byte into positive index
       }
+
+      // '\r' and '\n' are reserved and can't be used for escape chars and separators
+      if (needsEscape['\r'] || needsEscape['\n']) {
+        throw new SerDeException("\\r and \\n cannot be used as escaping characters or separators");
+      }
+      boolean isEscapeCRLF = Boolean.valueOf(tbl.getProperty(serdeConstants.SERIALIZATION_ESCAPE_CRLF));
+      if (isEscapeCRLF) {
+        needsEscape['\r'] = true;
+        needsEscape['\n'] = true;
+      }
     }
-    
+
     extendedBooleanLiteral = (job == null ? false :
         job.getBoolean(ConfVars.HIVE_LAZYSIMPLE_EXTENDED_BOOLEAN_LITERAL.varname, false));
     
@@ -108,8 +121,14 @@ public class LazySerDeParameters implements LazyObjectInspectorParameters {
     if (timestampFormatsArray != null) {
       timestampFormats = Arrays.asList(timestampFormatsArray);
     }
+
+    LOG.debug(serdeName + " initialized with: columnNames="
+        + columnNames + " columnTypes=" + columnTypes
+        + " separator=" + Arrays.asList(separators)
+        + " nullstring=" + nullString + " lastColumnTakesRest="
+        + lastColumnTakesRest + " timestampFormats=" + timestampFormats);
   }
-  
+
   /**
    * Extracts and set column names and column types from the table properties
    * @throws SerDeException
@@ -146,7 +165,7 @@ public class LazySerDeParameters implements LazyObjectInspectorParameters {
           + " elements while columns.types has " + columnTypes.size() + " elements!");
     }
   }
-  
+
   public List<TypeInfo> getColumnTypes() {
     return columnTypes;
   }
@@ -155,14 +174,10 @@ public class LazySerDeParameters implements LazyObjectInspectorParameters {
     return columnNames;
   }
 
-  public byte[] getSeparators() {   	
+  public byte[] getSeparators() {
     return separators;
   }
 
-  public String getNullString() {
-    return nullString;
-  }
-
   public Text getNullSequence() {
     return nullSequence;
   }

http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySimpleSerDe.java
----------------------------------------------------------------------
diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySimpleSerDe.java b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySimpleSerDe.java
index c373047..cb3f9d1 100644
--- a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySimpleSerDe.java
+++ b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySimpleSerDe.java
@@ -73,6 +73,7 @@ import org.apache.hive.common.util.HiveStringUtils;
     serdeConstants.LIST_COLUMNS, serdeConstants.LIST_COLUMN_TYPES,
     serdeConstants.FIELD_DELIM, serdeConstants.COLLECTION_DELIM, serdeConstants.MAPKEY_DELIM,
     serdeConstants.SERIALIZATION_FORMAT, serdeConstants.SERIALIZATION_NULL_FORMAT,
+    serdeConstants.SERIALIZATION_ESCAPE_CRLF,
     serdeConstants.SERIALIZATION_LAST_COLUMN_TAKES_REST,
     serdeConstants.ESCAPE_CHAR,
     serdeConstants.SERIALIZATION_ENCODING,
@@ -132,12 +133,6 @@ public class LazySimpleSerDe extends AbstractEncodingAwareSerDe {
     cachedLazyStruct = (LazyStruct) LazyFactory
         .createLazyObject(cachedObjectInspector);
 
-    LOG.debug(getClass().getName() + " initialized with: columnNames="
-        + serdeParams.getColumnNames() + " columnTypes=" + serdeParams.getColumnTypes()
-        + " separator=" + Arrays.asList(serdeParams.getSeparators())
-        + " nullstring=" + serdeParams.getNullString() + " lastColumnTakesRest="
-        + serdeParams.isLastColumnTakesRest() + " timestampFormats=" + serdeParams.getTimestampFormats());
-
     serializedSize = 0;
     stats = new SerDeStats();
     lastOperationSerialize = false;

http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyUtils.java
----------------------------------------------------------------------
diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyUtils.java b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyUtils.java
index a5e4be4..d6b2219 100644
--- a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyUtils.java
+++ b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyUtils.java
@@ -181,10 +181,19 @@ public final class LazyUtils {
           if (i > start) {
             out.write(bytes, start, i - start);
           }
-          start = i;
-          if (i < len) {
-            out.write(escapeChar);
+
+          if (i == end) break;
+
+          out.write(escapeChar);
+          if (bytes[i] == '\r') {
+            out.write('r');
+            start = i + 1;
+          } else if (bytes[i] == '\n') {
+            out.write('n');
+            start = i + 1;
+          } else {
             // the current char will be written out later.
+            start = i;
           }
         }
       }
@@ -443,12 +452,19 @@ public final class LazyUtils {
       byte[] outputBytes = data.getBytes();
       for (int i = 0; i < length; i++) {
         byte b = inputBytes[start + i];
-        if (b != escapeChar || i == length - 1) {
-          outputBytes[k++] = b;
+        if (b == escapeChar && i < length - 1) {
+          ++i;
+          // Check if it's '\r' or '\n'
+          if (inputBytes[start + i] == 'r') {
+            outputBytes[k++] = '\r';
+          } else if (inputBytes[start + i] == 'n') {
+            outputBytes[k++] = '\n';
+          } else {
+            // get the next byte
+            outputBytes[k++] = inputBytes[start + i];
+          }
         } else {
-          // get the next byte
-          i++;
-          outputBytes[k++] = inputBytes[start + i];
+          outputBytes[k++] = b;
         }
       }
       assert (k == outputLength);


Mime
View raw message