linhongliu-db commented on code in PR #39268:
URL: https://github.com/apache/spark/pull/39268#discussion_r1061142058
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/ui/AllExecutionsPage.scala:
##########
@@ -290,35 +330,112 @@ private[ui] class ExecutionPagedTable(
}
}
- <tr>
- <td>
- {executionUIData.executionId.toString}
- </td>
- <td>
- {descriptionCell(executionUIData)}
- </td>
- <td sorttable_customkey={submissionTime.toString}>
- {UIUtils.formatDate(submissionTime)}
- </td>
- <td sorttable_customkey={duration.toString}>
- {UIUtils.formatDuration(duration)}
- </td>
- {if (showRunningJobs) {
+ def executionLinks(executionData: Seq[Long]): Seq[Node] = {
+ val details = if (executionData.nonEmpty) {
+ val onClickScript =
"this.parentNode.parentNode.nextElementSibling.nextElementSibling" +
+ ".classList.toggle('collapsed')"
+ <span onclick={onClickScript} class="expand-details">
+ +details
+ </span>
+ } else {
+ Nil
+ }
+
+ <div>{
+ executionData.map { executionId =>
+ <a href={executionURL(executionId)}>[{executionId.toString}]</a>
+ }
+ }</div> ++ details
+ }
+
+ val baseRow: Seq[Node] = {
+ <tr>
<td>
- {jobLinks(executionTableRow.runningJobData)}
+ {executionUIData.executionId.toString}
</td>
- }}
- {if (showSucceededJobs) {
<td>
- {jobLinks(executionTableRow.completedJobData)}
+ {descriptionCell(executionUIData)}
</td>
- }}
- {if (showFailedJobs) {
- <td>
- {jobLinks(executionTableRow.failedJobData)}
+ <td sorttable_customkey={submissionTime.toString}>
+ {UIUtils.formatDate(submissionTime)}
</td>
- }}
- </tr>
+ <td sorttable_customkey={duration.toString}>
+ {UIUtils.formatDuration(duration)}
+ </td>
+ {if (showRunningJobs) {
+ <td>
+ {jobLinks(executionTableRow.runningJobData)}
+ </td>
+ }}
+ {if (showSucceededJobs) {
+ <td>
+ {jobLinks(executionTableRow.completedJobData)}
+ </td>
+ }}
+ {if (showFailedJobs) {
+ <td>
+ {jobLinks(executionTableRow.failedJobData)}
+ </td>
+ }}
+ {if (showSubExecutions) {
+ <td>
+
{executionLinks(executionTableRow.subExecutionData.map(_.executionUIData.executionId))}
+ </td>
+ }}
+ </tr>
+ }
+
+ val subRow: Seq[Node] = {if (executionTableRow.subExecutionData.nonEmpty) {
+ <tr></tr>
+ <tr class="sub-execution-list collapsed">
Review Comment:
done
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/ui/AllExecutionsPage.scala:
##########
@@ -290,35 +330,112 @@ private[ui] class ExecutionPagedTable(
}
}
- <tr>
- <td>
- {executionUIData.executionId.toString}
- </td>
- <td>
- {descriptionCell(executionUIData)}
- </td>
- <td sorttable_customkey={submissionTime.toString}>
- {UIUtils.formatDate(submissionTime)}
- </td>
- <td sorttable_customkey={duration.toString}>
- {UIUtils.formatDuration(duration)}
- </td>
- {if (showRunningJobs) {
+ def executionLinks(executionData: Seq[Long]): Seq[Node] = {
+ val details = if (executionData.nonEmpty) {
+ val onClickScript =
"this.parentNode.parentNode.nextElementSibling.nextElementSibling" +
+ ".classList.toggle('collapsed')"
+ <span onclick={onClickScript} class="expand-details">
+ +details
+ </span>
+ } else {
+ Nil
+ }
+
+ <div>{
+ executionData.map { executionId =>
+ <a href={executionURL(executionId)}>[{executionId.toString}]</a>
+ }
+ }</div> ++ details
+ }
+
+ val baseRow: Seq[Node] = {
+ <tr>
<td>
- {jobLinks(executionTableRow.runningJobData)}
+ {executionUIData.executionId.toString}
</td>
- }}
- {if (showSucceededJobs) {
<td>
- {jobLinks(executionTableRow.completedJobData)}
+ {descriptionCell(executionUIData)}
</td>
- }}
- {if (showFailedJobs) {
- <td>
- {jobLinks(executionTableRow.failedJobData)}
+ <td sorttable_customkey={submissionTime.toString}>
+ {UIUtils.formatDate(submissionTime)}
</td>
- }}
- </tr>
+ <td sorttable_customkey={duration.toString}>
+ {UIUtils.formatDuration(duration)}
+ </td>
+ {if (showRunningJobs) {
+ <td>
+ {jobLinks(executionTableRow.runningJobData)}
+ </td>
+ }}
+ {if (showSucceededJobs) {
+ <td>
+ {jobLinks(executionTableRow.completedJobData)}
+ </td>
+ }}
+ {if (showFailedJobs) {
+ <td>
+ {jobLinks(executionTableRow.failedJobData)}
+ </td>
+ }}
+ {if (showSubExecutions) {
+ <td>
+
{executionLinks(executionTableRow.subExecutionData.map(_.executionUIData.executionId))}
+ </td>
+ }}
+ </tr>
+ }
+
+ val subRow: Seq[Node] = {if (executionTableRow.subExecutionData.nonEmpty) {
+ <tr></tr>
+ <tr class="sub-execution-list collapsed">
+ <td></td>
+ <td colspan={s"${headerInfo.length - 1}"}>
+ <table class="table table-bordered table-sm
table-cell-width-limited">
+ <thead>
+ <tr>
+ {headerInfo.dropRight(1).map(info => <th>{info._1}</th>)}
+ </tr>
+ </thead>
+ <tbody>
+ {
+ executionTableRow.subExecutionData.map { rowData =>
Review Comment:
done by using the style 2
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
