FAQ
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);

Search Discussions

  • Sunchao at Oct 16, 2015 at 6:59 pm
    HIVE-11785: Support escaping carriage return and new line for LazySimpleSerDe (Aihua Xu, reviewed by Chao Sun)


    Project: http://git-wip-us.apache.org/repos/asf/hive/repo
    Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/3e7d1c45
    Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/3e7d1c45
    Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/3e7d1c45

    Branch: refs/heads/master
    Commit: 3e7d1c45f2f0769088074f01e89e9aededf2551b
    Parents: 3ecbd02
    Author: Aihua Xu <aihuaxu@gmail.com>
    Authored: Fri Oct 16 11:58:37 2015 -0700
    Committer: Chao Sun <sunchao@apache.org>
    Committed: Fri Oct 16 11:58:37 2015 -0700

    ----------------------------------------------------------------------
      .../hive/contrib/serde2/MultiDelimitSerDe.java | 1 +
      data/files/escape_crlf.txt | 2 +
      .../apache/hadoop/hive/hbase/HBaseSerDe.java | 1 +
      .../apache/hadoop/hive/ql/plan/PlanUtils.java | 3 +-
      .../test/queries/clientpositive/escape_crlf.q | 19 ++++
      .../alter_partition_coltype.q.out | 3 +
      .../auto_join_reordering_values.q.out | 1 +
      .../clientpositive/auto_sortmerge_join_1.q.out | 5 +
      .../clientpositive/auto_sortmerge_join_11.q.out | 4 +
      .../clientpositive/auto_sortmerge_join_12.q.out | 1 +
      .../clientpositive/auto_sortmerge_join_2.q.out | 4 +
      .../clientpositive/auto_sortmerge_join_3.q.out | 5 +
      .../clientpositive/auto_sortmerge_join_4.q.out | 5 +
      .../clientpositive/auto_sortmerge_join_5.q.out | 5 +
      .../clientpositive/auto_sortmerge_join_7.q.out | 5 +
      .../clientpositive/auto_sortmerge_join_8.q.out | 5 +
      .../clientpositive/bucket_map_join_1.q.out | 1 +
      .../clientpositive/bucket_map_join_2.q.out | 1 +
      .../clientpositive/bucket_map_join_spark4.q.out | 2 +
      .../clientpositive/bucketcontext_1.q.out | 2 +
      .../clientpositive/bucketcontext_2.q.out | 2 +
      .../clientpositive/bucketcontext_3.q.out | 2 +
      .../clientpositive/bucketcontext_4.q.out | 2 +
      .../clientpositive/bucketcontext_5.q.out | 2 +
      .../clientpositive/bucketcontext_6.q.out | 2 +
      .../clientpositive/bucketcontext_7.q.out | 2 +
      .../clientpositive/bucketcontext_8.q.out | 2 +
      .../results/clientpositive/bucketmapjoin1.q.out | 2 +
      .../clientpositive/bucketmapjoin10.q.out | 1 +
      .../clientpositive/bucketmapjoin11.q.out | 2 +
      .../clientpositive/bucketmapjoin12.q.out | 2 +
      .../clientpositive/bucketmapjoin13.q.out | 4 +
      .../results/clientpositive/bucketmapjoin7.q.out | 1 +
      .../results/clientpositive/bucketmapjoin8.q.out | 2 +
      .../results/clientpositive/bucketmapjoin9.q.out | 2 +
      .../bucketmapjoin_negative3.q.out | 9 ++
      .../cbo_rp_outer_join_ppr.q.java1.7.out | 2 +
      .../clientpositive/columnstats_partlvl.q.out | 2 +
      .../clientpositive/columnstats_tbllvl.q.out | 2 +
      .../test/results/clientpositive/combine2.q.out | 1 +
      .../constantPropagateForSubQuery.q.out | 1 +
      .../display_colstats_tbllvl.q.out | 1 +
      .../encryption_join_unencrypted_tbl.q.out | 1 +
      ...on_join_with_different_encryption_keys.q.out | 1 +
      .../results/clientpositive/escape_crlf.q.out | 98 ++++++++++++++++++++
      .../clientpositive/filter_join_breaktask.q.out | 1 +
      .../clientpositive/fouter_join_ppr.q.out | 4 +
      .../clientpositive/groupby_sort_1_23.q.out | 1 +
      .../clientpositive/groupby_sort_skew_1_23.q.out | 1 +
      .../test/results/clientpositive/input23.q.out | 1 +
      .../results/clientpositive/input_part7.q.out | 1 +
      .../clientpositive/join_filters_overlap.q.out | 5 +
      .../clientpositive/list_bucket_dml_14.q.out | 1 +
      .../list_bucket_query_multiskew_3.q.out | 1 +
      .../list_bucket_query_oneskew_2.q.out | 2 +
      .../clientpositive/louter_join_ppr.q.out | 4 +
      .../clientpositive/mapjoin_mapjoin.q.out | 1 +
      .../results/clientpositive/metadataonly1.q.out | 9 ++
      .../clientpositive/optimize_nullscan.q.out | 10 ++
      .../clientpositive/outer_join_ppr.q.java1.7.out | 2 +
      ql/src/test/results/clientpositive/pcr.q.out | 17 ++++
      .../results/clientpositive/pointlookup2.q.out | 5 +
      .../results/clientpositive/pointlookup3.q.out | 5 +
      .../clientpositive/ppd_join_filter.q.out | 4 +
      .../results/clientpositive/ppd_union_view.q.out | 4 +
      ql/src/test/results/clientpositive/ppd_vc.q.out | 2 +
      .../clientpositive/ppr_allchildsarenull.q.out | 2 +
      .../test/results/clientpositive/push_or.q.out | 1 +
      .../query_result_fileformat.q.out | 6 +-
      .../clientpositive/rand_partitionpruner1.q.out | 1 +
      .../results/clientpositive/regexp_extract.q.out | 2 +
      .../results/clientpositive/remote_script.q.out | 8 +-
      .../clientpositive/router_join_ppr.q.out | 4 +
      .../test/results/clientpositive/sample10.q.out | 1 +
      .../test/results/clientpositive/sample6.q.out | 7 ++
      .../test/results/clientpositive/sample8.q.out | 1 +
      .../test/results/clientpositive/sample9.q.out | 1 +
      .../clientpositive/serde_user_properties.q.out | 3 +
      .../results/clientpositive/smb_mapjoin9.q.out | 2 +
      .../results/clientpositive/smb_mapjoin_11.q.out | 2 +
      .../results/clientpositive/smb_mapjoin_13.q.out | 2 +
      .../results/clientpositive/smb_mapjoin_15.q.out | 4 +
      .../clientpositive/sort_merge_join_desc_5.q.out | 1 +
      .../clientpositive/sort_merge_join_desc_6.q.out | 1 +
      .../clientpositive/sort_merge_join_desc_7.q.out | 1 +
      .../spark/auto_join_reordering_values.q.out | 1 +
      .../spark/auto_sortmerge_join_1.q.out | 3 +
      .../spark/auto_sortmerge_join_12.q.out | 1 +
      .../spark/auto_sortmerge_join_2.q.out | 2 +
      .../spark/auto_sortmerge_join_3.q.out | 3 +
      .../spark/auto_sortmerge_join_4.q.out | 3 +
      .../spark/auto_sortmerge_join_5.q.out | 3 +
      .../spark/auto_sortmerge_join_7.q.out | 3 +
      .../spark/auto_sortmerge_join_8.q.out | 3 +
      .../spark/bucket_map_join_1.q.out | 1 +
      .../spark/bucket_map_join_2.q.out | 1 +
      .../spark/bucket_map_join_spark4.q.out | 2 +
      .../clientpositive/spark/bucketmapjoin1.q.out | 2 +
      .../clientpositive/spark/bucketmapjoin10.q.out | 1 +
      .../clientpositive/spark/bucketmapjoin11.q.out | 2 +
      .../clientpositive/spark/bucketmapjoin12.q.out | 2 +
      .../clientpositive/spark/bucketmapjoin13.q.out | 4 +
      .../clientpositive/spark/bucketmapjoin7.q.out | 1 +
      .../clientpositive/spark/bucketmapjoin8.q.out | 2 +
      .../clientpositive/spark/bucketmapjoin9.q.out | 2 +
      .../spark/bucketmapjoin_negative3.q.out | 9 ++
      .../spark/filter_join_breaktask.q.out | 1 +
      .../spark/groupby_sort_1_23.q.out | 1 +
      .../spark/groupby_sort_skew_1_23.q.out | 1 +
      .../spark/join_filters_overlap.q.out | 5 +
      .../clientpositive/spark/louter_join_ppr.q.out | 4 +
      .../clientpositive/spark/mapjoin_mapjoin.q.out | 1 +
      .../spark/optimize_nullscan.q.out | 9 ++
      .../spark/outer_join_ppr.q.java1.7.out | 2 +
      .../test/results/clientpositive/spark/pcr.q.out | 17 ++++
      .../clientpositive/spark/ppd_join_filter.q.out | 4 +
      .../clientpositive/spark/remote_script.q.out | 8 +-
      .../clientpositive/spark/router_join_ppr.q.out | 4 +
      .../results/clientpositive/spark/sample10.q.out | 1 +
      .../results/clientpositive/spark/sample6.q.out | 7 ++
      .../results/clientpositive/spark/sample8.q.out | 1 +
      .../clientpositive/spark/smb_mapjoin_13.q.out | 2 +
      .../clientpositive/spark/smb_mapjoin_15.q.out | 4 +
      .../clientpositive/spark/transform_ppr1.q.out | 1 +
      .../clientpositive/spark/transform_ppr2.q.out | 1 +
      .../results/clientpositive/spark/union24.q.out | 10 ++
      .../clientpositive/spark/union_ppr.q.out | 1 +
      .../clientpositive/spark/vectorized_ptf.q.out | 22 +++++
      .../temp_table_display_colstats_tbllvl.q.out | 1 +
      .../tez/auto_sortmerge_join_1.q.out | 3 +
      .../tez/auto_sortmerge_join_11.q.out | 4 +
      .../tez/auto_sortmerge_join_12.q.out | 1 +
      .../tez/auto_sortmerge_join_2.q.out | 2 +
      .../tez/auto_sortmerge_join_3.q.out | 3 +
      .../tez/auto_sortmerge_join_4.q.out | 3 +
      .../tez/auto_sortmerge_join_5.q.out | 3 +
      .../tez/auto_sortmerge_join_7.q.out | 3 +
      .../tez/auto_sortmerge_join_8.q.out | 3 +
      .../tez/filter_join_breaktask.q.out | 1 +
      .../clientpositive/tez/mapjoin_mapjoin.q.out | 1 +
      .../clientpositive/tez/metadataonly1.q.out | 9 ++
      .../clientpositive/tez/optimize_nullscan.q.out | 9 ++
      .../clientpositive/tez/transform_ppr1.q.out | 1 +
      .../clientpositive/tez/transform_ppr2.q.out | 1 +
      .../clientpositive/tez/unionDistinct_1.q.out | 3 +
      .../clientpositive/tez/vectorized_ptf.q.out | 22 +++++
      .../results/clientpositive/transform_ppr1.q.out | 1 +
      .../results/clientpositive/transform_ppr2.q.out | 1 +
      .../results/clientpositive/udf_explode.q.out | 2 +
      .../results/clientpositive/udtf_explode.q.out | 2 +
      .../test/results/clientpositive/union24.q.out | 10 ++
      .../clientpositive/unionDistinct_1.q.out | 3 +
      .../test/results/clientpositive/union_ppr.q.out | 1 +
      .../results/clientpositive/vectorized_ptf.q.out | 22 +++++
      serde/if/serde.thrift | 1 +
      .../src/gen/thrift/gen-cpp/serde_constants.cpp | 2 +
      serde/src/gen/thrift/gen-cpp/serde_constants.h | 1 +
      .../hadoop/hive/serde/serdeConstants.java | 2 +
      .../org/apache/hadoop/hive/serde/Types.php | 5 +
      .../org_apache_hadoop_hive_serde/constants.py | 1 +
      serde/src/gen/thrift/gen-rb/serde_constants.rb | 2 +
      .../hive/serde2/columnar/ColumnarSerDe.java | 6 +-
      .../hive/serde2/lazy/LazySerDeParameters.java | 45 ++++++---
      .../hive/serde2/lazy/LazySimpleSerDe.java | 7 +-
      .../hadoop/hive/serde2/lazy/LazyUtils.java | 32 +++++--
      165 files changed, 685 insertions(+), 46 deletions(-)
    ----------------------------------------------------------------------


    http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/MultiDelimitSerDe.java
    ----------------------------------------------------------------------
    diff --git a/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/MultiDelimitSerDe.java b/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/MultiDelimitSerDe.java
    index 957804a..3e1be7d 100644
    --- a/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/MultiDelimitSerDe.java
    +++ b/contrib/src/java/org/apache/hadoop/hive/contrib/serde2/MultiDelimitSerDe.java
    @@ -60,6 +60,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,

    http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/data/files/escape_crlf.txt
    ----------------------------------------------------------------------
    diff --git a/data/files/escape_crlf.txt b/data/files/escape_crlf.txt
    new file mode 100644
    index 0000000..88a83c2
    --- /dev/null
    +++ b/data/files/escape_crlf.txt
    @@ -0,0 +1,2 @@
    +This\nis\rthe first\r\nmulti-line field|field1-2
    +This\nis\rthe second\r\nmulti-line field|field2-2

    http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDe.java
    ----------------------------------------------------------------------
    diff --git a/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDe.java b/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDe.java
    index ed2df5f..1adb913 100644
    --- a/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDe.java
    +++ b/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDe.java
    @@ -48,6 +48,7 @@ import org.apache.hadoop.mapred.JobConf;
          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,

    http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/ql/src/java/org/apache/hadoop/hive/ql/plan/PlanUtils.java
    ----------------------------------------------------------------------
    diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/PlanUtils.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/PlanUtils.java
    index b50eaab..f17c063 100644
    --- a/ql/src/java/org/apache/hadoop/hive/ql/plan/PlanUtils.java
    +++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/PlanUtils.java
    @@ -282,9 +282,10 @@ public final class PlanUtils {
              false, false, fileFormat);
          //enable escaping
          tblDesc.getProperties().setProperty(serdeConstants.ESCAPE_CHAR, "\\");
    + tblDesc.getProperties().setProperty(serdeConstants.SERIALIZATION_ESCAPE_CRLF, "true");
          //enable extended nesting levels
          tblDesc.getProperties().setProperty(
    - LazySerDeParameters.SERIALIZATION_EXTEND_ADDITIONAL_NESTING_LEVELS, "true");
    + LazySerDeParameters.SERIALIZATION_EXTEND_ADDITIONAL_NESTING_LEVELS, "true");
          return tblDesc;
        }


    http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/ql/src/test/queries/clientpositive/escape_crlf.q
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/queries/clientpositive/escape_crlf.q b/ql/src/test/queries/clientpositive/escape_crlf.q
    new file mode 100644
    index 0000000..2d6e05e
    --- /dev/null
    +++ b/ql/src/test/queries/clientpositive/escape_crlf.q
    @@ -0,0 +1,19 @@
    +DROP TABLE IF EXISTS base_tab;
    +CREATE TABLE base_tab(a STRING, b STRING)
    +ROW FORMAT DELIMITED
    + FIELDS TERMINATED BY '|';
    +DESCRIBE EXTENDED base_tab;
    +
    +LOAD DATA LOCAL INPATH '../../data/files/escape_crlf.txt' OVERWRITE INTO TABLE base_tab;
    +-- No crlf escaping
    +SELECT * FROM base_tab;
    +
    +-- Crlf escaping
    +ALTER TABLE base_tab SET SERDEPROPERTIES ('escape.delim'='\\', 'serialization.escape.crlf'='true');
    +SELECT * FROM base_tab;
    +
    +SET hive.fetch.task.conversion=none;
    +-- Make sure intermediate serde works correctly
    +SELECT * FROM base_tab;
    +
    +DROP TABLE base_tab;

    http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/ql/src/test/results/clientpositive/alter_partition_coltype.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/alter_partition_coltype.q.out b/ql/src/test/results/clientpositive/alter_partition_coltype.q.out
    index a42b464..08bd2b8 100644
    --- a/ql/src/test/results/clientpositive/alter_partition_coltype.q.out
    +++ b/ql/src/test/results/clientpositive/alter_partition_coltype.q.out
    @@ -256,6 +256,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
    @@ -434,6 +435,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
    @@ -591,6 +593,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/auto_join_reordering_values.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out b/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out
    index 1a54d01..f42b45e 100644
    --- a/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out
    +++ b/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out
    @@ -668,6 +668,7 @@ STAGE PLANS:
                            columns.types 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

    http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out b/ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out
    index 5114038..f1aadef 100644
    --- a/ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out
    +++ b/ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out
    @@ -296,6 +296,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
    @@ -517,6 +518,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
    @@ -863,6 +865,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
    @@ -1184,6 +1187,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
    @@ -1341,6 +1345,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/auto_sortmerge_join_11.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out b/ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out
    index e6e7ef3..5dad0fb 100644
    --- a/ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out
    +++ b/ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out
    @@ -413,6 +413,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
    @@ -763,6 +764,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
    @@ -1072,6 +1074,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
    @@ -1509,6 +1512,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/auto_sortmerge_join_12.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out b/ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out
    index b2e782f..b1ba148 100644
    --- a/ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out
    +++ b/ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out
    @@ -720,6 +720,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/auto_sortmerge_join_2.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/auto_sortmerge_join_2.q.out b/ql/src/test/results/clientpositive/auto_sortmerge_join_2.q.out
    index 210f1ab..a7a5faa 100644
    --- a/ql/src/test/results/clientpositive/auto_sortmerge_join_2.q.out
    +++ b/ql/src/test/results/clientpositive/auto_sortmerge_join_2.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
    @@ -624,6 +625,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
    @@ -945,6 +947,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
    @@ -1102,6 +1105,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/auto_sortmerge_join_3.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/auto_sortmerge_join_3.q.out b/ql/src/test/results/clientpositive/auto_sortmerge_join_3.q.out
    index a307b13..dfb1a16 100644
    --- a/ql/src/test/results/clientpositive/auto_sortmerge_join_3.q.out
    +++ b/ql/src/test/results/clientpositive/auto_sortmerge_join_3.q.out
    @@ -227,6 +227,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
    @@ -399,6 +400,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
    @@ -789,6 +791,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
    @@ -1063,6 +1066,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
    @@ -1171,6 +1175,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/auto_sortmerge_join_4.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/auto_sortmerge_join_4.q.out b/ql/src/test/results/clientpositive/auto_sortmerge_join_4.q.out
    index f4ceee7..013bc07 100644
    --- a/ql/src/test/results/clientpositive/auto_sortmerge_join_4.q.out
    +++ b/ql/src/test/results/clientpositive/auto_sortmerge_join_4.q.out
    @@ -243,6 +243,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
    @@ -415,6 +416,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
    @@ -805,6 +807,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
    @@ -1079,6 +1082,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
    @@ -1187,6 +1191,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/auto_sortmerge_join_5.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out b/ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out
    index 230158b..d751e70 100644
    --- a/ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out
    +++ b/ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out
    @@ -210,6 +210,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
    @@ -372,6 +373,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
    @@ -603,6 +605,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
    @@ -768,6 +771,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
    @@ -872,6 +876,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/auto_sortmerge_join_7.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/auto_sortmerge_join_7.q.out b/ql/src/test/results/clientpositive/auto_sortmerge_join_7.q.out
    index e1f3888..e2d797b 100644
    --- a/ql/src/test/results/clientpositive/auto_sortmerge_join_7.q.out
    +++ b/ql/src/test/results/clientpositive/auto_sortmerge_join_7.q.out
    @@ -309,6 +309,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
    @@ -532,6 +533,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
    @@ -973,6 +975,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
    @@ -1342,6 +1345,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
    @@ -1499,6 +1503,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/auto_sortmerge_join_8.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/auto_sortmerge_join_8.q.out b/ql/src/test/results/clientpositive/auto_sortmerge_join_8.q.out
    index 38ecdbe..e3bb51d 100644
    --- a/ql/src/test/results/clientpositive/auto_sortmerge_join_8.q.out
    +++ b/ql/src/test/results/clientpositive/auto_sortmerge_join_8.q.out
    @@ -309,6 +309,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
    @@ -532,6 +533,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
    @@ -975,6 +977,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
    @@ -1344,6 +1347,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
    @@ -1501,6 +1505,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/bucket_map_join_1.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/bucket_map_join_1.q.out b/ql/src/test/results/clientpositive/bucket_map_join_1.q.out
    index 42e6a3f..ce0df01 100644
    --- a/ql/src/test/results/clientpositive/bucket_map_join_1.q.out
    +++ b/ql/src/test/results/clientpositive/bucket_map_join_1.q.out
    @@ -238,6 +238,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/bucket_map_join_2.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/bucket_map_join_2.q.out b/ql/src/test/results/clientpositive/bucket_map_join_2.q.out
    index af73309..791e606 100644
    --- a/ql/src/test/results/clientpositive/bucket_map_join_2.q.out
    +++ b/ql/src/test/results/clientpositive/bucket_map_join_2.q.out
    @@ -238,6 +238,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/bucket_map_join_spark4.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/bucket_map_join_spark4.q.out b/ql/src/test/results/clientpositive/bucket_map_join_spark4.q.out
    index bdbcd25..41a2ea9 100644
    --- a/ql/src/test/results/clientpositive/bucket_map_join_spark4.q.out
    +++ b/ql/src/test/results/clientpositive/bucket_map_join_spark4.q.out
    @@ -230,6 +230,7 @@ STAGE PLANS:
                                  columns.types int: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
    @@ -634,6 +635,7 @@ STAGE PLANS:
                                  columns.types int: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/bucketcontext_1.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/bucketcontext_1.q.out b/ql/src/test/results/clientpositive/bucketcontext_1.q.out
    index 77bfcf9..f06303c 100644
    --- a/ql/src/test/results/clientpositive/bucketcontext_1.q.out
    +++ b/ql/src/test/results/clientpositive/bucketcontext_1.q.out
    @@ -379,6 +379,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
    @@ -605,6 +606,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/bucketcontext_2.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/bucketcontext_2.q.out b/ql/src/test/results/clientpositive/bucketcontext_2.q.out
    index a9db13d..6426515 100644
    --- a/ql/src/test/results/clientpositive/bucketcontext_2.q.out
    +++ b/ql/src/test/results/clientpositive/bucketcontext_2.q.out
    @@ -363,6 +363,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
    @@ -589,6 +590,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/bucketcontext_3.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/bucketcontext_3.q.out b/ql/src/test/results/clientpositive/bucketcontext_3.q.out
    index 9ba3e0c..b13538d 100644
    --- a/ql/src/test/results/clientpositive/bucketcontext_3.q.out
    +++ b/ql/src/test/results/clientpositive/bucketcontext_3.q.out
    @@ -360,6 +360,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
    @@ -537,6 +538,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/bucketcontext_4.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/bucketcontext_4.q.out b/ql/src/test/results/clientpositive/bucketcontext_4.q.out
    index a2b37a8..b1fa288 100644
    --- a/ql/src/test/results/clientpositive/bucketcontext_4.q.out
    +++ b/ql/src/test/results/clientpositive/bucketcontext_4.q.out
    @@ -376,6 +376,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
    @@ -553,6 +554,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/bucketcontext_5.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/bucketcontext_5.q.out b/ql/src/test/results/clientpositive/bucketcontext_5.q.out
    index 3ee1f0e..3e1c49f 100644
    --- a/ql/src/test/results/clientpositive/bucketcontext_5.q.out
    +++ b/ql/src/test/results/clientpositive/bucketcontext_5.q.out
    @@ -244,6 +244,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
    @@ -411,6 +412,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/bucketcontext_6.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/bucketcontext_6.q.out b/ql/src/test/results/clientpositive/bucketcontext_6.q.out
    index d2304fa..8d7392a 100644
    --- a/ql/src/test/results/clientpositive/bucketcontext_6.q.out
    +++ b/ql/src/test/results/clientpositive/bucketcontext_6.q.out
    @@ -315,6 +315,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
    @@ -539,6 +540,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/bucketcontext_7.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/bucketcontext_7.q.out b/ql/src/test/results/clientpositive/bucketcontext_7.q.out
    index 1a105ed..0159995 100644
    --- a/ql/src/test/results/clientpositive/bucketcontext_7.q.out
    +++ b/ql/src/test/results/clientpositive/bucketcontext_7.q.out
    @@ -442,6 +442,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
    @@ -670,6 +671,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/bucketcontext_8.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/bucketcontext_8.q.out b/ql/src/test/results/clientpositive/bucketcontext_8.q.out
    index 138e415..b42088a 100644
    --- a/ql/src/test/results/clientpositive/bucketcontext_8.q.out
    +++ b/ql/src/test/results/clientpositive/bucketcontext_8.q.out
    @@ -442,6 +442,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
    @@ -670,6 +671,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/bucketmapjoin1.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/bucketmapjoin1.q.out b/ql/src/test/results/clientpositive/bucketmapjoin1.q.out
    index 4fcc583..438b991 100644
    --- a/ql/src/test/results/clientpositive/bucketmapjoin1.q.out
    +++ b/ql/src/test/results/clientpositive/bucketmapjoin1.q.out
    @@ -163,6 +163,7 @@ STAGE PLANS:
                                columns.types int: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
    @@ -331,6 +332,7 @@ STAGE PLANS:
                                columns.types int: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/bucketmapjoin10.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/bucketmapjoin10.q.out b/ql/src/test/results/clientpositive/bucketmapjoin10.q.out
    index b0e849d..38de15b 100644
    --- a/ql/src/test/results/clientpositive/bucketmapjoin10.q.out
    +++ b/ql/src/test/results/clientpositive/bucketmapjoin10.q.out
    @@ -464,6 +464,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/bucketmapjoin11.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/bucketmapjoin11.q.out b/ql/src/test/results/clientpositive/bucketmapjoin11.q.out
    index 4263cab..cf79f7b 100644
    --- a/ql/src/test/results/clientpositive/bucketmapjoin11.q.out
    +++ b/ql/src/test/results/clientpositive/bucketmapjoin11.q.out
    @@ -482,6 +482,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
    @@ -870,6 +871,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/bucketmapjoin12.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/bucketmapjoin12.q.out b/ql/src/test/results/clientpositive/bucketmapjoin12.q.out
    index bcd7394..575a9d1 100644
    --- a/ql/src/test/results/clientpositive/bucketmapjoin12.q.out
    +++ b/ql/src/test/results/clientpositive/bucketmapjoin12.q.out
    @@ -347,6 +347,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
    @@ -623,6 +624,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/bucketmapjoin13.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/bucketmapjoin13.q.out b/ql/src/test/results/clientpositive/bucketmapjoin13.q.out
    index 7114721..f06f5a4 100644
    --- a/ql/src/test/results/clientpositive/bucketmapjoin13.q.out
    +++ b/ql/src/test/results/clientpositive/bucketmapjoin13.q.out
    @@ -347,6 +347,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
    @@ -627,6 +628,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
    @@ -906,6 +908,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
    @@ -1187,6 +1190,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/bucketmapjoin7.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/bucketmapjoin7.q.out b/ql/src/test/results/clientpositive/bucketmapjoin7.q.out
    index 667a9db..56b156e 100644
    --- a/ql/src/test/results/clientpositive/bucketmapjoin7.q.out
    +++ b/ql/src/test/results/clientpositive/bucketmapjoin7.q.out
    @@ -331,6 +331,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/bucketmapjoin8.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/bucketmapjoin8.q.out b/ql/src/test/results/clientpositive/bucketmapjoin8.q.out
    index 252b377..426a3e8 100644
    --- a/ql/src/test/results/clientpositive/bucketmapjoin8.q.out
    +++ b/ql/src/test/results/clientpositive/bucketmapjoin8.q.out
    @@ -313,6 +313,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
    @@ -606,6 +607,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/bucketmapjoin9.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/bucketmapjoin9.q.out b/ql/src/test/results/clientpositive/bucketmapjoin9.q.out
    index 5e28dc3..50ce9c9 100644
    --- a/ql/src/test/results/clientpositive/bucketmapjoin9.q.out
    +++ b/ql/src/test/results/clientpositive/bucketmapjoin9.q.out
    @@ -313,6 +313,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
    @@ -631,6 +632,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/bucketmapjoin_negative3.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out b/ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out
    index 9a0bfc4..318c0dd 100644
    --- a/ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out
    +++ b/ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out
    @@ -269,6 +269,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
    @@ -458,6 +459,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
    @@ -636,6 +638,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
    @@ -817,6 +820,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
    @@ -998,6 +1002,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
    @@ -1179,6 +1184,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
    @@ -1360,6 +1366,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
    @@ -1541,6 +1548,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
    @@ -1722,6 +1730,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/cbo_rp_outer_join_ppr.q.java1.7.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/cbo_rp_outer_join_ppr.q.java1.7.out b/ql/src/test/results/clientpositive/cbo_rp_outer_join_ppr.q.java1.7.out
    index c19b47a..2630537 100644
    --- a/ql/src/test/results/clientpositive/cbo_rp_outer_join_ppr.q.java1.7.out
    +++ b/ql/src/test/results/clientpositive/cbo_rp_outer_join_ppr.q.java1.7.out
    @@ -421,6 +421,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
    @@ -802,6 +803,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/columnstats_partlvl.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/columnstats_partlvl.q.out b/ql/src/test/results/clientpositive/columnstats_partlvl.q.out
    index e0c4cfe..d585d4d 100644
    --- a/ql/src/test/results/clientpositive/columnstats_partlvl.q.out
    +++ b/ql/src/test/results/clientpositive/columnstats_partlvl.q.out
    @@ -205,6 +205,7 @@ STAGE PLANS:
                          columns.types struct<columntype:string,min:bigint,max:bigint,countnulls:bigint,numdistinctvalues: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
    @@ -405,6 +406,7 @@ STAGE PLANS:
                          columns.types struct<columntype:string,min:bigint,max:bigint,countnulls:bigint,numdistinctvalues: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

    http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out b/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out
    index 19283bb..693bb10 100644
    --- a/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out
    +++ b/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out
    @@ -192,6 +192,7 @@ STAGE PLANS:
                        columns.types struct<columntype:string,maxlength:bigint,avglength:double,countnulls:bigint,numdistinctvalues:bigint>:struct<columntype:string,min:bigint,max:bigint,countnulls:bigint,numdistinctvalues:bigint>:struct<columntype:string,min:double,max:double,countnulls:bigint,numdistinctvalues: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
    @@ -594,6 +595,7 @@ STAGE PLANS:
                        columns.types struct<columntype:string,maxlength:bigint,avglength:double,countnulls:bigint,numdistinctvalues:bigint>:struct<columntype:string,min:bigint,max:bigint,countnulls:bigint,numdistinctvalues:bigint>:struct<columntype:string,min:double,max:double,countnulls:bigint,numdistinctvalues: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/combine2.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/combine2.q.out b/ql/src/test/results/clientpositive/combine2.q.out
    index 9b1702f..864b7b4 100644
    --- a/ql/src/test/results/clientpositive/combine2.q.out
    +++ b/ql/src/test/results/clientpositive/combine2.q.out
    @@ -594,6 +594,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/constantPropagateForSubQuery.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out b/ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out
    index b52b475..bb23263 100644
    --- a/ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out
    +++ b/ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out
    @@ -234,6 +234,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/display_colstats_tbllvl.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/display_colstats_tbllvl.q.out b/ql/src/test/results/clientpositive/display_colstats_tbllvl.q.out
    index 7c91248..d78f75c 100644
    --- a/ql/src/test/results/clientpositive/display_colstats_tbllvl.q.out
    +++ b/ql/src/test/results/clientpositive/display_colstats_tbllvl.q.out
    @@ -208,6 +208,7 @@ STAGE PLANS:
                        columns.types struct<columntype:string,maxlength:bigint,avglength:double,countnulls:bigint,numdistinctvalues:bigint>:struct<columntype:string,min:bigint,max:bigint,countnulls:bigint,numdistinctvalues:bigint>:struct<columntype:string,min:double,max:double,countnulls:bigint,numdistinctvalues: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/encrypted/encryption_join_unencrypted_tbl.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out b/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out
    index a42ed2c..7997fcb 100644
    --- a/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out
    +++ b/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out
    @@ -739,6 +739,7 @@ STAGE PLANS:
                            columns.types string:string: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/encrypted/encryption_join_with_different_encryption_keys.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/encrypted/encryption_join_with_different_encryption_keys.q.out b/ql/src/test/results/clientpositive/encrypted/encryption_join_with_different_encryption_keys.q.out
    index 790946f..1259cd5 100644
    --- a/ql/src/test/results/clientpositive/encrypted/encryption_join_with_different_encryption_keys.q.out
    +++ b/ql/src/test/results/clientpositive/encrypted/encryption_join_with_different_encryption_keys.q.out
    @@ -259,6 +259,7 @@ STAGE PLANS:
                            columns.types int:string: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/escape_crlf.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/escape_crlf.q.out b/ql/src/test/results/clientpositive/escape_crlf.q.out
    new file mode 100644
    index 0000000..3fc246a
    --- /dev/null
    +++ b/ql/src/test/results/clientpositive/escape_crlf.q.out
    @@ -0,0 +1,98 @@
    +PREHOOK: query: DROP TABLE IF EXISTS base_tab
    +PREHOOK: type: DROPTABLE
    +POSTHOOK: query: DROP TABLE IF EXISTS base_tab
    +POSTHOOK: type: DROPTABLE
    +PREHOOK: query: CREATE TABLE base_tab(a STRING, b STRING)
    +ROW FORMAT DELIMITED
    + FIELDS TERMINATED BY '|'
    +PREHOOK: type: CREATETABLE
    +PREHOOK: Output: database:default
    +PREHOOK: Output: default@base_tab
    +POSTHOOK: query: CREATE TABLE base_tab(a STRING, b STRING)
    +ROW FORMAT DELIMITED
    + FIELDS TERMINATED BY '|'
    +POSTHOOK: type: CREATETABLE
    +POSTHOOK: Output: database:default
    +POSTHOOK: Output: default@base_tab
    +PREHOOK: query: DESCRIBE EXTENDED base_tab
    +PREHOOK: type: DESCTABLE
    +PREHOOK: Input: default@base_tab
    +POSTHOOK: query: DESCRIBE EXTENDED base_tab
    +POSTHOOK: type: DESCTABLE
    +POSTHOOK: Input: default@base_tab
    +a string
    +b string
    +
    +#### A masked pattern was here ####
    +PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/escape_crlf.txt' OVERWRITE INTO TABLE base_tab
    +PREHOOK: type: LOAD
    +#### A masked pattern was here ####
    +PREHOOK: Output: default@base_tab
    +POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/escape_crlf.txt' OVERWRITE INTO TABLE base_tab
    +POSTHOOK: type: LOAD
    +#### A masked pattern was here ####
    +POSTHOOK: Output: default@base_tab
    +PREHOOK: query: -- No crlf escaping
    +SELECT * FROM base_tab
    +PREHOOK: type: QUERY
    +PREHOOK: Input: default@base_tab
    +#### A masked pattern was here ####
    +POSTHOOK: query: -- No crlf escaping
    +SELECT * FROM base_tab
    +POSTHOOK: type: QUERY
    +POSTHOOK: Input: default@base_tab
    +#### A masked pattern was here ####
    +This\nis\rthe first\r\nmulti-line field field1-2
    +This\nis\rthe second\r\nmulti-line field field2-2
    +PREHOOK: query: -- Crlf escaping
    +ALTER TABLE base_tab SET SERDEPROPERTIES ('escape.delim'='\\', 'serialization.escape.crlf'='true')
    +PREHOOK: type: ALTERTABLE_SERDEPROPERTIES
    +PREHOOK: Input: default@base_tab
    +PREHOOK: Output: default@base_tab
    +POSTHOOK: query: -- Crlf escaping
    +ALTER TABLE base_tab SET SERDEPROPERTIES ('escape.delim'='\\', 'serialization.escape.crlf'='true')
    +POSTHOOK: type: ALTERTABLE_SERDEPROPERTIES
    +POSTHOOK: Input: default@base_tab
    +POSTHOOK: Output: default@base_tab
    +PREHOOK: query: SELECT * FROM base_tab
    +PREHOOK: type: QUERY
    +PREHOOK: Input: default@base_tab
    +#### A masked pattern was here ####
    +POSTHOOK: query: SELECT * FROM base_tab
    +POSTHOOK: type: QUERY
    +POSTHOOK: Input: default@base_tab
    +#### A masked pattern was here ####
    +This
    +is
    +the first
    +multi-line field field1-2
    +This
    +is
    +the second
    +multi-line field field2-2
    +PREHOOK: query: -- Make sure intermediate serde works correctly
    +SELECT * FROM base_tab
    +PREHOOK: type: QUERY
    +PREHOOK: Input: default@base_tab
    +#### A masked pattern was here ####
    +POSTHOOK: query: -- Make sure intermediate serde works correctly
    +SELECT * FROM base_tab
    +POSTHOOK: type: QUERY
    +POSTHOOK: Input: default@base_tab
    +#### A masked pattern was here ####
    +This
    +is
    +the first
    +multi-line field field1-2
    +This
    +is
    +the second
    +multi-line field field2-2
    +PREHOOK: query: DROP TABLE base_tab
    +PREHOOK: type: DROPTABLE
    +PREHOOK: Input: default@base_tab
    +PREHOOK: Output: default@base_tab
    +POSTHOOK: query: DROP TABLE base_tab
    +POSTHOOK: type: DROPTABLE
    +POSTHOOK: Input: default@base_tab
    +POSTHOOK: Output: default@base_tab

    http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/ql/src/test/results/clientpositive/filter_join_breaktask.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/filter_join_breaktask.q.out b/ql/src/test/results/clientpositive/filter_join_breaktask.q.out
    index 95b632f..dee3794 100644
    --- a/ql/src/test/results/clientpositive/filter_join_breaktask.q.out
    +++ b/ql/src/test/results/clientpositive/filter_join_breaktask.q.out
    @@ -380,6 +380,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/fouter_join_ppr.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/fouter_join_ppr.q.out b/ql/src/test/results/clientpositive/fouter_join_ppr.q.out
    index 087edf2..56c5176 100644
    --- a/ql/src/test/results/clientpositive/fouter_join_ppr.q.out
    +++ b/ql/src/test/results/clientpositive/fouter_join_ppr.q.out
    @@ -415,6 +415,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
    @@ -887,6 +888,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
    @@ -1264,6 +1266,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
    @@ -1641,6 +1644,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/groupby_sort_1_23.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/groupby_sort_1_23.q.out b/ql/src/test/results/clientpositive/groupby_sort_1_23.q.out
    index 65716ea..d0644f8 100644
    --- a/ql/src/test/results/clientpositive/groupby_sort_1_23.q.out
    +++ b/ql/src/test/results/clientpositive/groupby_sort_1_23.q.out
    @@ -4293,6 +4293,7 @@ STAGE PLANS:
                        columns.types string:bigint:string: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/groupby_sort_skew_1_23.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out b/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out
    index 2ab9471..a0c7cc0 100644
    --- a/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out
    +++ b/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out
    @@ -4683,6 +4683,7 @@ STAGE PLANS:
                        columns.types string:bigint:string: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/input23.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/input23.q.out b/ql/src/test/results/clientpositive/input23.q.out
    index 159b9c5..4537f3e 100644
    --- a/ql/src/test/results/clientpositive/input23.q.out
    +++ b/ql/src/test/results/clientpositive/input23.q.out
    @@ -180,6 +180,7 @@ STAGE PLANS:
                            columns.types string:string:string:string: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
  • Sunchao at Oct 16, 2015 at 6:59 pm
    http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/ql/src/test/results/clientpositive/spark/bucketmapjoin11.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/spark/bucketmapjoin11.q.out b/ql/src/test/results/clientpositive/spark/bucketmapjoin11.q.out
    index 95606f0..dfdff5c 100644
    --- a/ql/src/test/results/clientpositive/spark/bucketmapjoin11.q.out
    +++ b/ql/src/test/results/clientpositive/spark/bucketmapjoin11.q.out
    @@ -502,6 +502,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
    @@ -910,6 +911,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/spark/bucketmapjoin12.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/spark/bucketmapjoin12.q.out b/ql/src/test/results/clientpositive/spark/bucketmapjoin12.q.out
    index d6c25e4..07f3c15 100644
    --- a/ql/src/test/results/clientpositive/spark/bucketmapjoin12.q.out
    +++ b/ql/src/test/results/clientpositive/spark/bucketmapjoin12.q.out
    @@ -364,6 +364,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
    @@ -654,6 +655,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/spark/bucketmapjoin13.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/spark/bucketmapjoin13.q.out b/ql/src/test/results/clientpositive/spark/bucketmapjoin13.q.out
    index 14cdda2..1d6e64c 100644
    --- a/ql/src/test/results/clientpositive/spark/bucketmapjoin13.q.out
    +++ b/ql/src/test/results/clientpositive/spark/bucketmapjoin13.q.out
    @@ -361,6 +361,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
    @@ -658,6 +659,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
    @@ -954,6 +956,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
    @@ -1252,6 +1255,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/spark/bucketmapjoin7.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/spark/bucketmapjoin7.q.out b/ql/src/test/results/clientpositive/spark/bucketmapjoin7.q.out
    index 7bfe440..a99cb74 100644
    --- a/ql/src/test/results/clientpositive/spark/bucketmapjoin7.q.out
    +++ b/ql/src/test/results/clientpositive/spark/bucketmapjoin7.q.out
    @@ -348,6 +348,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/spark/bucketmapjoin8.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/spark/bucketmapjoin8.q.out b/ql/src/test/results/clientpositive/spark/bucketmapjoin8.q.out
    index 4601eb1..d6c42b5 100644
    --- a/ql/src/test/results/clientpositive/spark/bucketmapjoin8.q.out
    +++ b/ql/src/test/results/clientpositive/spark/bucketmapjoin8.q.out
    @@ -330,6 +330,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
    @@ -640,6 +641,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/spark/bucketmapjoin9.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/spark/bucketmapjoin9.q.out b/ql/src/test/results/clientpositive/spark/bucketmapjoin9.q.out
    index 60bd103..e65e689 100644
    --- a/ql/src/test/results/clientpositive/spark/bucketmapjoin9.q.out
    +++ b/ql/src/test/results/clientpositive/spark/bucketmapjoin9.q.out
    @@ -327,6 +327,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
    @@ -659,6 +660,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/spark/bucketmapjoin_negative3.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/spark/bucketmapjoin_negative3.q.out b/ql/src/test/results/clientpositive/spark/bucketmapjoin_negative3.q.out
    index a09904e..3671564 100644
    --- a/ql/src/test/results/clientpositive/spark/bucketmapjoin_negative3.q.out
    +++ b/ql/src/test/results/clientpositive/spark/bucketmapjoin_negative3.q.out
    @@ -321,6 +321,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
    @@ -567,6 +568,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
    @@ -804,6 +806,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
    @@ -1039,6 +1042,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
    @@ -1274,6 +1278,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
    @@ -1509,6 +1514,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
    @@ -1744,6 +1750,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
    @@ -1979,6 +1986,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
    @@ -2214,6 +2222,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/spark/filter_join_breaktask.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/spark/filter_join_breaktask.q.out b/ql/src/test/results/clientpositive/spark/filter_join_breaktask.q.out
    index 7c3c581..216e43b 100644
    --- a/ql/src/test/results/clientpositive/spark/filter_join_breaktask.q.out
    +++ b/ql/src/test/results/clientpositive/spark/filter_join_breaktask.q.out
    @@ -397,6 +397,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/spark/groupby_sort_1_23.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out b/ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out
    index c67190a..8d3f0d8 100644
    --- a/ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out
    +++ b/ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out
    @@ -3283,6 +3283,7 @@ STAGE PLANS:
                              columns.types string:bigint:string: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/spark/groupby_sort_skew_1_23.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/spark/groupby_sort_skew_1_23.q.out b/ql/src/test/results/clientpositive/spark/groupby_sort_skew_1_23.q.out
    index 94aaab2..1e01b37 100644
    --- a/ql/src/test/results/clientpositive/spark/groupby_sort_skew_1_23.q.out
    +++ b/ql/src/test/results/clientpositive/spark/groupby_sort_skew_1_23.q.out
    @@ -3374,6 +3374,7 @@ STAGE PLANS:
                              columns.types string:bigint:string: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/spark/join_filters_overlap.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/spark/join_filters_overlap.q.out b/ql/src/test/results/clientpositive/spark/join_filters_overlap.q.out
    index 7b527e2..0f9d1ae 100644
    --- a/ql/src/test/results/clientpositive/spark/join_filters_overlap.q.out
    +++ b/ql/src/test/results/clientpositive/spark/join_filters_overlap.q.out
    @@ -338,6 +338,7 @@ STAGE PLANS:
                                columns.types int: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
    @@ -697,6 +698,7 @@ STAGE PLANS:
                                columns.types int: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
    @@ -1070,6 +1072,7 @@ STAGE PLANS:
                                columns.types int: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
    @@ -1524,6 +1527,7 @@ STAGE PLANS:
                                columns.types int:int:int: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
    @@ -1972,6 +1976,7 @@ STAGE PLANS:
                                columns.types int:int:int: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

    http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/ql/src/test/results/clientpositive/spark/louter_join_ppr.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/spark/louter_join_ppr.q.out b/ql/src/test/results/clientpositive/spark/louter_join_ppr.q.out
    index 44f99c1..4639b28 100644
    --- a/ql/src/test/results/clientpositive/spark/louter_join_ppr.q.out
    +++ b/ql/src/test/results/clientpositive/spark/louter_join_ppr.q.out
    @@ -336,6 +336,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
    @@ -824,6 +825,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
    @@ -1213,6 +1215,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
    @@ -1602,6 +1605,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/spark/mapjoin_mapjoin.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/spark/mapjoin_mapjoin.q.out b/ql/src/test/results/clientpositive/spark/mapjoin_mapjoin.q.out
    index 549911c..27d2509 100644
    --- a/ql/src/test/results/clientpositive/spark/mapjoin_mapjoin.q.out
    +++ b/ql/src/test/results/clientpositive/spark/mapjoin_mapjoin.q.out
    @@ -261,6 +261,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/spark/optimize_nullscan.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/spark/optimize_nullscan.q.out b/ql/src/test/results/clientpositive/spark/optimize_nullscan.q.out
    index 506d265..e27a40d 100644
    --- a/ql/src/test/results/clientpositive/spark/optimize_nullscan.q.out
    +++ b/ql/src/test/results/clientpositive/spark/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
    @@ -556,6 +557,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
    @@ -975,6 +977,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
    @@ -1004,6 +1007,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
    @@ -1408,6 +1412,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
    @@ -1561,6 +1566,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
    @@ -1721,6 +1727,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
    @@ -1957,6 +1964,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
    @@ -2109,6 +2117,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/spark/outer_join_ppr.q.java1.7.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/spark/outer_join_ppr.q.java1.7.out b/ql/src/test/results/clientpositive/spark/outer_join_ppr.q.java1.7.out
    index cb30993..a3c4be7 100644
    --- a/ql/src/test/results/clientpositive/spark/outer_join_ppr.q.java1.7.out
    +++ b/ql/src/test/results/clientpositive/spark/outer_join_ppr.q.java1.7.out
    @@ -429,6 +429,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
    @@ -818,6 +819,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/spark/pcr.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/spark/pcr.q.out b/ql/src/test/results/clientpositive/spark/pcr.q.out
    index b67a909..3ee6e22 100644
    --- a/ql/src/test/results/clientpositive/spark/pcr.q.out
    +++ b/ql/src/test/results/clientpositive/spark/pcr.q.out
    @@ -242,6 +242,7 @@ STAGE PLANS:
                              columns.types int: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
    @@ -511,6 +512,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
    @@ -782,6 +784,7 @@ STAGE PLANS:
                              columns.types int: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
    @@ -1023,6 +1026,7 @@ STAGE PLANS:
                              columns.types int: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
    @@ -1312,6 +1316,7 @@ STAGE PLANS:
                              columns.types int: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
    @@ -1611,6 +1616,7 @@ STAGE PLANS:
                              columns.types int: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
    @@ -1863,6 +1869,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
    @@ -2074,6 +2081,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
    @@ -2371,6 +2379,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
    @@ -2664,6 +2673,7 @@ STAGE PLANS:
                              columns.types int: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
    @@ -2937,6 +2947,7 @@ STAGE PLANS:
                              columns.types int:string:string:int: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
    @@ -3245,6 +3256,7 @@ STAGE PLANS:
                              columns.types int:string:string:int: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
    @@ -3621,6 +3633,7 @@ STAGE PLANS:
                              columns.types int: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
    @@ -3944,6 +3957,7 @@ STAGE PLANS:
                              columns.types int: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
    @@ -4718,6 +4732,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
    @@ -4951,6 +4966,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
    @@ -5180,6 +5196,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/spark/ppd_join_filter.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/spark/ppd_join_filter.q.out b/ql/src/test/results/clientpositive/spark/ppd_join_filter.q.out
    index 96defa6..f9a107b 100644
    --- a/ql/src/test/results/clientpositive/spark/ppd_join_filter.q.out
    +++ b/ql/src/test/results/clientpositive/spark/ppd_join_filter.q.out
    @@ -308,6 +308,7 @@ STAGE PLANS:
                                columns.types 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
    @@ -690,6 +691,7 @@ STAGE PLANS:
                                columns.types 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
    @@ -1068,6 +1070,7 @@ STAGE PLANS:
                                columns.types 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
    @@ -1450,6 +1453,7 @@ STAGE PLANS:
                                columns.types 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

    http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/ql/src/test/results/clientpositive/spark/remote_script.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/spark/remote_script.q.out b/ql/src/test/results/clientpositive/spark/remote_script.q.out
    index 6ec9949..87531f0 100644
    --- a/ql/src/test/results/clientpositive/spark/remote_script.q.out
    +++ b/ql/src/test/results/clientpositive/spark/remote_script.q.out
    @@ -30,13 +30,13 @@ POSTHOOK: Input: default@tmp_tmp
      #### A masked pattern was here ####
      1 2 NULL
      1 2 NULL
    -1 NULL
    +1
      2 NULL
    -1 NULL
    +1
      2 NULL
    -1 NULL
    +1
      2 NULL
    -1 NULL
    +1
      2 NULL
      #### A masked pattern was here ####
      PREHOOK: query: drop table tmp_tmp

    http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/ql/src/test/results/clientpositive/spark/router_join_ppr.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/spark/router_join_ppr.q.out b/ql/src/test/results/clientpositive/spark/router_join_ppr.q.out
    index 268d482..6e34865 100644
    --- a/ql/src/test/results/clientpositive/spark/router_join_ppr.q.out
    +++ b/ql/src/test/results/clientpositive/spark/router_join_ppr.q.out
    @@ -435,6 +435,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
    @@ -828,6 +829,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
    @@ -1213,6 +1215,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
    @@ -1598,6 +1601,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/spark/sample10.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/spark/sample10.q.out b/ql/src/test/results/clientpositive/spark/sample10.q.out
    index 2d6ca1b..24cd7fc 100644
    --- a/ql/src/test/results/clientpositive/spark/sample10.q.out
    +++ b/ql/src/test/results/clientpositive/spark/sample10.q.out
    @@ -360,6 +360,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/spark/sample6.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/spark/sample6.q.out b/ql/src/test/results/clientpositive/spark/sample6.q.out
    index 1b20da5..520712d 100644
    --- a/ql/src/test/results/clientpositive/spark/sample6.q.out
    +++ b/ql/src/test/results/clientpositive/spark/sample6.q.out
    @@ -581,6 +581,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
    @@ -985,6 +986,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
    @@ -1642,6 +1644,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
    @@ -2142,6 +2145,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
    @@ -2676,6 +2680,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
    @@ -2963,6 +2968,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
    @@ -3123,6 +3129,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/spark/sample8.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/spark/sample8.q.out b/ql/src/test/results/clientpositive/spark/sample8.q.out
    index 65fab26..bc1b934 100644
    --- a/ql/src/test/results/clientpositive/spark/sample8.q.out
    +++ b/ql/src/test/results/clientpositive/spark/sample8.q.out
    @@ -406,6 +406,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/spark/smb_mapjoin_13.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/spark/smb_mapjoin_13.q.out b/ql/src/test/results/clientpositive/spark/smb_mapjoin_13.q.out
    index 878b930..73856eb 100644
    --- a/ql/src/test/results/clientpositive/spark/smb_mapjoin_13.q.out
    +++ b/ql/src/test/results/clientpositive/spark/smb_mapjoin_13.q.out
    @@ -240,6 +240,7 @@ STAGE PLANS:
                                columns.types int:string: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
    @@ -526,6 +527,7 @@ STAGE PLANS:
                                columns.types int:string: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/spark/smb_mapjoin_15.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/spark/smb_mapjoin_15.q.out b/ql/src/test/results/clientpositive/spark/smb_mapjoin_15.q.out
    index 06b6121..afb1b22 100644
    --- a/ql/src/test/results/clientpositive/spark/smb_mapjoin_15.q.out
    +++ b/ql/src/test/results/clientpositive/spark/smb_mapjoin_15.q.out
    @@ -212,6 +212,7 @@ STAGE PLANS:
                                columns.types int:string: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
    @@ -481,6 +482,7 @@ STAGE PLANS:
                                columns.types int:int:string:int: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
    @@ -698,6 +700,7 @@ STAGE PLANS:
                                columns.types int:int:string:int: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
    @@ -1005,6 +1008,7 @@ STAGE PLANS:
                                columns.types int:int:string:int: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/spark/transform_ppr1.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/spark/transform_ppr1.q.out b/ql/src/test/results/clientpositive/spark/transform_ppr1.q.out
    index 994d14e..6c649dd 100644
    --- a/ql/src/test/results/clientpositive/spark/transform_ppr1.q.out
    +++ b/ql/src/test/results/clientpositive/spark/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/spark/transform_ppr2.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/spark/transform_ppr2.q.out b/ql/src/test/results/clientpositive/spark/transform_ppr2.q.out
    index de5162d..eeb5087 100644
    --- a/ql/src/test/results/clientpositive/spark/transform_ppr2.q.out
    +++ b/ql/src/test/results/clientpositive/spark/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/spark/union24.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/spark/union24.q.out b/ql/src/test/results/clientpositive/spark/union24.q.out
    index 658ff9e..b46e8a2 100644
    --- a/ql/src/test/results/clientpositive/spark/union24.q.out
    +++ b/ql/src/test/results/clientpositive/spark/union24.q.out
    @@ -219,6 +219,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
    @@ -303,6 +304,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
    @@ -387,6 +389,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
    @@ -543,6 +546,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
    @@ -779,6 +783,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
    @@ -863,6 +868,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
    @@ -1078,6 +1084,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
    @@ -1309,6 +1316,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
    @@ -1393,6 +1401,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
    @@ -1629,6 +1638,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/spark/union_ppr.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/spark/union_ppr.q.out b/ql/src/test/results/clientpositive/spark/union_ppr.q.out
    index a8cbeb2..1fcea7a 100644
    --- a/ql/src/test/results/clientpositive/spark/union_ppr.q.out
    +++ b/ql/src/test/results/clientpositive/spark/union_ppr.q.out
    @@ -385,6 +385,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/spark/vectorized_ptf.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/spark/vectorized_ptf.q.out b/ql/src/test/results/clientpositive/spark/vectorized_ptf.q.out
    index a04612a..28240e6 100644
    --- a/ql/src/test/results/clientpositive/spark/vectorized_ptf.q.out
    +++ b/ql/src/test/results/clientpositive/spark/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
    @@ -793,6 +794,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
    @@ -1014,6 +1016,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
    @@ -1335,6 +1338,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
    @@ -1669,6 +1673,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
    @@ -2021,6 +2026,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
    @@ -2346,6 +2352,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
    @@ -2637,6 +2644,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
    @@ -2963,6 +2971,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
    @@ -3299,6 +3308,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
    @@ -3623,6 +3633,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
    @@ -4017,6 +4028,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
    @@ -4363,6 +4375,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
    @@ -4897,6 +4910,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
    @@ -5150,6 +5164,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
    @@ -5458,6 +5473,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
    @@ -6648,6 +6664,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
    @@ -7098,6 +7115,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
    @@ -7509,6 +7527,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
    @@ -7971,6 +7990,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
    @@ -8442,6 +8462,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
    @@ -8872,6 +8893,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/temp_table_display_colstats_tbllvl.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/temp_table_display_colstats_tbllvl.q.out b/ql/src/test/results/clientpositive/temp_table_display_colstats_tbllvl.q.out
    index cfa88ab..b139823 100644
    --- a/ql/src/test/results/clientpositive/temp_table_display_colstats_tbllvl.q.out
    +++ b/ql/src/test/results/clientpositive/temp_table_display_colstats_tbllvl.q.out
    @@ -216,6 +216,7 @@ STAGE PLANS:
                        columns.types struct<columntype:string,maxlength:bigint,avglength:double,countnulls:bigint,numdistinctvalues:bigint>:struct<columntype:string,min:bigint,max:bigint,countnulls:bigint,numdistinctvalues:bigint>:struct<columntype:string,min:double,max:double,countnulls:bigint,numdistinctvalues: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_1.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_1.q.out b/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_1.q.out
    index a275d27..af0ee00 100644
    --- a/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_1.q.out
    +++ b/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_1.q.out
    @@ -381,6 +381,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
    @@ -687,6 +688,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
    @@ -993,6 +995,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_11.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_11.q.out b/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_11.q.out
    index 6ac74ca..4ac305f 100644
    --- a/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_11.q.out
    +++ b/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_11.q.out
    @@ -374,6 +374,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
    @@ -685,6 +686,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
    @@ -995,6 +997,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
    @@ -1440,6 +1443,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_12.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_12.q.out b/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_12.q.out
    index b83aa27..b16b24f 100644
    --- a/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_12.q.out
    +++ b/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_12.q.out
    @@ -602,6 +602,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_2.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_2.q.out b/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_2.q.out
    index 2cb8416..96063ef 100644
    --- a/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_2.q.out
    +++ b/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_2.q.out
    @@ -361,6 +361,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
    @@ -669,6 +670,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_3.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_3.q.out b/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_3.q.out
    index abeceb8..956d11d 100644
    --- a/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_3.q.out
    +++ b/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_3.q.out
    @@ -361,6 +361,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
    @@ -667,6 +668,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
    @@ -973,6 +975,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_4.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_4.q.out b/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_4.q.out
    index 8eb9ce5..bbb0cbb 100644
    --- a/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_4.q.out
    +++ b/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_4.q.out
    @@ -377,6 +377,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
    @@ -683,6 +684,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
    @@ -989,6 +991,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
  • Sunchao at Oct 16, 2015 at 6:59 pm
    http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/ql/src/test/results/clientpositive/input_part7.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/input_part7.q.out b/ql/src/test/results/clientpositive/input_part7.q.out
    index 352331e..4bf2a11 100644
    --- a/ql/src/test/results/clientpositive/input_part7.q.out
    +++ b/ql/src/test/results/clientpositive/input_part7.q.out
    @@ -284,6 +284,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/join_filters_overlap.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/join_filters_overlap.q.out b/ql/src/test/results/clientpositive/join_filters_overlap.q.out
    index 6ddd4b6..f52cf26 100644
    --- a/ql/src/test/results/clientpositive/join_filters_overlap.q.out
    +++ b/ql/src/test/results/clientpositive/join_filters_overlap.q.out
    @@ -230,6 +230,7 @@ STAGE PLANS:
                          columns.types int: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
    @@ -481,6 +482,7 @@ STAGE PLANS:
                          columns.types int: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
    @@ -746,6 +748,7 @@ STAGE PLANS:
                          columns.types int: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
    @@ -1041,6 +1044,7 @@ STAGE PLANS:
                          columns.types int:int:int: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
    @@ -1330,6 +1334,7 @@ STAGE PLANS:
                          columns.types int:int:int: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

    http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/ql/src/test/results/clientpositive/list_bucket_dml_14.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_14.q.out b/ql/src/test/results/clientpositive/list_bucket_dml_14.q.out
    index 1519b96..e9bf8fc 100644
    --- a/ql/src/test/results/clientpositive/list_bucket_dml_14.q.out
    +++ b/ql/src/test/results/clientpositive/list_bucket_dml_14.q.out
    @@ -309,6 +309,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/list_bucket_query_multiskew_3.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out b/ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out
    index 8f1d94e..4a41abc 100644
    --- a/ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out
    +++ b/ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out
    @@ -474,6 +474,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/list_bucket_query_oneskew_2.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out b/ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out
    index 646f8b8..d46b0ae 100644
    --- a/ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out
    +++ b/ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out
    @@ -588,6 +588,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
    @@ -780,6 +781,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

    http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/ql/src/test/results/clientpositive/louter_join_ppr.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/louter_join_ppr.q.out b/ql/src/test/results/clientpositive/louter_join_ppr.q.out
    index 1b2b8e3..65fe291 100644
    --- a/ql/src/test/results/clientpositive/louter_join_ppr.q.out
    +++ b/ql/src/test/results/clientpositive/louter_join_ppr.q.out
    @@ -324,6 +324,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
    @@ -800,6 +801,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
    @@ -1177,6 +1179,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
    @@ -1554,6 +1557,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/mapjoin_mapjoin.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out b/ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out
    index e92f307..427e8b2 100644
    --- a/ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out
    +++ b/ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out
    @@ -156,6 +156,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/metadataonly1.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/metadataonly1.q.out b/ql/src/test/results/clientpositive/metadataonly1.q.out
    index 61f9900..bb8bdfa 100644
    --- a/ql/src/test/results/clientpositive/metadataonly1.q.out
    +++ b/ql/src/test/results/clientpositive/metadataonly1.q.out
    @@ -78,6 +78,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
    @@ -223,6 +224,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
    @@ -364,6 +366,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
    @@ -505,6 +508,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
    @@ -955,6 +959,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
    @@ -1220,6 +1225,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
    @@ -1460,6 +1466,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
    @@ -1644,6 +1651,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
    @@ -2015,6 +2023,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/optimize_nullscan.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/optimize_nullscan.q.out b/ql/src/test/results/clientpositive/optimize_nullscan.q.out
    index b974770..de85410 100644
    --- a/ql/src/test/results/clientpositive/optimize_nullscan.q.out
    +++ b/ql/src/test/results/clientpositive/optimize_nullscan.q.out
    @@ -68,6 +68,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
    @@ -226,6 +227,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
    @@ -680,6 +682,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
    @@ -889,6 +892,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
    @@ -914,6 +918,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
    @@ -1654,6 +1659,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
    @@ -1898,6 +1904,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
    @@ -1923,6 +1930,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
    @@ -2173,6 +2181,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
    @@ -2319,6 +2328,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/outer_join_ppr.q.java1.7.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/outer_join_ppr.q.java1.7.out b/ql/src/test/results/clientpositive/outer_join_ppr.q.java1.7.out
    index bfe983a..b257221 100644
    --- a/ql/src/test/results/clientpositive/outer_join_ppr.q.java1.7.out
    +++ b/ql/src/test/results/clientpositive/outer_join_ppr.q.java1.7.out
    @@ -417,6 +417,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
    @@ -794,6 +795,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/pcr.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/pcr.q.out b/ql/src/test/results/clientpositive/pcr.q.out
    index c4fde24..7ba9f87 100644
    --- a/ql/src/test/results/clientpositive/pcr.q.out
    +++ b/ql/src/test/results/clientpositive/pcr.q.out
    @@ -236,6 +236,7 @@ STAGE PLANS:
                        columns.types int: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
    @@ -499,6 +500,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
    @@ -764,6 +766,7 @@ STAGE PLANS:
                        columns.types int: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
    @@ -999,6 +1002,7 @@ STAGE PLANS:
                        columns.types int: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
    @@ -1282,6 +1286,7 @@ STAGE PLANS:
                        columns.types int: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
    @@ -1575,6 +1580,7 @@ STAGE PLANS:
                        columns.types int: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
    @@ -1821,6 +1827,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
    @@ -2026,6 +2033,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
    @@ -2317,6 +2325,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
    @@ -2604,6 +2613,7 @@ STAGE PLANS:
                        columns.types int: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
    @@ -2866,6 +2876,7 @@ STAGE PLANS:
                        columns.types int:string:string:int: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
    @@ -3209,6 +3220,7 @@ STAGE PLANS:
                        columns.types int:string:string:int: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
    @@ -3579,6 +3591,7 @@ STAGE PLANS:
                        columns.types int: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
    @@ -3896,6 +3909,7 @@ STAGE PLANS:
                        columns.types int: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
    @@ -5350,6 +5364,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
    @@ -5577,6 +5592,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
    @@ -5800,6 +5816,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/pointlookup2.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/pointlookup2.q.out b/ql/src/test/results/clientpositive/pointlookup2.q.out
    index 3f28788..d677327 100644
    --- a/ql/src/test/results/clientpositive/pointlookup2.q.out
    +++ b/ql/src/test/results/clientpositive/pointlookup2.q.out
    @@ -294,6 +294,7 @@ STAGE PLANS:
                        columns.types int: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
    @@ -551,6 +552,7 @@ STAGE PLANS:
                        columns.types int:string:string:int: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
    @@ -854,6 +856,7 @@ STAGE PLANS:
                        columns.types int:string:string:int: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
    @@ -1210,6 +1213,7 @@ STAGE PLANS:
                        columns.types int:string:string:string: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
    @@ -1612,6 +1616,7 @@ STAGE PLANS:
                        columns.types int:string:string:string: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/pointlookup3.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/pointlookup3.q.out b/ql/src/test/results/clientpositive/pointlookup3.q.out
    index edc726f..4cb3cba 100644
    --- a/ql/src/test/results/clientpositive/pointlookup3.q.out
    +++ b/ql/src/test/results/clientpositive/pointlookup3.q.out
    @@ -256,6 +256,7 @@ STAGE PLANS:
                        columns.types int: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
    @@ -448,6 +449,7 @@ STAGE PLANS:
                        columns.types int: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
    @@ -706,6 +708,7 @@ STAGE PLANS:
                        columns.types int:string:string:string:int: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
    @@ -1011,6 +1014,7 @@ STAGE PLANS:
                        columns.types int:string:string:string:int: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
    @@ -1371,6 +1375,7 @@ STAGE PLANS:
                        columns.types int:string:string:string:int: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/ppd_join_filter.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/ppd_join_filter.q.out b/ql/src/test/results/clientpositive/ppd_join_filter.q.out
    index 8edd2a2..b50d936 100644
    --- a/ql/src/test/results/clientpositive/ppd_join_filter.q.out
    +++ b/ql/src/test/results/clientpositive/ppd_join_filter.q.out
    @@ -372,6 +372,7 @@ STAGE PLANS:
                          columns.types 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
    @@ -785,6 +786,7 @@ STAGE PLANS:
                          columns.types 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
    @@ -1202,6 +1204,7 @@ STAGE PLANS:
                          columns.types 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
    @@ -1615,6 +1618,7 @@ STAGE PLANS:
                          columns.types 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

    http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/ql/src/test/results/clientpositive/ppd_union_view.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/ppd_union_view.q.out b/ql/src/test/results/clientpositive/ppd_union_view.q.out
    index 9c1af8d..5dd9ae3 100644
    --- a/ql/src/test/results/clientpositive/ppd_union_view.q.out
    +++ b/ql/src/test/results/clientpositive/ppd_union_view.q.out
    @@ -364,6 +364,7 @@ STAGE PLANS:
                                  columns.types 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
    @@ -393,6 +394,7 @@ STAGE PLANS:
                              columns.types 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
    @@ -609,6 +611,7 @@ STAGE PLANS:
                                columns.types 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
    @@ -638,6 +641,7 @@ STAGE PLANS:
                              columns.types 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/ppd_vc.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/ppd_vc.q.out b/ql/src/test/results/clientpositive/ppd_vc.q.out
    index 33fc6aa..5f36399 100644
    --- a/ql/src/test/results/clientpositive/ppd_vc.q.out
    +++ b/ql/src/test/results/clientpositive/ppd_vc.q.out
    @@ -64,6 +64,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
    @@ -774,6 +775,7 @@ STAGE PLANS:
                        columns.types string:string:string: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/ppr_allchildsarenull.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/ppr_allchildsarenull.q.out b/ql/src/test/results/clientpositive/ppr_allchildsarenull.q.out
    index 6fe7984..eeae21a 100644
    --- a/ql/src/test/results/clientpositive/ppr_allchildsarenull.q.out
    +++ b/ql/src/test/results/clientpositive/ppr_allchildsarenull.q.out
    @@ -95,6 +95,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
    @@ -327,6 +328,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/push_or.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/push_or.q.out b/ql/src/test/results/clientpositive/push_or.q.out
    index 28446c5..c8edb65 100644
    --- a/ql/src/test/results/clientpositive/push_or.q.out
    +++ b/ql/src/test/results/clientpositive/push_or.q.out
    @@ -218,6 +218,7 @@ STAGE PLANS:
                        columns.types int: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/query_result_fileformat.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/query_result_fileformat.q.out b/ql/src/test/results/clientpositive/query_result_fileformat.q.out
    index 71a50dd..93b98df 100644
    --- a/ql/src/test/results/clientpositive/query_result_fileformat.q.out
    +++ b/ql/src/test/results/clientpositive/query_result_fileformat.q.out
    @@ -82,9 +82,9 @@ POSTHOOK: type: QUERY
      POSTHOOK: Input: default@nzhang_test1
      #### A masked pattern was here ####
      key1 value
    -1 NULL
    - NULL
    -http://asdf NULL
    +1
    +
    +http://asdf
      PREHOOK: query: select * from nzhang_test1
      PREHOOK: type: QUERY
      PREHOOK: Input: default@nzhang_test1

    http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/ql/src/test/results/clientpositive/rand_partitionpruner1.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/rand_partitionpruner1.q.out b/ql/src/test/results/clientpositive/rand_partitionpruner1.q.out
    index 90f17a7..3d8e9b8 100644
    --- a/ql/src/test/results/clientpositive/rand_partitionpruner1.q.out
    +++ b/ql/src/test/results/clientpositive/rand_partitionpruner1.q.out
    @@ -61,6 +61,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/regexp_extract.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/regexp_extract.q.out b/ql/src/test/results/clientpositive/regexp_extract.q.out
    index 84bae16..f69f831 100644
    --- a/ql/src/test/results/clientpositive/regexp_extract.q.out
    +++ b/ql/src/test/results/clientpositive/regexp_extract.q.out
    @@ -197,6 +197,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
    @@ -512,6 +513,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/remote_script.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/remote_script.q.out b/ql/src/test/results/clientpositive/remote_script.q.out
    index 6ec9949..87531f0 100644
    --- a/ql/src/test/results/clientpositive/remote_script.q.out
    +++ b/ql/src/test/results/clientpositive/remote_script.q.out
    @@ -30,13 +30,13 @@ POSTHOOK: Input: default@tmp_tmp
      #### A masked pattern was here ####
      1 2 NULL
      1 2 NULL
    -1 NULL
    +1
      2 NULL
    -1 NULL
    +1
      2 NULL
    -1 NULL
    +1
      2 NULL
    -1 NULL
    +1
      2 NULL
      #### A masked pattern was here ####
      PREHOOK: query: drop table tmp_tmp

    http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/ql/src/test/results/clientpositive/router_join_ppr.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/router_join_ppr.q.out b/ql/src/test/results/clientpositive/router_join_ppr.q.out
    index b7d593f..4d3f81d 100644
    --- a/ql/src/test/results/clientpositive/router_join_ppr.q.out
    +++ b/ql/src/test/results/clientpositive/router_join_ppr.q.out
    @@ -423,6 +423,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
    @@ -804,6 +805,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
    @@ -1177,6 +1179,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
    @@ -1550,6 +1553,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/sample10.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/sample10.q.out b/ql/src/test/results/clientpositive/sample10.q.out
    index b401841..d6f1cda 100644
    --- a/ql/src/test/results/clientpositive/sample10.q.out
    +++ b/ql/src/test/results/clientpositive/sample10.q.out
    @@ -401,6 +401,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/sample6.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/sample6.q.out b/ql/src/test/results/clientpositive/sample6.q.out
    index 037190c..26f7aef 100644
    --- a/ql/src/test/results/clientpositive/sample6.q.out
    +++ b/ql/src/test/results/clientpositive/sample6.q.out
    @@ -730,6 +730,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
    @@ -1128,6 +1129,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
    @@ -1779,6 +1781,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
    @@ -2273,6 +2276,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
    @@ -2801,6 +2805,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
    @@ -3082,6 +3087,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
    @@ -3236,6 +3242,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/sample8.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/sample8.q.out b/ql/src/test/results/clientpositive/sample8.q.out
    index 3f3d3bc..7801edf 100644
    --- a/ql/src/test/results/clientpositive/sample8.q.out
    +++ b/ql/src/test/results/clientpositive/sample8.q.out
    @@ -347,6 +347,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/sample9.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/sample9.q.out b/ql/src/test/results/clientpositive/sample9.q.out
    index b5e625f..2b4acc2 100644
    --- a/ql/src/test/results/clientpositive/sample9.q.out
    +++ b/ql/src/test/results/clientpositive/sample9.q.out
    @@ -79,6 +79,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/serde_user_properties.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/serde_user_properties.q.out b/ql/src/test/results/clientpositive/serde_user_properties.q.out
    index ac3c135..82a43ae 100644
    --- a/ql/src/test/results/clientpositive/serde_user_properties.q.out
    +++ b/ql/src/test/results/clientpositive/serde_user_properties.q.out
    @@ -141,6 +141,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
    @@ -311,6 +312,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
    @@ -489,6 +491,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/smb_mapjoin9.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/smb_mapjoin9.q.out b/ql/src/test/results/clientpositive/smb_mapjoin9.q.out
    index 3f34437..14f913b 100644
    --- a/ql/src/test/results/clientpositive/smb_mapjoin9.q.out
    +++ b/ql/src/test/results/clientpositive/smb_mapjoin9.q.out
    @@ -147,6 +147,7 @@ STAGE PLANS:
                                columns.types int: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
    @@ -307,6 +308,7 @@ STAGE PLANS:
                                columns.types int: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

    http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/ql/src/test/results/clientpositive/smb_mapjoin_11.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_11.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_11.q.out
    index e1d049d..7b54dbe 100644
    --- a/ql/src/test/results/clientpositive/smb_mapjoin_11.q.out
    +++ b/ql/src/test/results/clientpositive/smb_mapjoin_11.q.out
    @@ -1885,6 +1885,7 @@ STAGE PLANS:
                              columns.types int: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
    @@ -2010,6 +2011,7 @@ STAGE PLANS:
                              columns.types int: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/smb_mapjoin_13.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_13.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_13.q.out
    index 8eb9dbd..1eaea87 100644
    --- a/ql/src/test/results/clientpositive/smb_mapjoin_13.q.out
    +++ b/ql/src/test/results/clientpositive/smb_mapjoin_13.q.out
    @@ -228,6 +228,7 @@ STAGE PLANS:
                          columns.types int:string: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
    @@ -453,6 +454,7 @@ STAGE PLANS:
                          columns.types int:string: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/smb_mapjoin_15.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_15.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_15.q.out
    index 0f747f0..64a3ea2 100644
    --- a/ql/src/test/results/clientpositive/smb_mapjoin_15.q.out
    +++ b/ql/src/test/results/clientpositive/smb_mapjoin_15.q.out
    @@ -200,6 +200,7 @@ STAGE PLANS:
                          columns.types int:string: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
    @@ -457,6 +458,7 @@ STAGE PLANS:
                          columns.types int:int:string:int: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
    @@ -662,6 +664,7 @@ STAGE PLANS:
                          columns.types int:int:string:int: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
    @@ -905,6 +908,7 @@ STAGE PLANS:
                          columns.types int:int:string:int: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/sort_merge_join_desc_5.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/sort_merge_join_desc_5.q.out b/ql/src/test/results/clientpositive/sort_merge_join_desc_5.q.out
    index 91cd338..259d0b3 100644
    --- a/ql/src/test/results/clientpositive/sort_merge_join_desc_5.q.out
    +++ b/ql/src/test/results/clientpositive/sort_merge_join_desc_5.q.out
    @@ -217,6 +217,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/sort_merge_join_desc_6.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/sort_merge_join_desc_6.q.out b/ql/src/test/results/clientpositive/sort_merge_join_desc_6.q.out
    index d5ae55e..aa4e1bf 100644
    --- a/ql/src/test/results/clientpositive/sort_merge_join_desc_6.q.out
    +++ b/ql/src/test/results/clientpositive/sort_merge_join_desc_6.q.out
    @@ -300,6 +300,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/sort_merge_join_desc_7.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/sort_merge_join_desc_7.q.out b/ql/src/test/results/clientpositive/sort_merge_join_desc_7.q.out
    index c4aa11b..863a4d1 100644
    --- a/ql/src/test/results/clientpositive/sort_merge_join_desc_7.q.out
    +++ b/ql/src/test/results/clientpositive/sort_merge_join_desc_7.q.out
    @@ -420,6 +420,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/spark/auto_join_reordering_values.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/spark/auto_join_reordering_values.q.out b/ql/src/test/results/clientpositive/spark/auto_join_reordering_values.q.out
    index 7b9a98d..9df55b9 100644
    --- a/ql/src/test/results/clientpositive/spark/auto_join_reordering_values.q.out
    +++ b/ql/src/test/results/clientpositive/spark/auto_join_reordering_values.q.out
    @@ -602,6 +602,7 @@ STAGE PLANS:
                                  columns.types 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

    http://git-wip-us.apache.org/repos/asf/hive/blob/3e7d1c45/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_1.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_1.q.out b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_1.q.out
    index 09d2692..6bf47d9 100644
    --- a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_1.q.out
    +++ b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_1.q.out
    @@ -307,6 +307,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
    @@ -539,6 +540,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
    @@ -861,6 +863,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/spark/auto_sortmerge_join_12.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_12.q.out b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_12.q.out
    index a70b161..197b132 100644
    --- a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_12.q.out
    +++ b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_12.q.out
    @@ -611,6 +611,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/spark/auto_sortmerge_join_2.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_2.q.out b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_2.q.out
    index 2ea0a65..4643533 100644
    --- a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_2.q.out
    +++ b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_2.q.out
    @@ -287,6 +287,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
    @@ -611,6 +612,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/spark/auto_sortmerge_join_3.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_3.q.out b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_3.q.out
    index 6281929..23530bd 100644
    --- a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_3.q.out
    +++ b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_3.q.out
    @@ -238,6 +238,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
    @@ -421,6 +422,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
    @@ -743,6 +745,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/spark/auto_sortmerge_join_4.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_4.q.out b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_4.q.out
    index 31e9d86..b6f6f84 100644
    --- a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_4.q.out
    +++ b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_4.q.out
    @@ -254,6 +254,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
    @@ -437,6 +438,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
    @@ -759,6 +761,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/spark/auto_sortmerge_join_5.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_5.q.out b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_5.q.out
    index e3a5710..a3e9e26 100644
    --- a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_5.q.out
    +++ b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_5.q.out
    @@ -221,6 +221,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
    @@ -394,6 +395,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
    @@ -653,6 +655,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/spark/auto_sortmerge_join_7.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_7.q.out b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_7.q.out
    index ddbca05..e0aa444 100644
    --- a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_7.q.out
    +++ b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_7.q.out
    @@ -320,6 +320,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
    @@ -554,6 +555,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
    @@ -927,6 +929,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/spark/auto_sortmerge_join_8.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_8.q.out b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_8.q.out
    index 88d4dcb..8171558 100644
    --- a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_8.q.out
    +++ b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_8.q.out
    @@ -320,6 +320,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
    @@ -554,6 +555,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
    @@ -929,6 +931,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/spark/bucket_map_join_1.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/spark/bucket_map_join_1.q.out b/ql/src/test/results/clientpositive/spark/bucket_map_join_1.q.out
    index 7570ebe..d3f433d 100644
    --- a/ql/src/test/results/clientpositive/spark/bucket_map_join_1.q.out
    +++ b/ql/src/test/results/clientpositive/spark/bucket_map_join_1.q.out
    @@ -299,6 +299,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/spark/bucket_map_join_2.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/spark/bucket_map_join_2.q.out b/ql/src/test/results/clientpositive/spark/bucket_map_join_2.q.out
    index 80b44e9..3d850db 100644
    --- a/ql/src/test/results/clientpositive/spark/bucket_map_join_2.q.out
    +++ b/ql/src/test/results/clientpositive/spark/bucket_map_join_2.q.out
    @@ -299,6 +299,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/spark/bucket_map_join_spark4.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/spark/bucket_map_join_spark4.q.out b/ql/src/test/results/clientpositive/spark/bucket_map_join_spark4.q.out
    index 174d7b2..be46c92 100644
    --- a/ql/src/test/results/clientpositive/spark/bucket_map_join_spark4.q.out
    +++ b/ql/src/test/results/clientpositive/spark/bucket_map_join_spark4.q.out
    @@ -349,6 +349,7 @@ STAGE PLANS:
                                        columns.types int: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
    @@ -775,6 +776,7 @@ STAGE PLANS:
                                        columns.types int: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/spark/bucketmapjoin1.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/spark/bucketmapjoin1.q.out b/ql/src/test/results/clientpositive/spark/bucketmapjoin1.q.out
    index d4a9c98..b2b93fb 100644
    --- a/ql/src/test/results/clientpositive/spark/bucketmapjoin1.q.out
    +++ b/ql/src/test/results/clientpositive/spark/bucketmapjoin1.q.out
    @@ -166,6 +166,7 @@ STAGE PLANS:
                                      columns.types int: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
    @@ -340,6 +341,7 @@ STAGE PLANS:
                                      columns.types int: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/spark/bucketmapjoin10.q.out
    ----------------------------------------------------------------------
    diff --git a/ql/src/test/results/clientpositive/spark/bucketmapjoin10.q.out b/ql/src/test/results/clientpositive/spark/bucketmapjoin10.q.out
    index 678ad54..d7d7d40 100644
    --- a/ql/src/test/results/clientpositive/spark/bucketmapjoin10.q.out
    +++ b/ql/src/test/results/clientpositive/spark/bucketmapjoin10.q.out
    @@ -481,6 +481,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

Related Discussions

Discussion Navigation
viewthread | post
Discussion Overview
groupcommits @
categorieshive, hadoop
postedOct 16, '15 at 6:59p
activeOct 16, '15 at 6:59p
posts4
users1
websitehive.apache.org

1 user in discussion

Sunchao: 4 posts

People

Translate

site design / logo © 2021 Grokbase