Skip to content

[SPARK-4329][WebUI] HistoryPage pagenation #3194

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
wants to merge 8 commits into from
Closed

[SPARK-4329][WebUI] HistoryPage pagenation #3194

Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cfa242b
Added index to HistoryPage
sarutak Nov 11, 2014
755a004
Merge branch 'master' of git://git.apache.org/spark into history-page…
sarutak Nov 11, 2014
ec7922e
Simplified code
sarutak Nov 12, 2014
b2240f8
Fixed style
sarutak Nov 12, 2014
76b05e3
Merge branch 'master' of git://git.apache.org/spark into history-page…
sarutak Nov 18, 2014
1c2f605
Merge branch 'master' of git://git.apache.org/spark into history-page…
sarutak Dec 1, 2014
c93932e
Merge branch 'master' of git://git.apache.org/spark into history-page…
sarutak Dec 10, 2014
15d3d2d
Simplified code
sarutak Dec 10, 2014
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
38 changes: 34 additions & 4 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 @@ -26,6 +26,7 @@ import org.apache.spark.ui.{WebUIPage, UIUtils}
private[spark] class HistoryPage(parent: HistoryServer) extends WebUIPage("") {

private val pageSize = 20
private val maxNumIndices = 2
Copy link
Contributor

@andrewor14 andrewor14 Dec 10, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would call this plusOrMinus


def render(request: HttpServletRequest): Seq[Node] = {
val requestedPage = Option(request.getParameter("page")).getOrElse("1").toInt
Expand All @@ -51,10 +52,7 @@ private[spark] class HistoryPage(parent: HistoryServer) extends WebUIPage("") {
if (allApps.size > 0) {
<h4>
Showing {actualFirst + 1}-{last + 1} of {allApps.size}
<span style="float: right">
{if (actualPage > 1) <a href={"/?page=" + (actualPage - 1)}>&lt;</a>}
{if (actualPage < pageCount) <a href={"/?page=" + (actualPage + 1)}>&gt;</a>}
</span>
{pageIndices(pageCount, actualPage)}
Copy link
Contributor

@andrewor14 andrewor14 Dec 10, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor, but I actually think this doesn't need to be in its own method. It's probably clearer if the HTML is in here directly. Right now it's not clear why it's floating right from first glance.

Copy link
Contributor

@andrewor14 andrewor14 Dec 10, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you also add some comment here that says something like

// This displays the indices of pages that are within `plusOrMinus` pages of the current page
// Regardless of where the current page is, this also links to the first and last page

</h4> ++
appTable
} else {
Expand All @@ -81,6 +79,38 @@ private[spark] class HistoryPage(parent: HistoryServer) extends WebUIPage("") {
"Spark User",
"Last Updated")

private def pageIndices(pageCount: Int, actualPage: Int): Seq[Node] = {

def rangeIndices(range: Seq[Int], condition: Int => Boolean): Seq[Node] = {
range.filter(condition).map(nextPage => <a href={"/?page=" + nextPage}> {nextPage} </a>)
}

val littlerSideIndices =
rangeIndices(actualPage - maxNumIndices until actualPage, 1 < _)
val greaterSideIndices =
rangeIndices(actualPage + 1 to actualPage + maxNumIndices, _ < pageCount)
Copy link
Contributor

@andrewor14 andrewor14 Dec 10, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These could just be leftSideIndices and rightSideIndices


<span style="float: right">
{
if (actualPage > 1) {
<a href={"/?page=" + (actualPage - 1)}>&lt; </a>
<a href={"/?page=1"}>1</a>
}
}
{if (actualPage - maxNumIndices > 2) " ... "}
Copy link
Contributor

@andrewor14 andrewor14 Dec 10, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the 2 here should be maxNumIndices right?

{littlerSideIndices}
{actualPage}
{greaterSideIndices}
{if (actualPage + maxNumIndices < pageCount - 1) " ... "}
{
if (actualPage < pageCount) {
<a href={"/?page=" + pageCount}>{pageCount}</a>
<a href={"/?page=" + (actualPage + 1)}> &gt;</a>
}
}
</span>
}

private def appRow(info: ApplicationHistoryInfo): Seq[Node] = {
val uiAddress = HistoryServer.UI_PATH_PREFIX + s"/${info.id}"
val startTime = UIUtils.formatDate(info.startTime)
Expand Down