Skip to content

[SPARK-29053][WEBUI][2.4] Sort does not work on some columns #25882

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

[SPARK-29053][WEBUI][2.4] Sort does not work on some columns #25882

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b1978d2
[SPARK-29053][WEBUI] Sort does not work on some columns
amanomer Sep 21, 2019
f788acf
Sorting fix in ThriftServerSessionPage.scala
amanomer Sep 22, 2019
52edb8d
Revert "Sorting fix in ThriftServerSessionPage.scala"
amanomer Sep 22, 2019
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
6 changes: 4 additions & 2 deletions ...iftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/ui/ThriftServerPage.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@ private[ui] class ThriftServerPage(parent: ThriftServerTab) extends WebUIPage(""
<td>{info.groupId}</td>
<td>{formatDate(info.startTimestamp)}</td>
<td>{if (info.finishTimestamp > 0) formatDate(info.finishTimestamp)}</td>
<td>{formatDurationOption(Some(info.totalTime))}</td>
<td sorttable_customkey={info.totalTime.toString}>
{formatDurationOption(Some(info.totalTime))}</td>
<td>{info.statement}</td>
<td>{info.state}</td>
{errorMessageCell(detail)}
Expand Down Expand Up @@ -155,7 +156,8 @@ private[ui] class ThriftServerPage(parent: ThriftServerTab) extends WebUIPage(""
<td> <a href={sessionLink}> {session.sessionId} </a> </td>
<td> {formatDate(session.startTimestamp)} </td>
<td> {if (session.finishTimestamp > 0) formatDate(session.finishTimestamp)} </td>
<td> {formatDurationOption(Some(session.totalTime))} </td>
<td sorttable_customkey={session.totalTime.toString}>
{formatDurationOption(Some(session.totalTime))} </td>
<td> {session.totalExecution.toString} </td>
</tr>
}
Expand Down
3 changes: 2 additions & 1 deletion ...er/src/main/scala/org/apache/spark/sql/hive/thriftserver/ui/ThriftServerSessionPage.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,8 @@ private[ui] class ThriftServerSessionPage(parent: ThriftServerTab)
<td>{info.groupId}</td>
<td>{formatDate(info.startTimestamp)}</td>
<td>{formatDate(info.finishTimestamp)}</td>
<td>{formatDurationOption(Some(info.totalTime))}</td>
Copy link
Member

@wangyum wangyum Sep 22, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

@srowen This change to backport SPARK-28599.
Or we should revert this change and make another PR to make it clear?

Copy link
Member

@srowen srowen Sep 22, 2019

Choose a reason for hiding this comment

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

I see, these are really duplicates? I would first merge #25892 then, but, hm, how is it not a merge conflict? I'm missing something.

My larger point was: does this actually mean you sort all of the entries when there are many pages of them? or just the current page?

Copy link
Member

@wangyum wangyum Sep 22, 2019

Choose a reason for hiding this comment

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

#25855 for ThriftServerPage, #25892 for ThriftServerSessionPage. We can support all pages in ThriftServerTab after this PR.

Copy link
Member

@srowen srowen Sep 22, 2019

Choose a reason for hiding this comment

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

Oh I see. Well, want to at least merge #25892 first and then include it here? we can back-port it separately, too.

Copy link
Member

@dongjoon-hyun dongjoon-hyun Sep 22, 2019

Choose a reason for hiding this comment

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

I'll review #25892 now and merge it soon. And, +1 for backporting separately.

Copy link
Contributor Author

@amanomer amanomer Sep 22, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

Ok. I have reverted my last commit and created another PR #25893 to back-port #25892 to branch-2.4.
Kindly review it

<td sorttable_customkey={info.totalTime.toString}>
{formatDurationOption(Some(info.totalTime))}</td>
<td>{info.statement}</td>
<td>{info.state}</td>
{errorMessageCell(detail)}
Expand Down