diff --git a/docs/sql-programming-guide.md b/docs/sql-programming-guide.md
index d31baa080cbcee3d377a7fd8d01350e2b392e3ad..3ea77e82422fb692fb1fb7be4bdccfeb78579600 100644
--- a/docs/sql-programming-guide.md
+++ b/docs/sql-programming-guide.md
@@ -1885,11 +1885,10 @@ 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.
-      However, for simple queries this can actually slow down query execution.
+      query. For some queries with complicated expression this option can lead to significant speed-ups.
     </td>
   </tr>
   <tr>
@@ -1901,7 +1900,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>