Skip to content

Commit 672b12a

Browse files
author
pgandhi
committed
[SPARK-21809] : Addressing Reviews November 20, 2018
Changing searchValue from Option to String
1 parent b3e2370 commit 672b12a

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ private[v1] class StagesResource extends BaseAppResource {
117117
val uriQueryParameters = uriInfo.getQueryParameters(true)
118118
val totalRecords = uriQueryParameters.getFirst("numTasks")
119119
var isSearch = false
120-
var searchValue: Option[String] = None
120+
var searchValue: String = null
121121
var filteredRecords = totalRecords
122122
// The datatables client API sends a list of query parameters to the server which contain
123123
// information like the columns to be sorted, search value typed by the user in the search
@@ -126,15 +126,15 @@ private[v1] class StagesResource extends BaseAppResource {
126126
if (uriQueryParameters.getFirst("search[value]") != null &&
127127
uriQueryParameters.getFirst("search[value]").length > 0) {
128128
isSearch = true
129-
searchValue = Some(uriQueryParameters.getFirst("search[value]"))
129+
searchValue = uriQueryParameters.getFirst("search[value]")
130130
}
131131
val _tasksToShow: Seq[TaskData] = doPagination(uriQueryParameters, stageId, stageAttemptId,
132132
isSearch, totalRecords.toInt)
133133
val ret = new HashMap[String, Object]()
134134
if (_tasksToShow.nonEmpty) {
135135
// Performs server-side search based on input from user
136136
if (isSearch) {
137-
val filteredTaskList = filterTaskList(_tasksToShow, searchValue.get)
137+
val filteredTaskList = filterTaskList(_tasksToShow, searchValue)
138138
filteredRecords = filteredTaskList.length.toString
139139
if (filteredTaskList.length > 0) {
140140
val pageStartIndex = uriQueryParameters.getFirst("start").toInt

0 commit comments

Comments
 (0)