This is an automated email from the ASF dual-hosted git repository.
yao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new 304d6ac0564 [SPARK-44540][UI] Remove unused stylesheet and javascript
files of jsonFormatter
304d6ac0564 is described below
commit 304d6ac0564b2e3a5a27d6f5fab8b5bc66c900c9
Author: Kent Yao <[email protected]>
AuthorDate: Tue Jul 25 18:40:02 2023 +0800
[SPARK-44540][UI] Remove unused stylesheet and javascript files of
jsonFormatter
### What changes were proposed in this pull request?
This PR safely removes unused stylesheet and javascript files of
`jsonFormatter`
### Why are the changes needed?
Simplify css/js dependencies for UI
### Does this PR introduce _any_ user-facing change?
no
### How was this patch tested?
built and verified locally with UI
Closes #42145 from yaooqinn/SPARK-44540.
Authored-by: Kent Yao <[email protected]>
Signed-off-by: Kent Yao <[email protected]>
---
LICENSE | 1 -
LICENSE-binary | 1 -
.../main/resources/org/apache/spark/ui/static/jsonFormatter.min.css | 1 -
.../src/main/resources/org/apache/spark/ui/static/jsonFormatter.min.js | 1 -
core/src/main/scala/org/apache/spark/ui/UIUtils.scala | 3 ---
dev/.rat-excludes | 2 --
6 files changed, 9 deletions(-)
diff --git a/LICENSE b/LICENSE
index 012fdbca4c9..1735d3208f2 100644
--- a/LICENSE
+++ b/LICENSE
@@ -213,7 +213,6 @@ Apache Software Foundation License 2.0
common/network-common/src/main/java/org/apache/spark/network/util/LimitedInputStream.java
core/src/main/java/org/apache/spark/util/collection/TimSort.java
core/src/main/resources/org/apache/spark/ui/static/bootstrap*
-core/src/main/resources/org/apache/spark/ui/static/jsonFormatter*
core/src/main/resources/org/apache/spark/ui/static/vis*
docs/js/vendor/bootstrap.js
connector/spark-ganglia-lgpl/src/main/java/com/codahale/metrics/ganglia/GangliaReporter.java
diff --git a/LICENSE-binary b/LICENSE-binary
index 9472d28e509..05645977a0b 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -412,7 +412,6 @@ com.google.cloud.bigdataoss:gcs-connector
core/src/main/java/org/apache/spark/util/collection/TimSort.java
core/src/main/resources/org/apache/spark/ui/static/bootstrap*
-core/src/main/resources/org/apache/spark/ui/static/jsonFormatter*
core/src/main/resources/org/apache/spark/ui/static/vis*
docs/js/vendor/bootstrap.js
diff --git
a/core/src/main/resources/org/apache/spark/ui/static/jsonFormatter.min.css
b/core/src/main/resources/org/apache/spark/ui/static/jsonFormatter.min.css
deleted file mode 100755
index 37761dbbe74..00000000000
--- a/core/src/main/resources/org/apache/spark/ui/static/jsonFormatter.min.css
+++ /dev/null
@@ -1 +0,0 @@
-PRE.jsonFormatter-codeContainer{margin-top:0;margin-bottom:0}PRE.jsonFormatter-codeContainer
.jsonFormatter-objectBrace{color:#0a0;font-weight:bold}PRE.jsonFormatter-codeContainer
.jsonFormatter-arrayBrace{color:#03f;font-weight:bold}PRE.jsonFormatter-codeContainer
.jsonFormatter-propertyName{color:#c00;font-weight:bold}PRE.jsonFormatter-codeContainer
.jsonFormatter-string{color:#077}PRE.jsonFormatter-codeContainer
.jsonFormatter-number{color:#a0a}PRE.jsonFormatter-codeContainer .jsonFo [...]
\ No newline at end of file
diff --git
a/core/src/main/resources/org/apache/spark/ui/static/jsonFormatter.min.js
b/core/src/main/resources/org/apache/spark/ui/static/jsonFormatter.min.js
deleted file mode 100755
index aa86fa2a0c3..00000000000
--- a/core/src/main/resources/org/apache/spark/ui/static/jsonFormatter.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function($){$.fn.jsonFormatter=function(n){var _settings,u=new Date,r=new
RegExp,i=function(n,t,i){for(var r="",u=0;u<n&&!i;u++)r+=_settings.tab;return
t!=null&&t.length>0&&t.charAt(t.length-1)!="\n"&&(t=t+"\n"),r+t},f=function(n,t){for(var
r,u,f="",i=0;i<n;i++)f+=_settings.tab;for(r=t.toString().split("\n"),u="",i=0;i<r.length;i++)u+=(i==0?"":f)+r[i]+"\n";return
u},t=function(n,t,r,u,f,e){typeof
n=="string"&&(n=n.split("<").join("<").split(">").join(">"));var o="<span
class='"+e [...]
diff --git a/core/src/main/scala/org/apache/spark/ui/UIUtils.scala
b/core/src/main/scala/org/apache/spark/ui/UIUtils.scala
index 2921e5b01e0..286c0a16251 100644
--- a/core/src/main/scala/org/apache/spark/ui/UIUtils.scala
+++ b/core/src/main/scala/org/apache/spark/ui/UIUtils.scala
@@ -258,15 +258,12 @@ private[spark] object UIUtils extends Logging {
<link rel="stylesheet"
href={prependBaseUri(request,
"/static/dataTables.bootstrap4.1.13.5.min.css")}
type="text/css"/>
- <link rel="stylesheet"
- href={prependBaseUri(request, "/static/jsonFormatter.min.css")}
type="text/css"/>
<link rel="stylesheet"
href={prependBaseUri(request, "/static/webui-dataTables.css")}
type="text/css"/>
<script src={prependBaseUri(request,
"/static/jquery.dataTables.1.13.5.min.js")}></script>
<script src={prependBaseUri(request,
"/static/jquery.cookies.2.2.0.min.js")}></script>
<script src={prependBaseUri(request,
"/static/jquery.blockUI.min.js")}></script>
<script src={prependBaseUri(request,
"/static/dataTables.bootstrap4.1.13.5.min.js")}></script>
- <script src={prependBaseUri(request,
"/static/jsonFormatter.min.js")}></script>
<script src={prependBaseUri(request,
"/static/jquery.mustache.js")}></script>
}
diff --git a/dev/.rat-excludes b/dev/.rat-excludes
index 4bd41fac11e..16e0e3e30c9 100644
--- a/dev/.rat-excludes
+++ b/dev/.rat-excludes
@@ -42,8 +42,6 @@ jquery.blockUI.min.js
jquery.cookies.2.2.0.min.js
jquery.dataTables.*.min.js
jquery.mustache.js
-jsonFormatter.min.css
-jsonFormatter.min.js
.*\.avsc
.*\.txt
.*\.json
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
