Skip to content

Commit 8fa6829

Browse files
author
Andrew Or
committed
[SPARK-7371] [SPARK-7377] [SPARK-7408] DAG visualization addendum (#5729)
This is a follow-up patch for #5729. **[SPARK-7408]** Move as much style code from JS to CSS as possible **[SPARK-7377]** Fix JS error if a job / stage contains only one RDD **[SPARK-7371]** Decrease emphasis on RDD on stage page as requested by mateiz pwendell This patch also includes general code clean up. <img src="https://issues.apache.org/jira/secure/attachment/12730992/before-after.png" width="500px"></img> Author: Andrew Or <[email protected]> Closes #5954 from andrewor14/viz-emphasize-rdd and squashes the following commits: 3c0d4f0 [Andrew Or] Guard against JS error by rendering arrows only if needed f23e15b [Andrew Or] Merge branch 'master' of github.com:apache/spark into viz-emphasize-rdd 565801f [Andrew Or] Clean up code 9dab5f0 [Andrew Or] Move styling from JS to CSS + clean up code 107c0b6 [Andrew Or] Tweak background color, stroke width, font size etc. 1610c62 [Andrew Or] Implement cluster padding for stage page
1 parent 316a5c0 commit 8fa6829

File tree

5 files changed

+310
-177
lines changed

5 files changed

+310
-177
lines changed

core/src/main/resources/org/apache/spark/ui/static/dagre-d3.min.js

Lines changed: 8 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
#dag-viz-graph svg path {
19+
stroke: #444444;
20+
stroke-width: 1.5px;
21+
}
22+
23+
#dag-viz-graph svg g.cluster rect {
24+
stroke-width: 4px;
25+
stroke-opacity: 0.5;
26+
}
27+
28+
#dag-viz-graph svg g.node circle,
29+
#dag-viz-graph svg g.node rect {
30+
fill: #444444;
31+
}
32+
33+
#dag-viz-graph svg g.node.cached circle,
34+
#dag-viz-graph svg g.node.cached rect {
35+
fill: #FF0000;
36+
}
37+
38+
/* Job page specific styles */
39+
40+
#dag-viz-graph svg.job marker#marker-arrow path {
41+
fill: #444444;
42+
stroke-width: 0px;
43+
}
44+
45+
#dag-viz-graph svg.job g.cluster rect {
46+
fill: #FFFFFF;
47+
stroke: #AADFFF;
48+
}
49+
50+
#dag-viz-graph svg.job g.cluster[id*="stage"] rect {
51+
stroke: #FFDDEE;
52+
stroke-width: 6px;
53+
}
54+
55+
#dag-viz-graph svg.job g#cross-stage-edges path {
56+
fill: none;
57+
}
58+
59+
#dag-viz-graph svg.job g.cluster text {
60+
fill: #AAAAAA;
61+
}
62+
63+
/* Stage page specific styles */
64+
65+
#dag-viz-graph svg.stage g.cluster rect {
66+
fill: #F0F8FF;
67+
stroke: #AADFFF;
68+
}
69+
70+
#dag-viz-graph svg.stage g.cluster[id*="stage"] rect {
71+
fill: #FFFFFF;
72+
stroke: #FFDDEE;
73+
stroke-width: 6px;
74+
}
75+
76+
#dag-viz-graph svg.stage g.node g.label text tspan {
77+
fill: #FFFFFF;
78+
}
79+
80+
#dag-viz-graph svg.stage g.cluster text {
81+
fill: #444444;
82+
font-weight: bold;
83+
}

0 commit comments

Comments
 (0)