Repository: spark
Updated Branches:
  refs/heads/branch-2.0 c0364485e -> 3f8a95be8


[SPARK-16870][DOCS] Summary:add "spark.sql.broadcastTimeout" into 
docs/sql-programming-gu…

## What changes were proposed in this pull request?
default value for spark.sql.broadcastTimeout is 300s. and this property do not 
show in any docs of spark. so add "spark.sql.broadcastTimeout" into 
docs/sql-programming-guide.md to help people to how to fix this timeout error 
when it happenned

## How was this patch tested?

not need

(If this patch involves UI changes, please attach a screenshot; otherwise, 
remove this)

…ide.md

JIRA_ID:SPARK-16870
Description:default value for spark.sql.broadcastTimeout is 300s. and this 
property do not show in any docs of spark. so add "spark.sql.broadcastTimeout" 
into docs/sql-programming-guide.md to help people to how to fix this timeout 
error when it happenned
Test:done

Author: keliang <keli...@cmss.chinamobile.com>

Closes #14477 from biglobster/keliang.

(cherry picked from commit 1275f646964d2fdb5b96a9429760b4fac4340521)
Signed-off-by: Sean Owen <so...@cloudera.com>


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

Branch: refs/heads/branch-2.0
Commit: 3f8a95be8f096e13cade1af50f3d4e699ce45e07
Parents: c036448
Author: keliang <keli...@cmss.chinamobile.com>
Authored: Sun Aug 7 09:28:32 2016 +0100
Committer: Sean Owen <so...@cloudera.com>
Committed: Sun Aug 7 09:28:41 2016 +0100

----------------------------------------------------------------------
 docs/sql-programming-guide.md | 9 +++++++++
 1 file changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/3f8a95be/docs/sql-programming-guide.md
----------------------------------------------------------------------
diff --git a/docs/sql-programming-guide.md b/docs/sql-programming-guide.md
index 82b03a2..3b01dc8 100644
--- a/docs/sql-programming-guide.md
+++ b/docs/sql-programming-guide.md
@@ -1148,6 +1148,15 @@ that these options will be deprecated in future release 
as more optimizations ar
     </td>
   </tr>
   <tr>
+    <td><code>spark.sql.broadcastTimeout</code></td>
+    <td>300</td>
+    <td>
+    <p>
+      Timeout in seconds for the broadcast wait time in broadcast joins
+    </p>
+    </td>
+  </tr>
+  <tr>
     <td><code>spark.sql.autoBroadcastJoinThreshold</code></td>
     <td>10485760 (10 MB)</td>
     <td>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org

Reply via email to