scala lint

Author: khakhlyuk

sql/connect/client/jvm/src/test/scala/org/apache/spark/sql/connect/client/SparkConnectClientRetriesSuite.scala

@@ -56,8 +56,7 @@ class SparkConnectClientRetriesSuite
   private def createTestExceptionWithDetails(
       msg: String,
       code: Status.Code = Status.Code.INTERNAL,
-      retryDelay: FiniteDuration = FiniteDuration(0, "s")
-  ): StatusRuntimeException = {
+      retryDelay: FiniteDuration = FiniteDuration(0, "s")): StatusRuntimeException = {
     // In grpc-java, RetryDelay should be specified as seconds: Long + nanos: Int
     val seconds = retryDelay.toSeconds
     val nanos = (retryDelay - FiniteDuration(seconds, "s")).toNanos.toInt
@@ -83,8 +82,7 @@ class SparkConnectClientRetriesSuite
   private def assertLongSequencesAlmostEqual(
       first: Seq[Long],
       second: Seq[Long],
-      delta: Long
-  ): Unit = {
+      delta: Long): Unit = {
     assert(first.length == second.length, "Lists have different lengths.")
     for ((a, b) <- first.zip(second)) {
       assert(math.abs(a - b) <= delta, s"Elements $a and $b differ by more than $delta.")
@@ -199,10 +197,8 @@ class SparkConnectClientRetriesSuite
   }
   test("DefaultPolicy retries exceptions with RetryInfo") {
     // Error contains RetryInfo with retry_delay set to 0
-    val dummyFn = new DummyFn(
-      createTestExceptionWithDetails(msg = "Some error message"),
-      numFails = 100
-    )
+    val dummyFn =
+      new DummyFn(createTestExceptionWithDetails(msg = "Some error message"), numFails = 100)
     val retryPolicies = RetryPolicy.defaultPolicies()
     val retryHandler = new GrpcRetryHandler(retryPolicies, sleep = _ => {})
     assertThrows[RetriesExceeded] {
@@ -218,12 +214,8 @@ class SparkConnectClientRetriesSuite
     val st = new SleepTimeTracker()
     val retryDelay = FiniteDuration(5, "min")
     val dummyFn = new DummyFn(
-      createTestExceptionWithDetails(
-        msg = "Some error message",
-        retryDelay = retryDelay
-      ),
-      numFails = 100
-    )
+      createTestExceptionWithDetails(msg = "Some error message", retryDelay = retryDelay),
+      numFails = 100)
     val retryPolicies = RetryPolicy.defaultPolicies()
     val retryHandler = new GrpcRetryHandler(retryPolicies, sleep = st.sleep)
 
@@ -243,12 +235,8 @@ class SparkConnectClientRetriesSuite
     val st = new SleepTimeTracker()
     val retryDelay = FiniteDuration(5, "d")
     val dummyFn = new DummyFn(
-      createTestExceptionWithDetails(
-        msg = "Some error message",
-        retryDelay = retryDelay
-      ),
-      numFails = 100
-    )
+      createTestExceptionWithDetails(msg = "Some error message", retryDelay = retryDelay),
+      numFails = 100)
     val retryPolicies = RetryPolicy.defaultPolicies()
     val retryHandler = new GrpcRetryHandler(retryPolicies, sleep = st.sleep)
 
@@ -271,14 +259,10 @@ class SparkConnectClientRetriesSuite
       List.fill(2)(
         createTestExceptionWithDetails(
           msg = "Some error message",
-          retryDelay = retryDelay
-        )
-      ) ++ List.fill(3)(
+          retryDelay = retryDelay)) ++ List.fill(3)(
         createTestExceptionWithDetails(
           msg = "Some error message",
-          code = Status.Code.UNAVAILABLE
-        )
-      )
+          code = Status.Code.UNAVAILABLE))
     ).iterator
 
     retryHandler.retry({
@@ -290,9 +274,8 @@ class SparkConnectClientRetriesSuite
 
     // Should be retried by DefaultPolicy
     val policy = retryPolicies.find(_.name == "DefaultPolicy").get
-    val expectedSleeps = List.fill(2)(retryDelay.toMillis) ++ List.tabulate(3)(
-        i => policy.initialBackoff.toMillis * math.pow(policy.backoffMultiplier, i + 2).toLong
-      )
+    val expectedSleeps = List.fill(2)(retryDelay.toMillis) ++ List.tabulate(3)(i =>
+      policy.initialBackoff.toMillis * math.pow(policy.backoffMultiplier, i + 2).toLong)
     assertLongSequencesAlmostEqual(st.times, expectedSleeps, delta = policy.jitter.toMillis)
   }
 }

sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/RetryPolicy.scala

@@ -47,16 +47,16 @@ import org.apache.spark.internal.Logging
  * @param name
  *   Name of the policy.
  * @param recognizeServerRetryDelay
- *   Per gRPC standard, the server can send error messages that contain `RetryInfo` message
- *   with `retry_delay` field indicating that the client should wait for at least `retry_delay`
- *   amount of time before retrying again, see:
+ *   Per gRPC standard, the server can send error messages that contain `RetryInfo` message with
+ *   `retry_delay` field indicating that the client should wait for at least `retry_delay` amount
+ *   of time before retrying again, see:
  *   https://github.com/googleapis/googleapis/blob/master/google/rpc/error_details.proto#L91
  *
- *   If this flag is set to true, RetryPolicy will use `RetryInfo.retry_delay` field
- *   in the backoff computation. Server's `retry_delay` can override client's `maxBackoff`.
+ * If this flag is set to true, RetryPolicy will use `RetryInfo.retry_delay` field in the backoff
+ * computation. Server's `retry_delay` can override client's `maxBackoff`.
  *
- *   This flag does not change which errors are retried, only how the backoff is computed.
- *   `DefaultPolicy` additionally has a rule for retrying any error that contains `RetryInfo`.
+ * This flag does not change which errors are retried, only how the backoff is computed.
+ * `DefaultPolicy` additionally has a rule for retrying any error that contains `RetryInfo`.
  * @param maxServerRetryDelay
  *   Limit for the server-provided `retry_delay`.
  */
@@ -178,22 +178,18 @@ object RetryPolicy extends Logging {
     e match {
       case e: StatusRuntimeException =>
         Option(StatusProto.fromThrowable(e))
-          .flatMap(
-            status =>
-              status.getDetailsList.asScala
-                .find(_.is(classOf[RetryInfo]))
-                .map(_.unpack(classOf[RetryInfo]))
-          )
+          .flatMap(status =>
+            status.getDetailsList.asScala
+              .find(_.is(classOf[RetryInfo]))
+              .map(_.unpack(classOf[RetryInfo])))
       case _ => None
     }
   }
 
   private def extractRetryDelay(e: Throwable): Option[FiniteDuration] = {
     extractRetryInfo(e)
       .flatMap(retryInfo => Option(retryInfo.getRetryDelay))
-      .map(
-        retryDelay =>
-          FiniteDuration(retryDelay.getSeconds, "s") + FiniteDuration(retryDelay.getNanos, "ns")
-      )
+      .map(retryDelay =>
+        FiniteDuration(retryDelay.getSeconds, "s") + FiniteDuration(retryDelay.getNanos, "ns"))
   }
 }