From d624cf8f60531936d598917403318eb6f04d71c3 Mon Sep 17 00:00:00 2001
From: KaiXinXiaoLei <huleilei1@huawei.com>
Date: Wed, 1 Jul 2015 11:12:33 +0800
Subject: [PATCH 1/4] sql config is wrong

---
 docs/sql-programming-guide.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/sql-programming-guide.md b/docs/sql-programming-guide.md
index 88c96a9a095b3..d7994efc5d057 100644
--- a/docs/sql-programming-guide.md
+++ b/docs/sql-programming-guide.md
@@ -1890,7 +1890,7 @@ that these options will be deprecated in future release as more optimizations ar
   </tr>
   <tr>
     <td><code>spark.sql.codegen</code></td>
-    <td>false</td>
+    <td>true</td>
     <td>
       When true, code will be dynamically generated at runtime for expression evaluation in a specific
       query.  For some queries with complicated expression this option can lead to significant speed-ups.

From 4cfd11d340fee69e32004c37598fd22c70e9bd74 Mon Sep 17 00:00:00 2001
From: KaiXinXiaoLei <huleilei1@huawei.com>
Date: Wed, 1 Jul 2015 15:09:03 +0800
Subject: [PATCH 2/4] change spark.sql.planner.externalSort

---
 docs/sql-programming-guide.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/sql-programming-guide.md b/docs/sql-programming-guide.md
index d7994efc5d057..78e1f1caa2270 100644
--- a/docs/sql-programming-guide.md
+++ b/docs/sql-programming-guide.md
@@ -1906,7 +1906,7 @@ that these options will be deprecated in future release as more optimizations ar
   </tr>
   <tr>
     <td><code>spark.sql.planner.externalSort</code></td>
-    <td>false</td>
+    <td>true</td>
     <td>
       When true, performs sorts spilling to disk as needed otherwise sort each partition in memory.
     </td>

From 4ee531da6ca48b12824095e98e182f022ea24d1b Mon Sep 17 00:00:00 2001
From: KaiXinXiaoLei <huleilei1@huawei.com>
Date: Wed, 1 Jul 2015 17:40:06 +0800
Subject: [PATCH 3/4] delete space

---
 docs/sql-programming-guide.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/sql-programming-guide.md b/docs/sql-programming-guide.md
index 78e1f1caa2270..61a39845c4bfb 100644
--- a/docs/sql-programming-guide.md
+++ b/docs/sql-programming-guide.md
@@ -1893,7 +1893,7 @@ that these options will be deprecated in future release as more optimizations ar
     <td>true</td>
     <td>
       When true, code will be dynamically generated at runtime for expression evaluation in a specific
-      query.  For some queries with complicated expression this option can lead to significant speed-ups.
+      query. For some queries with complicated expression this option can lead to significant speed-ups.
       However, for simple queries this can actually slow down query execution.
     </td>
   </tr>

From 08844249eab7e3871fc9288b61a2dd178cc93088 Mon Sep 17 00:00:00 2001
From: Kousuke Saruta <sarutak@oss.nttdata.co.jp>
Date: Sun, 2 Aug 2015 17:17:29 +0900
Subject: [PATCH 4/4] Removed a line which mentioned about the effect of
 codegen enabled

---
 docs/sql-programming-guide.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/sql-programming-guide.md b/docs/sql-programming-guide.md
index 7e94e95712fd1..3ea77e82422fb 100644
--- a/docs/sql-programming-guide.md
+++ b/docs/sql-programming-guide.md
@@ -1889,7 +1889,6 @@ that these options will be deprecated in future release as more optimizations ar
     <td>
       When true, code will be dynamically generated at runtime for expression evaluation in a specific
       query. For some queries with complicated expression this option can lead to significant speed-ups.
-      However, for simple queries this can actually slow down query execution.
     </td>
   </tr>
   <tr>