From 1d98751b9c3b35e5263586d9390885e58283471c Mon Sep 17 00:00:00 2001 From: Warren Zhu Date: Wed, 8 Jul 2020 09:16:34 -0700 Subject: [PATCH 1/2] [SPARK-32227] Fix regression bug in load-spark-env.cmd with Spark 3.0.0 --- bin/load-spark-env.cmd | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/bin/load-spark-env.cmd b/bin/load-spark-env.cmd index 6cb8bf7fc7a21..6f5fb32689949 100644 --- a/bin/load-spark-env.cmd +++ b/bin/load-spark-env.cmd @@ -29,10 +29,7 @@ if not defined SPARK_ENV_LOADED ( set SPARK_CONF_DIR=%~dp0..\conf ) - set SPARK_ENV_CMD=%SPARK_CONF_DIR%\%SPARK_ENV_CMD% - if exist %SPARK_ENV_CMD% ( - call %SPARK_ENV_CMD% - ) + call :LoadSparkEnv ) rem Setting SPARK_SCALA_VERSION if not already set. @@ -59,3 +56,8 @@ if not defined SPARK_SCALA_VERSION ( ) ) exit /b 0 + +:LoadSparkEnv +if exist "%SPARK_CONF_DIR%\spark-env.cmd" ( + call "%SPARK_CONF_DIR%\spark-env.cmd" +) From 4589e1bd2a9779ce9029ab4ea49c5df5ed46be17 Mon Sep 17 00:00:00 2001 From: Warren Zhu Date: Mon, 27 Jul 2020 14:43:16 -0700 Subject: [PATCH 2/2] Trigger Build --- bin/load-spark-env.cmd | 1 - 1 file changed, 1 deletion(-) diff --git a/bin/load-spark-env.cmd b/bin/load-spark-env.cmd index 6f5fb32689949..fe725a4e1a368 100644 --- a/bin/load-spark-env.cmd +++ b/bin/load-spark-env.cmd @@ -21,7 +21,6 @@ rem This script loads spark-env.cmd if it exists, and ensures it is only loaded rem spark-env.cmd is loaded from SPARK_CONF_DIR if set, or within the current directory's rem conf\ subdirectory. -set SPARK_ENV_CMD=spark-env.cmd if not defined SPARK_ENV_LOADED ( set SPARK_ENV_LOADED=1