More SQL test fixes

Author: jsoltren

sql/core/src/test/scala/org/apache/spark/sql/execution/ui/SQLListenerSuite.scala

@@ -155,23 +155,29 @@ class SQLListenerSuite extends SparkFunSuite with SharedSQLContext with JsonTest
     listener.onOtherEvent(SparkListenerDriverAccumUpdates(0, Seq((999L, 2L))))
     checkAnswer(listener.getExecutionMetrics(0), accumulatorUpdates.mapValues(_ * 2))
 
-    listener.onExecutorMetricsUpdate(SparkListenerExecutorMetricsUpdate("", null, Seq(
-      // (task id, stage id, stage attempt, accum updates)
-      (0L, 0, 0, createTaskMetrics(accumulatorUpdates).accumulators().map(makeInfo)),
-      (1L, 0, 0,
-        createTaskMetrics(accumulatorUpdates.mapValues(_ * 2)).accumulators().map(makeInfo))
-    )))
+    listener.onExecutorMetricsUpdate(SparkListenerExecutorMetricsUpdate(
+      "",
+      Seq(
+        // (task id, stage id, stage attempt, accum updates)
+        (0L, 0, 0, createTaskMetrics(accumulatorUpdates).accumulators().map(makeInfo)),
+        (1L, 0, 0,
+          createTaskMetrics(accumulatorUpdates.mapValues(_ * 2)).accumulators().map(makeInfo))),
+      None
+    ))
 
     checkAnswer(listener.getExecutionMetrics(0), accumulatorUpdates.mapValues(_ * 3))
 
     // Retrying a stage should reset the metrics
     listener.onStageSubmitted(SparkListenerStageSubmitted(createStageInfo(0, 1)))
 
-    listener.onExecutorMetricsUpdate(SparkListenerExecutorMetricsUpdate("", null, Seq(
-      // (task id, stage id, stage attempt, accum updates)
-      (0L, 0, 1, createTaskMetrics(accumulatorUpdates).accumulators().map(makeInfo)),
-      (1L, 0, 1, createTaskMetrics(accumulatorUpdates).accumulators().map(makeInfo))
-    )))
+    listener.onExecutorMetricsUpdate(SparkListenerExecutorMetricsUpdate(
+      "",
+      Seq(
+        // (task id, stage id, stage attempt, accum updates)
+        (0L, 0, 1, createTaskMetrics(accumulatorUpdates).accumulators().map(makeInfo)),
+        (1L, 0, 1, createTaskMetrics(accumulatorUpdates).accumulators().map(makeInfo))),
+      None
+    ))
 
     checkAnswer(listener.getExecutionMetrics(0), accumulatorUpdates.mapValues(_ * 2))
 
@@ -207,11 +213,14 @@ class SQLListenerSuite extends SparkFunSuite with SharedSQLContext with JsonTest
     // Summit a new stage
     listener.onStageSubmitted(SparkListenerStageSubmitted(createStageInfo(1, 0)))
 
-    listener.onExecutorMetricsUpdate(SparkListenerExecutorMetricsUpdate("", null, Seq(
-      // (task id, stage id, stage attempt, accum updates)
-      (0L, 1, 0, createTaskMetrics(accumulatorUpdates).accumulators().map(makeInfo)),
-      (1L, 1, 0, createTaskMetrics(accumulatorUpdates).accumulators().map(makeInfo))
-    )))
+    listener.onExecutorMetricsUpdate(SparkListenerExecutorMetricsUpdate(
+      "",
+      Seq(
+        // (task id, stage id, stage attempt, accum updates)
+        (0L, 1, 0, createTaskMetrics(accumulatorUpdates).accumulators().map(makeInfo)),
+        (1L, 1, 0, createTaskMetrics(accumulatorUpdates).accumulators().map(makeInfo))),
+      None
+    ))
 
     checkAnswer(listener.getExecutionMetrics(0), accumulatorUpdates.mapValues(_ * 7))