Skip to content

Commit 51b3d41

Browse files
committed
Revert "[SPARK-3454] separate json endpoints for data in the UI"
This reverts commit d497358. The commit broke Spark on Windows.
1 parent 1fd31ba commit 51b3d41

File tree

100 files changed

+172
-19946
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+172
-19946
lines changed

.rat-excludes

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,5 @@ logs
7474
.*scalastyle-output.xml
7575
.*dependency-reduced-pom.xml
7676
known_translations
77-
json_expectation
78-
local-1422981759269/*
79-
local-1422981780767/*
80-
local-1425081759269/*
81-
local-1426533911241/*
82-
local-1426633911242/*
83-
local-1427397477963/*
8477
DESCRIPTION
8578
NAMESPACE

core/pom.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -228,14 +228,6 @@
228228
<artifactId>json4s-jackson_${scala.binary.version}</artifactId>
229229
<version>3.2.10</version>
230230
</dependency>
231-
<dependency>
232-
<groupId>com.sun.jersey</groupId>
233-
<artifactId>jersey-server</artifactId>
234-
</dependency>
235-
<dependency>
236-
<groupId>com.sun.jersey</groupId>
237-
<artifactId>jersey-core</artifactId>
238-
</dependency>
239231
<dependency>
240232
<groupId>org.apache.mesos</groupId>
241233
<artifactId>mesos</artifactId>

core/src/main/java/org/apache/spark/JobExecutionStatus.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,9 @@
1717

1818
package org.apache.spark;
1919

20-
import org.apache.spark.util.EnumUtil;
21-
2220
public enum JobExecutionStatus {
2321
RUNNING,
2422
SUCCEEDED,
2523
FAILED,
26-
UNKNOWN;
27-
28-
public static JobExecutionStatus fromString(String str) {
29-
return EnumUtil.parseIgnoreCase(JobExecutionStatus.class, str);
30-
}
24+
UNKNOWN
3125
}

core/src/main/java/org/apache/spark/status/api/v1/ApplicationStatus.java

Lines changed: 0 additions & 30 deletions
This file was deleted.

core/src/main/java/org/apache/spark/status/api/v1/StageStatus.java

Lines changed: 0 additions & 31 deletions
This file was deleted.

core/src/main/java/org/apache/spark/status/api/v1/TaskSorting.java

Lines changed: 0 additions & 48 deletions
This file was deleted.

core/src/main/java/org/apache/spark/util/EnumUtil.java

Lines changed: 0 additions & 38 deletions
This file was deleted.

core/src/main/scala/org/apache/spark/SparkContext.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ class SparkContext(config: SparkConf) extends Logging with ExecutorAllocationCli
428428
_ui =
429429
if (conf.getBoolean("spark.ui.enabled", true)) {
430430
Some(SparkUI.createLiveUI(this, _conf, listenerBus, _jobProgressListener,
431-
_env.securityManager,appName, startTime = startTime))
431+
_env.securityManager,appName))
432432
} else {
433433
// For tests, do not enable the UI
434434
None

core/src/main/scala/org/apache/spark/annotation/Private.java

Lines changed: 0 additions & 41 deletions
This file was deleted.

core/src/main/scala/org/apache/spark/deploy/history/ApplicationHistoryProvider.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ package org.apache.spark.deploy.history
1919

2020
import org.apache.spark.ui.SparkUI
2121

22-
private[spark] case class ApplicationAttemptInfo(
22+
private[history] case class ApplicationAttemptInfo(
2323
attemptId: Option[String],
2424
startTime: Long,
2525
endTime: Long,
2626
lastUpdated: Long,
2727
sparkUser: String,
2828
completed: Boolean = false)
2929

30-
private[spark] case class ApplicationHistoryInfo(
30+
private[history] case class ApplicationHistoryInfo(
3131
id: String,
3232
name: String,
3333
attempts: List[ApplicationAttemptInfo])

0 commit comments

Comments
 (0)