You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by zs...@apache.org on 2017/06/06 00:48:31 UTC
spark git commit: [SPARK-20991][SQL] BROADCAST_TIMEOUT conf should be
a TimeoutConf
Repository: spark
Updated Branches:
refs/heads/master bc537e40a -> 88a23d3de
[SPARK-20991][SQL] BROADCAST_TIMEOUT conf should be a TimeoutConf
## What changes were proposed in this pull request?
The construction of BROADCAST_TIMEOUT conf should take the TimeUnit argument as a TimeoutConf.
Author: Feng Liu <fe...@databricks.com>
Closes #18208 from liufengdb/fix_timeout.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/88a23d3d
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/88a23d3d
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/88a23d3d
Branch: refs/heads/master
Commit: 88a23d3de046c5f22417a0bd679119b876b15568
Parents: bc537e4
Author: Feng Liu <fe...@databricks.com>
Authored: Mon Jun 5 17:48:28 2017 -0700
Committer: Shixiong Zhu <sh...@databricks.com>
Committed: Mon Jun 5 17:48:28 2017 -0700
----------------------------------------------------------------------
.../src/main/scala/org/apache/spark/sql/internal/SQLConf.scala | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/88a23d3d/sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala
----------------------------------------------------------------------
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala
index 54bee02..3ea8089 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala
@@ -352,7 +352,7 @@ object SQLConf {
val BROADCAST_TIMEOUT = buildConf("spark.sql.broadcastTimeout")
.doc("Timeout in seconds for the broadcast wait time in broadcast joins.")
- .intConf
+ .timeConf(TimeUnit.SECONDS)
.createWithDefault(5 * 60)
// This is only used for the thriftserver
@@ -991,7 +991,7 @@ class SQLConf extends Serializable with Logging {
def columnNameOfCorruptRecord: String = getConf(COLUMN_NAME_OF_CORRUPT_RECORD)
- def broadcastTimeout: Int = getConf(BROADCAST_TIMEOUT)
+ def broadcastTimeout: Long = getConf(BROADCAST_TIMEOUT)
def defaultDataSourceName: String = getConf(DEFAULT_DATA_SOURCE_NAME)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org