[spark] branch master updated: [SPARK-27253][SQL][FOLLOW-UP] Update doc about parent-session configuration priority

[gu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

gurwls223 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git


The following commit(s) were added to refs/heads/master by this push:
     new 08858f6  [SPARK-27253][SQL][FOLLOW-UP] Update doc about parent-session configuration priority
08858f6 is described below

commit 08858f6abcb7a0e31ee1d4d2c439112e33730bb4
Author: Liang-Chi Hsieh <vi...@gmail.com>
AuthorDate: Wed Apr 10 13:21:21 2019 +0900

    [SPARK-27253][SQL][FOLLOW-UP] Update doc about parent-session configuration priority
    
    ## What changes were proposed in this pull request?
    
    The PR #24189 changes the behavior of merging SparkConf. The existing doc is not updated for it. This is a followup of it to update the doc.
    
    ## How was this patch tested?
    
    Doc only change.
    
    Closes #24326 from viirya/SPARK-27253-followup.
    
    Authored-by: Liang-Chi Hsieh <vi...@gmail.com>
    Signed-off-by: HyukjinKwon <gu...@apache.org>
---
 .../scala/org/apache/spark/sql/internal/BaseSessionStateBuilder.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sql/core/src/main/scala/org/apache/spark/sql/internal/BaseSessionStateBuilder.scala b/sql/core/src/main/scala/org/apache/spark/sql/internal/BaseSessionStateBuilder.scala
index 8f2f8e8..3d29ff3 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/internal/BaseSessionStateBuilder.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/internal/BaseSessionStateBuilder.scala
@@ -81,8 +81,8 @@ abstract class BaseSessionStateBuilder(
   /**
    * SQL-specific key-value configurations.
    *
-   * These either get cloned from a pre-existing instance or newly created. The conf is always
-   * merged with its [[SparkConf]].
+   * These either get cloned from a pre-existing instance or newly created. The conf is merged
+   * with its [[SparkConf]] only when there is no parent session.
    */
   protected lazy val conf: SQLConf = {
     parentState.map(_.conf.clone()).getOrElse {


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