Skip to content

Commit 6a0622e

Browse files
author
pgandhi
committed
[SPARK-21809] : Fixing scalastyle tests
1 parent d79eb80 commit 6a0622e

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

core/src/main/scala/org/apache/spark/status/AppStatusStore.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,8 @@ private[spark] class AppStatusStore(
421421
|| f.taskMetrics.get.shuffleWriteMetrics.bytesWritten.toString.contains(searchValue)
422422
|| f.taskMetrics.get.shuffleWriteMetrics.recordsWritten.toString.contains(searchValue)
423423
|| f.taskMetrics.get.shuffleWriteMetrics.writeTime.toString.contains(searchValue)
424-
|| f.schedulerDelay.toString.contains(searchValue) || f.gettingResultTime.toString.contains(searchValue)))
424+
|| f.schedulerDelay.toString.contains(searchValue)
425+
|| f.gettingResultTime.toString.contains(searchValue)))
425426
filteredTaskDataSequence
426427
}
427428

core/src/main/scala/org/apache/spark/status/api/v1/StagesResource.scala

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,10 @@ private[v1] class StagesResource extends BaseAppResource {
5555
ret(i).executorSummary.get.get(execId).get.hostPort = hostPort
5656
for (taskData <- taskDataArray) {
5757
ret(i).tasks.get.get(taskData).get.executorLogs = executorLogs
58-
ret(i).tasks.get.get(taskData).get.schedulerDelay = AppStatusUtils.schedulerDelay(ret(i).tasks.get.get(taskData).get)
59-
ret(i).tasks.get.get(taskData).get.gettingResultTime = AppStatusUtils.gettingResultTime(ret(i).tasks.get.get(taskData).get)
58+
ret(i).tasks.get.get(taskData).get.schedulerDelay =
59+
AppStatusUtils.schedulerDelay(ret(i).tasks.get.get(taskData).get)
60+
ret(i).tasks.get.get(taskData).get.gettingResultTime =
61+
AppStatusUtils.gettingResultTime(ret(i).tasks.get.get(taskData).get)
6062
}
6163
}
6264
}
@@ -125,14 +127,16 @@ private[v1] class StagesResource extends BaseAppResource {
125127
def taskTable(
126128
@PathParam("stageId") stageId: Int,
127129
@PathParam("stageAttemptId") stageAttemptId: Int,
128-
@QueryParam("details") @DefaultValue("true") details: Boolean, @Context uriInfo: UriInfo): util.HashMap[String, Object] = {
130+
@QueryParam("details") @DefaultValue("true") details: Boolean, @Context uriInfo: UriInfo):
131+
util.HashMap[String, Object] = {
129132
withUI { ui =>
130133
val uriQueryParameters = uriInfo.getQueryParameters(true)
131134
val totalRecords = uriQueryParameters.getFirst("numTasks")
132135
var isSearch = false
133136
var searchValue: String = null
134137
var _tasksToShow: Seq[TaskData] = null
135-
if (uriQueryParameters.getFirst("search[value]") != null && uriQueryParameters.getFirst("search[value]").length > 0) {
138+
if (uriQueryParameters.getFirst("search[value]") != null &&
139+
uriQueryParameters.getFirst("search[value]").length > 0) {
136140
_tasksToShow = ui.store.taskList(stageId, stageAttemptId, 0, totalRecords.toInt,
137141
indexName("Index"), true)
138142
isSearch = true
@@ -182,7 +186,8 @@ private[v1] class StagesResource extends BaseAppResource {
182186
}
183187

184188
// Performs pagination on the server side
185-
def doPagination(queryParameters: MultivaluedMap[String, String], stageId: Int, stageAttemptId: Int): Seq[TaskData] = {
189+
def doPagination(queryParameters: MultivaluedMap[String, String], stageId: Int, stageAttemptId: Int):
190+
Seq[TaskData] = {
186191
val queryParams = queryParameters.keySet()
187192
var columnToSort = 0
188193
if (queryParams.contains("order[0][column]")) {

0 commit comments

Comments
 (0)