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

gengliang 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 ffd7a34  [SPARK-34735][UI][FOLLOWUP] Fix NPE if event log doesn't 
exist modifiedConfigs
ffd7a34 is described below

commit ffd7a340675d3c5dcdc80325da984cc7156791df
Author: ulysses-you <[email protected]>
AuthorDate: Wed Dec 15 23:39:28 2021 +0800

    [SPARK-34735][UI][FOLLOWUP] Fix NPE if event log doesn't exist 
modifiedConfigs
    
    ### What changes were proposed in this pull request?
    
    Wrap  modifiedConfigs  with Option in `ExecutionPage`
    
    ### Why are the changes needed?
    
    It only affects the master branch history server which read the event log 
doesn't exist modifiedConfigs.
    
    Before
    
![image](https://user-images.githubusercontent.com/12025282/146150695-28d9105a-ce17-4669-b1b2-4649d3455a7c.png)
    
    After
    
![image](https://user-images.githubusercontent.com/12025282/146150536-c82602d4-05d5-40fd-bff7-0a64f569e6f6.png)
    
    ### Does this PR introduce _any_ user-facing change?
    
    no, not released
    
    ### How was this patch tested?
    
    manual test
    
    Closes #34907 from ulysses-you/SPARK-34735-FOLLOWUP.
    
    Authored-by: ulysses-you <[email protected]>
    Signed-off-by: Gengliang Wang <[email protected]>
---
 .../main/scala/org/apache/spark/sql/execution/ui/ExecutionPage.scala    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/sql/core/src/main/scala/org/apache/spark/sql/execution/ui/ExecutionPage.scala 
b/sql/core/src/main/scala/org/apache/spark/sql/execution/ui/ExecutionPage.scala
index b8575b0..6aacec3 100644
--- 
a/sql/core/src/main/scala/org/apache/spark/sql/execution/ui/ExecutionPage.scala
+++ 
b/sql/core/src/main/scala/org/apache/spark/sql/execution/ui/ExecutionPage.scala
@@ -151,7 +151,7 @@ class ExecutionPage(parent: SQLTab) extends 
WebUIPage("execution") with Logging
     val configs = UIUtils.listingTable(
       propertyHeader,
       propertyRow,
-      modifiedConfigs.toSeq.sorted,
+      Option(modifiedConfigs).getOrElse(Map.empty).toSeq.sorted,
       fixedWidth = true
     )
 

---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to