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 3cb30c2366b2 [SPARK-47579][SQL][FOLLOWUP] Restore the `--help` print format of spark sql shell 3cb30c2366b2 is described below commit 3cb30c2366b27c5a65ec02121c30bd1a4eb20584 Author: Kent Yao <y...@apache.org> AuthorDate: Fri May 24 09:43:03 2024 -0700 [SPARK-47579][SQL][FOLLOWUP] Restore the `--help` print format of spark sql shell ### What changes were proposed in this pull request? Restore the print format of spark sql shell ### Why are the changes needed? bugfix ### Does this PR introduce _any_ user-facing change? no ### How was this patch tested? manually ![image](https://github.com/apache/spark/assets/8326978/17b9d009-5d93-4d84-9367-7308b4cda426) ![image](https://github.com/apache/spark/assets/8326978/a5e333bd-0e22-4d5a-83f1-843767f6d5f5) ### Was this patch authored or co-authored using generative AI tooling? no Closes #46735 from yaooqinn/SPARK-47579. Authored-by: Kent Yao <y...@apache.org> Signed-off-by: Gengliang Wang <gengli...@apache.org> --- common/utils/src/main/scala/org/apache/spark/internal/LogKey.scala | 1 - core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/utils/src/main/scala/org/apache/spark/internal/LogKey.scala b/common/utils/src/main/scala/org/apache/spark/internal/LogKey.scala index 1f67a211c01f..99fc58b03503 100644 --- a/common/utils/src/main/scala/org/apache/spark/internal/LogKey.scala +++ b/common/utils/src/main/scala/org/apache/spark/internal/LogKey.scala @@ -585,7 +585,6 @@ object LogKeys { case object SESSION_KEY extends LogKey case object SET_CLIENT_INFO_REQUEST extends LogKey case object SHARD_ID extends LogKey - case object SHELL_OPTIONS extends LogKey case object SHORT_USER_NAME extends LogKey case object SHUFFLE_BLOCK_INFO extends LogKey case object SHUFFLE_DB_BACKEND_KEY extends LogKey diff --git a/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala b/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala index 61235a701907..e47596a6ae43 100644 --- a/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala +++ b/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala @@ -588,7 +588,8 @@ private[deploy] class SparkSubmitArguments(args: Seq[String], env: Map[String, S ) if (SparkSubmit.isSqlShell(mainClass)) { - logInfo(log"CLI options:\n${MDC(SHELL_OPTIONS, getSqlShellOptions())}") + logInfo("CLI options:") + logInfo(getSqlShellOptions()) } throw SparkUserAppException(exitCode) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org