From 88a23d3de046c5f22417a0bd679119b876b15568 Mon Sep 17 00:00:00 2001
From: Feng Liu <fengliu@databricks.com>
Date: Mon, 5 Jun 2017 17:48:28 -0700
Subject: [PATCH] [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 <fengliu@databricks.com>
Closes #18208 from liufengdb/fix_timeout.
---
.../main/scala/org/apache/spark/sql/internal/SQLConf.scala | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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 54bee02e44..3ea808926e 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)
--
GitLab