[SPARK-8171] [Web UI] Javascript based infinite scrolling for the log page #10910
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,129 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| var baseParams; | ||
|
|
||
| var curLogLength; | ||
| var startByte; | ||
| var endByte; | ||
| var totalLogLength; | ||
|
|
||
| var byteLength; | ||
|
|
||
| function setLogScroll(oldHeight) { | ||
| var logContent = $(".log-content"); | ||
| logContent.scrollTop(logContent[0].scrollHeight - oldHeight); | ||
| } | ||
|
|
||
| function tailLog() { | ||
| var logContent = $(".log-content"); | ||
| logContent.scrollTop(logContent[0].scrollHeight); | ||
| } | ||
|
Member
There was a problem hiding this comment. It's not good to repeat a query for the same dom-objects like |
||
|
|
||
| function setLogData() { | ||
| $('#log-data').html("Showing " + curLogLength + " Bytes: " + startByte | ||
| + " - " + endByte + " of " + totalLogLength); | ||
| } | ||
|
|
||
| function disableMoreButton() { | ||
| var moreBtn = $(".log-more-btn"); | ||
| moreBtn.attr("disabled", "disabled"); | ||
| moreBtn.html("Top of Log"); | ||
| } | ||
|
|
||
| function noNewAlert() { | ||
| var alert = $(".no-new-alert"); | ||
| alert.css("display", "block"); | ||
| window.setTimeout(function () {alert.css("display", "none");}, 4000); | ||
| } | ||
|
|
||
| function loadMore() { | ||
| var offset = Math.max(startByte - byteLength, 0); | ||
| var moreByteLength = Math.min(byteLength, startByte); | ||
|
|
||
| $.ajax({ | ||
| type: "GET", | ||
| url: "/log" + baseParams + "&offset=" + offset + "&byteLength=" + moreByteLength, | ||
| success: function (data) { | ||
| var oldHeight = $(".log-content")[0].scrollHeight; | ||
| var newlineIndex = data.indexOf('\n'); | ||
| var dataInfo = data.substring(0, newlineIndex).match(/\d+/g); | ||
| var retStartByte = dataInfo[0]; | ||
| var retLogLength = dataInfo[2]; | ||
|
|
||
| var cleanData = data.substring(newlineIndex + 1); | ||
| if (retStartByte == 0) { | ||
| disableMoreButton(); | ||
| } | ||
| $("pre", ".log-content").prepend(cleanData); | ||
|
|
||
| curLogLength = curLogLength + (startByte - retStartByte); | ||
| startByte = retStartByte; | ||
| totalLogLength = retLogLength; | ||
| setLogScroll(oldHeight); | ||
| setLogData(); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| function loadNew() { | ||
| $.ajax({ | ||
| type: "GET", | ||
| url: "/log" + baseParams + "&byteLength=0", | ||
| success: function (data) { | ||
|
Member
There was a problem hiding this comment. All we need to do here is to check whether the log size is bigger. So, can we somehow check it without receiving the first 100 KB of the log?
Member
Author
There was a problem hiding this comment. I've added |
||
| var dataInfo = data.substring(0, data.indexOf('\n')).match(/\d+/g); | ||
| var newDataLen = dataInfo[2] - totalLogLength; | ||
| if (newDataLen != 0) { | ||
| $.ajax({ | ||
| type: "GET", | ||
| url: "/log" + baseParams + "&byteLength=" + newDataLen, | ||
| success: function (data) { | ||
| var newlineIndex = data.indexOf('\n'); | ||
| var dataInfo = data.substring(0, newlineIndex).match(/\d+/g); | ||
| var retStartByte = dataInfo[0]; | ||
| var retEndByte = dataInfo[1]; | ||
| var retLogLength = dataInfo[2]; | ||
|
|
||
| var cleanData = data.substring(newlineIndex + 1); | ||
| $("pre", ".log-content").append(cleanData); | ||
|
|
||
| curLogLength = curLogLength + (retEndByte - retStartByte); | ||
| endByte = retEndByte; | ||
| totalLogLength = retLogLength; | ||
| tailLog(); | ||
| setLogData(); | ||
| } | ||
| }); | ||
| } else { | ||
| noNewAlert(); | ||
| } | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| function initLogPage(params, logLen, start, end, totLogLen, defaultLen) { | ||
| baseParams = params; | ||
| curLogLength = logLen; | ||
| startByte = start; | ||
| endByte = end; | ||
| totalLogLength = totLogLen; | ||
| byteLength = defaultLen; | ||
| tailLog(); | ||
| if (startByte == 0) { | ||
| disableMoreButton(); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's better to append
;to all the variable declarations above.Also, I think
btnHehgitis not used anywhere.