pan3793 commented on code in PR #53192:
URL: https://github.com/apache/spark/pull/53192#discussion_r2558689617
##########
core/src/test/scala/org/apache/spark/util/UtilsSuite.scala:
##########
@@ -1132,37 +1131,35 @@ class UtilsSuite extends SparkFunSuite with
ResetSystemProperties with PrivateMe
test("ThreadInfoOrdering") {
val task1T = mock[ThreadInfo]
- doReturn(11L).when(task1T).getThreadId
- doReturn("Executor task launch worker for task 1.0 in stage 1.0 (TID 11)")
- .when(task1T).getThreadName
- doReturn("Executor task launch worker for task 1.0 in stage 1.0 (TID 11)")
- .when(task1T).toString
+ when(task1T.getThreadId).thenReturn(11L)
+ when(task1T.getThreadName)
+ .thenReturn("Executor task launch worker for task 1.0 in stage 1.0 (TID
11)")
+ when(task1T.toString)
+ .thenReturn("Executor task launch worker for task 1.0 in stage 1.0 (TID
11)")
val task2T = mock[ThreadInfo]
- doReturn(12L).when(task2T).getThreadId
- doReturn("Executor task launch worker for task 2.0 in stage 1.0 (TID 22)")
- .when(task2T).getThreadName
- doReturn("Executor task launch worker for task 2.0 in stage 1.0 (TID 22)")
- .when(task2T).toString
+ when(task2T.getThreadId).thenReturn(12L)
+ when(task2T.getThreadName)
+ .thenReturn("Executor task launch worker for task 2.0 in stage 1.0 (TID
22)")
+ when(task2T.toString)
+ .thenReturn("Executor task launch worker for task 2.0 in stage 1.0 (TID
22)")
val connectExecuteOp1T = mock[ThreadInfo]
- doReturn(21L).when(connectExecuteOp1T).getThreadId
-
doReturn("SparkConnectExecuteThread_opId=16148fb4-4189-43c3-b8d4-8b3b6ddd41c7")
- .when(connectExecuteOp1T).getThreadName
-
doReturn("SparkConnectExecuteThread_opId=16148fb4-4189-43c3-b8d4-8b3b6ddd41c7")
- .when(connectExecuteOp1T).toString
+ when(connectExecuteOp1T.getThreadId).thenReturn(21L)
+ when(connectExecuteOp1T.getThreadName)
+
.thenReturn("SparkConnectExecuteThread_opId=16148fb4-4189-43c3-b8d4-8b3b6ddd41c7")
+ when(connectExecuteOp1T.toString)
+
.thenReturn("SparkConnectExecuteThread_opId=16148fb4-4189-43c3-b8d4-8b3b6ddd41c7")
val connectExecuteOp2T = mock[ThreadInfo]
- doReturn(22L).when(connectExecuteOp2T).getThreadId
-
doReturn("SparkConnectExecuteThread_opId=4e4d1cac-ffde-46c1-b7c2-808b726cb47e")
- .when(connectExecuteOp2T).getThreadName
-
doReturn("SparkConnectExecuteThread_opId=4e4d1cac-ffde-46c1-b7c2-808b726cb47e")
- .when(connectExecuteOp2T).toString
-
- val threadInfoOrderingMethod =
- PrivateMethod[Ordering[ThreadInfo]](Symbol("threadInfoOrdering"))
+ when(connectExecuteOp2T.getThreadId).thenReturn(22L)
+ when(connectExecuteOp2T.getThreadName)
+
.thenReturn("SparkConnectExecuteThread_opId=4e4d1cac-ffde-46c1-b7c2-808b726cb47e")
+ when(connectExecuteOp2T.toString)
+
.thenReturn("SparkConnectExecuteThread_opId=4e4d1cac-ffde-46c1-b7c2-808b726cb47e")
+
val sorted = Seq(connectExecuteOp1T, connectExecuteOp2T, task1T, task2T)
- .sorted(Utils.invokePrivate(threadInfoOrderingMethod()))
+ .sorted(Utils.threadInfoOrdering)
Review Comment:
Hmm... this looks simple, but I was told to prefer using `invokePrivate` to
avoid exposing private methods/fields, not sure which is the best practice for
this case.
cc @LuciferYang for more inputs
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
