Skip to content

[SPARK-10775][UI]add search keywords in history page ui #8885

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lianhuiwang wants to merge 10 commits into from
Closed

[SPARK-10775][UI]add search keywords in history page ui #8885

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5f5be5b
add search keywords in history page ui
lianhuiwang Sep 23, 2015
be373e9
Merge branch 'apache-master' into SPARK-10775
lianhuiwang Dec 16, 2015
bff49b8
rename Submit to Search
lianhuiwang Dec 16, 2015
12dc570
Merge branch 'apache/master' into spark-10775
lianhuiwang Dec 16, 2015
560de66
Revert "rename Submit to Search"
lianhuiwang Dec 16, 2015
b146c2d
fix minor style
lianhuiwang Dec 16, 2015
16965b6
update minor code
lianhuiwang Dec 16, 2015
abb6d58
Merge branch 'apache-master' into spark-10775-2
lianhuiwang Dec 17, 2015
28220a6
address sarutak's comments
lianhuiwang Dec 17, 2015
a3f6885
fix minor name
lianhuiwang Dec 17, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 31 additions & 12 deletions core/src/main/scala/org/apache/spark/deploy/history/HistoryPage.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,14 @@ private[history] class HistoryPage(parent: HistoryServer) extends WebUIPage("")
val requestedFirst = (requestedPage - 1) * pageSize
val requestedIncomplete =
Option(request.getParameter("showIncomplete")).getOrElse("false").toBoolean
val requestedQuery = Option(request.getParameter("query")).getOrElse("")

val allApps = parent.getApplicationList()
var allApps = parent.getApplicationList()
.filter(_.attempts.head.completed != requestedIncomplete)
if (!requestedQuery.equals("")) {
val query = requestedQuery.toLowerCase
allApps = allApps.filter(app => app.name.toLowerCase.contains(query))
}
val allAppsSize = allApps.size

val actualFirst = if (requestedFirst < allAppsSize) requestedFirst else 0
Expand Down Expand Up @@ -74,19 +79,27 @@ private[history] class HistoryPage(parent: HistoryServer) extends WebUIPage("")
// page, `...` will be displayed.
if (allAppsSize > 0) {
val leftSideIndices =
rangeIndices(actualPage - plusOrMinus until actualPage, 1 < _, requestedIncomplete)
rangeIndices(actualPage - plusOrMinus until actualPage, 1 < _, requestedIncomplete,
requestedQuery)
val rightSideIndices =
rangeIndices(actualPage + 1 to actualPage + plusOrMinus, _ < pageCount,
requestedIncomplete)
requestedIncomplete, requestedQuery)

<h4>
<form action="" method="GET">
Application Name: <input type="text" name="query" value={requestedQuery} />
<input type="hidden" name="showIncomplete" value={requestedIncomplete.toString} />
<input type="submit" value="Search" />
</form>
Showing {actualFirst + 1}-{last + 1} of {allAppsSize}
{if (requestedIncomplete) "(Incomplete applications)"}
<span style="float: right">
{
if (actualPage > 1) {
<a href={makePageLink(actualPage - 1, requestedIncomplete)}>&lt; </a>
<a href={makePageLink(1, requestedIncomplete)}>1</a>
<a href={makePageLink(actualPage - 1, requestedIncomplete, requestedQuery)}>
&lt;
</a>
<a href={makePageLink(1, requestedIncomplete, requestedQuery)}>1</a>
}
}
{if (actualPage - plusOrMinus > secondPageFromLeft) " ... "}
Expand All @@ -96,8 +109,12 @@ private[history] class HistoryPage(parent: HistoryServer) extends WebUIPage("")
{if (actualPage + plusOrMinus < secondPageFromRight) " ... "}
{
if (actualPage < pageCount) {
<a href={makePageLink(pageCount, requestedIncomplete)}>{pageCount}</a>
<a href={makePageLink(actualPage + 1, requestedIncomplete)}> &gt;</a>
<a href={makePageLink(pageCount, requestedIncomplete, requestedQuery)}>
{pageCount}
</a>
<a href={makePageLink(actualPage + 1, requestedIncomplete, requestedQuery)}>
&gt;
</a>
}
}
</span>
Expand All @@ -115,7 +132,7 @@ private[history] class HistoryPage(parent: HistoryServer) extends WebUIPage("")
</p>
}
}
<a href={makePageLink(actualPage, !requestedIncomplete)}>
<a href={makePageLink(actualPage, !requestedIncomplete, "")}>
{
if (requestedIncomplete) {
"Back to completed applications"
Expand Down Expand Up @@ -151,9 +168,10 @@ private[history] class HistoryPage(parent: HistoryServer) extends WebUIPage("")
private def rangeIndices(
range: Seq[Int],
condition: Int => Boolean,
showIncomplete: Boolean): Seq[Node] = {
showIncomplete: Boolean,
showQuery: String): Seq[Node] = {
range.filter(condition).map(nextPage =>
<a href={makePageLink(nextPage, showIncomplete)}> {nextPage} </a>)
<a href={makePageLink(nextPage, showIncomplete, showQuery)}> {nextPage} </a>)
}

private def attemptRow(
Expand Down Expand Up @@ -216,10 +234,11 @@ private[history] class HistoryPage(parent: HistoryServer) extends WebUIPage("")
info.attempts.drop(1).flatMap(attemptRow(true, info, _, false))
}

private def makePageLink(linkPage: Int, showIncomplete: Boolean): String = {
private def makePageLink(linkPage: Int, showIncomplete: Boolean, showQuery: String): String = {
UIUtils.prependBaseUri("/?" + Array(
"page=" + linkPage,
"showIncomplete=" + showIncomplete
"showIncomplete=" + showIncomplete,
"query=" + showQuery
).mkString("&"))
}
}