From 27923d72de12e80722d608e5b72b67604c0e448c Mon Sep 17 00:00:00 2001 From: panbingkun Date: Thu, 4 Apr 2024 07:20:59 +0800 Subject: [PATCH 1/2] [SPARK-47705][INFRA][FOLLOWUP] Sort LogKey alphabetically and build a test to ensure it --- .../utils/src/main/scala/org/apache/spark/internal/LogKey.scala | 2 +- .../src/test/scala/org/apache/spark/util/LogKeySuite.scala | 2 +- 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 b8a43a03d8b62..86ea648d47c12 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 @@ -30,8 +30,8 @@ object LogKey extends Enumeration { val MAX_EXECUTOR_FAILURES = Value val MAX_SIZE = Value val MIN_SIZE = Value - val REMOTE_ADDRESS = Value val POD_ID = Value + val REMOTE_ADDRESS = Value type LogKey = Value } diff --git a/common/utils/src/test/scala/org/apache/spark/util/LogKeySuite.scala b/common/utils/src/test/scala/org/apache/spark/util/LogKeySuite.scala index 39229f4b910bf..11884c287b919 100644 --- a/common/utils/src/test/scala/org/apache/spark/util/LogKeySuite.scala +++ b/common/utils/src/test/scala/org/apache/spark/util/LogKeySuite.scala @@ -27,6 +27,6 @@ class LogKeySuite test("LogKey enumeration fields must be sorted alphabetically") { val keys = LogKey.values.toSeq - assert(keys === keys.sorted, "LogKey enumeration fields must be sorted alphabetically") + assert(keys === keys.sortBy(_.toString), "LogKey enumeration fields must be sorted alphabetically") } } From 2ce31176b2bea6923f4b1ca036de9db858282f50 Mon Sep 17 00:00:00 2001 From: panbingkun Date: Thu, 4 Apr 2024 08:13:08 +0800 Subject: [PATCH 2/2] fix code style --- .../src/test/scala/org/apache/spark/util/LogKeySuite.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/utils/src/test/scala/org/apache/spark/util/LogKeySuite.scala b/common/utils/src/test/scala/org/apache/spark/util/LogKeySuite.scala index 11884c287b919..1f3c2d77d35f4 100644 --- a/common/utils/src/test/scala/org/apache/spark/util/LogKeySuite.scala +++ b/common/utils/src/test/scala/org/apache/spark/util/LogKeySuite.scala @@ -27,6 +27,7 @@ class LogKeySuite test("LogKey enumeration fields must be sorted alphabetically") { val keys = LogKey.values.toSeq - assert(keys === keys.sortBy(_.toString), "LogKey enumeration fields must be sorted alphabetically") + assert(keys === keys.sortBy(_.toString), + "LogKey enumeration fields must be sorted alphabetically") } }