From a18177ff323d11db8cac2bb994e767951adcc3b1 Mon Sep 17 00:00:00 2001 From: Josh Rosen Date: Fri, 21 Jun 2024 10:33:55 -0700 Subject: [PATCH] Address review feedback: remove shadowing and some branches --- .../org/apache/spark/internal/config/ConfigEntry.scala | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/core/src/main/scala/org/apache/spark/internal/config/ConfigEntry.scala b/core/src/main/scala/org/apache/spark/internal/config/ConfigEntry.scala index 808394e499421..17d3329e6b494 100644 --- a/core/src/main/scala/org/apache/spark/internal/config/ConfigEntry.scala +++ b/core/src/main/scala/org/apache/spark/internal/config/ConfigEntry.scala @@ -92,13 +92,11 @@ private[spark] abstract class ConfigEntry[T] ( // SPARK-48678: performance optimization: this code could be expressed more succinctly // using flatten and mkString, but doing so adds lots of Scala collections perf. overhead. val maybePrependedValue: Option[String] = prependedKey.flatMap(reader.get) - val value: Option[String] = alternatives + val maybeValue: Option[String] = alternatives .foldLeft(reader.get(key))((res, nextKey) => res.orElse(reader.get(nextKey))) - (maybePrependedValue, value) match { + (maybePrependedValue, maybeValue) match { case (Some(prependedValue), Some(value)) => Some(s"$prependedValue$prependSeparator$value") - case (Some(prepend), None) => Some(prepend) - case (None, Some(value)) => Some(value) - case (None, None) => None + case _ => maybeValue.orElse(maybePrependedValue) } }