From 5d7407472f48303847ed2d71021546a00b26c48a Mon Sep 17 00:00:00 2001 From: guoxiaolongzte Date: Thu, 30 Mar 2017 20:25:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[SPARK-20157]In=20the=20menu=20=E2=80=98Sto?= =?UTF-8?q?rage=E2=80=99in=20Web=20UI,=20click=20the=20Go=20button,=20and?= =?UTF-8?q?=20shows=20no=20paging=20menu=20interface.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/src/main/scala/org/apache/spark/ui/PagedTable.scala | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/core/src/main/scala/org/apache/spark/ui/PagedTable.scala b/core/src/main/scala/org/apache/spark/ui/PagedTable.scala index 79974df2603fd..b6fc5957fc3c6 100644 --- a/core/src/main/scala/org/apache/spark/ui/PagedTable.scala +++ b/core/src/main/scala/org/apache/spark/ui/PagedTable.scala @@ -152,9 +152,7 @@ private[ui] trait PagedTable[T] { * }}} */ private[ui] def pageNavigation(page: Int, pageSize: Int, totalPages: Int): Seq[Node] = { - if (totalPages == 1) { - Nil - } else { + // A group includes all page numbers will be shown in the page navigation. // The size of group is 10 means there are 10 page numbers will be shown. // The first group is 1 to 10, the second is 2 to 20, and so on @@ -266,7 +264,6 @@ private[ui] trait PagedTable[T] { } - } /** * Return a link to jump to a page. From 254eec51b7f310ec773d967d14bfeeabd1f888a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=AD=E5=B0=8F=E9=BE=99=2010207633?= Date: Fri, 31 Mar 2017 12:08:29 +0800 Subject: [PATCH 2/2] [SPARK-20157]modify the unit test cases --- core/src/test/scala/org/apache/spark/ui/PagedTableSuite.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/test/scala/org/apache/spark/ui/PagedTableSuite.scala b/core/src/test/scala/org/apache/spark/ui/PagedTableSuite.scala index 74eeca282882a..405a9be31866d 100644 --- a/core/src/test/scala/org/apache/spark/ui/PagedTableSuite.scala +++ b/core/src/test/scala/org/apache/spark/ui/PagedTableSuite.scala @@ -73,7 +73,8 @@ class PagedTableSuite extends SparkFunSuite { override def goButtonFormPath: String = "" } - assert(pagedTable.pageNavigation(1, 10, 1) === Nil) + assert( + (pagedTable.pageNavigation(1, 10, 1).head \\ "li").map(_.text.trim) === Seq("1")) assert( (pagedTable.pageNavigation(1, 10, 2).head \\ "li").map(_.text.trim) === Seq("1", "2", ">")) assert(