This is an automated email from the ASF dual-hosted git repository.
sarutak pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new bc6f673 [SPARK-31420][WEBUI][FOLLOWUP] Make locale of timeline-view
'en'
bc6f673 is described below
commit bc6f673da4b36616614c23d8fa69a8e420b966c2
Author: Kousuke Saruta <saru...@oss.nttdata.com>
AuthorDate: Fri Apr 17 02:31:08 2020 +0900
[SPARK-31420][WEBUI][FOLLOWUP] Make locale of timeline-view 'en'
<!--
Thanks for sending a pull request! Here are some tips for you:
1. If this is your first time, please read our contributor guidelines:
https://spark.apache.org/contributing.html
2. Ensure you have added or run the appropriate tests for your PR:
https://spark.apache.org/developer-tools.html
3. If the PR is unfinished, add '[WIP]' in your PR title, e.g.,
'[WIP][SPARK-XXXX] Your PR title ...'.
4. Be sure to keep the PR description updated to reflect all changes.
5. Please write your PR title to summarize what this PR proposes.
6. If possible, provide a concise example to reproduce the issue for a
faster review.
7. If you want to add a new configuration, please read the guideline
first for naming configurations in
'core/src/main/scala/org/apache/spark/internal/config/ConfigEntry.scala'.
-->
### What changes were proposed in this pull request?
<!--
Please clarify what changes you are proposing. The purpose of this section
is to outline the changes and how this PR fixes the issue.
If possible, please consider writing useful notes for better and faster
reviews in your PR. See the examples below.
1. If you refactor some codes with changing classes, showing the class
hierarchy will help reviewers.
2. If you fix some SQL features, you can provide some references of other
DBMSes.
3. If there is design documentation, please add the link.
4. If there is a discussion in the mailing list, please add the link.
-->
This change explicitly set locale of timeline view to 'en' to be the same
appearance as before upgrading vis-timeline.
### Why are the changes needed?
<!--
Please clarify why the changes are needed. For instance,
1. If you propose a new API, clarify the use case for a new API.
2. If you fix a bug, you can clarify why it is a bug.
-->
We upgraded vis-timeline in #28192 and the upgraded version is different
from before we used in the notation of dates.
The notation seems to be dependent on locale. The following is appearance
in my Japanese environment.
<img width="557" alt="locale-changed"
src="https://user-images.githubusercontent.com/4736016/79265314-de886700-7ed0-11ea-8641-fa76b993c0d9.png";>
Although the notation is in Japanese, the default format is a little bit
unnatural (e.g. 4月9日 05:39 is natural rather than 9 四月 05:39).
I found we can get the same appearance as before by explicitly set locale
to 'en'.
### Does this PR introduce any user-facing change?
<!--
If yes, please clarify the previous behavior and the change this PR
proposes - provide the console output, description and/or an example to show
the behavior difference if possible.
If no, write 'No'.
-->
No.
### How was this patch tested?
<!--
If tests were added, say they were added here. Please make sure to add some
test cases that check the changes thoroughly including negative and positive
cases if possible.
If it was tested in a way different from regular unit tests, please clarify
how you tested step by step, ideally copy and paste-able, so that other
reviewers can test and check, and descendants can verify in the future.
If tests were not added, please describe why they were not added and/or why
it was difficult to add.
-->
I visited JobsPage, JobPage and StagePage and confirm that timeline view
shows dates with 'en' locale.
<img width="735" alt="fix-date-appearance"
src="https://user-images.githubusercontent.com/4736016/79267107-8bfc7a00-7ed3-11ea-8a25-f6681d04a83c.png";>
NOTE: #28192 will be backported to branch-2.4 and branch-3.0 so this PR
should be follow #28214 and #28213 .
Closes #28218 from sarutak/fix-locale-issue.
Authored-by: Kousuke Saruta <saru...@oss.nttdata.com>
Signed-off-by: Kousuke Saruta <saru...@oss.nttdata.com>
(cherry picked from commit df27350142d81a3e8941939870bfc0ab50e37a43)
Signed-off-by: Kousuke Saruta <saru...@oss.nttdata.com>
---
core/src/main/resources/org/apache/spark/ui/static/timeline-view.js | 3 +++
1 file changed, 3 insertions(+)
diff --git
a/core/src/main/resources/org/apache/spark/ui/static/timeline-view.js
b/core/src/main/resources/org/apache/spark/ui/static/timeline-view.js
index a63ee86..5be8cff 100644
--- a/core/src/main/resources/org/apache/spark/ui/static/timeline-view.js
+++ b/core/src/main/resources/org/apache/spark/ui/static/timeline-view.js
@@ -28,6 +28,7 @@ function drawApplicationTimeline(groupArray, eventObjArray,
startTime, offset) {
showCurrentTime: false,
start: startTime,
zoomable: false,
+ locale: "en",
moment: function (date) {
return vis.moment(date).utcOffset(offset);
}
@@ -110,6 +111,7 @@ function drawJobTimeline(groupArray, eventObjArray,
startTime, offset) {
showCurrentTime: false,
start: startTime,
zoomable: false,
+ locale: "en",
moment: function (date) {
return vis.moment(date).utcOffset(offset);
}
@@ -194,6 +196,7 @@ function drawTaskAssignmentTimeline(groupArray,
eventObjArray, minLaunchTime, ma
start: minLaunchTime,
end: maxFinishTime,
zoomable: false,
+ locale: "en",
moment: function (date) {
return vis.moment(date).utcOffset(offset);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
![https://user-images.githubusercontent.com/4736016/79265314-de886700-7ed0-11ea-8641-fa76b993c0d9.png"](https://user-images.githubusercontent.com/4736016/79265314-de886700-7ed0-11ea-8641-fa76b993c0d9.png"){kind=link}
![https://user-images.githubusercontent.com/4736016/79267107-8bfc7a00-7ed3-11ea-8a25-f6681d04a83c.png"](https://user-images.githubusercontent.com/4736016/79267107-8bfc7a00-7ed3-11ea-8a25-f6681d04a83c.png"){kind=link}