This is an automated email from the ASF dual-hosted git repository.
sarutak 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 7a65a3d4dbdb [SPARK-55927][WEBUI] Remove `jquery.mustache.js`
7a65a3d4dbdb is described below
commit 7a65a3d4dbdb216de5fe8cb871e36b8e83f1053f
Author: Kousuke Saruta <[email protected]>
AuthorDate: Wed Mar 11 08:21:58 2026 +0900
[SPARK-55927][WEBUI] Remove `jquery.mustache.js`
### What changes were proposed in this pull request?
This PR aims to remove `jquery.mustache.js`.
As of SPARK-34123, row rendering is migrated to `DataTables` and Mustache
syntax is effectively no longer used.
### Why are the changes needed?
Code cleanup.
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
Add new tests which ensure table structures are as expected.
### Was this patch authored or co-authored using generative AI tooling?
Kiro CLI / Opus 4.6
Closes #54719 from sarutak/remove-mustache.
Authored-by: Kousuke Saruta <[email protected]>
Signed-off-by: Kousuke Saruta <[email protected]>
---
.../org/apache/spark/ui/static/executorspage.js | 5 +-
.../spark/ui/static/historypage-template.html | 4 -
.../org/apache/spark/ui/static/historypage.js | 11 +-
.../org/apache/spark/ui/static/jquery.mustache.js | 682 ---------------------
.../org/apache/spark/ui/static/stagepage.js | 4 +-
.../main/scala/org/apache/spark/ui/UIUtils.scala | 1 -
dev/.rat-excludes | 1 -
licenses-binary/LICENSE-mustache.txt | 11 -
licenses/LICENSE-mustache.txt | 11 -
ui-test/tests/table-structure.test.js | 129 ++++
10 files changed, 135 insertions(+), 724 deletions(-)
diff --git
a/core/src/main/resources/org/apache/spark/ui/static/executorspage.js
b/core/src/main/resources/org/apache/spark/ui/static/executorspage.js
index b6de9297fdae..a10d7fe2a703 100644
--- a/core/src/main/resources/org/apache/spark/ui/static/executorspage.js
+++ b/core/src/main/resources/org/apache/spark/ui/static/executorspage.js
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-/* global $, Mustache, sorttable */
+/* global $, sorttable */
import {
createRESTEndPointForExecutorsPage,
createRESTEndPointForMiscellaneousProcess, createTemplateURI,
@@ -567,10 +567,9 @@ $(document).ready(function () {
"allTotalExcluded": deadTotalExcluded
};
- var data = {executors: response, "execSummary": [activeSummary,
deadSummary, totalSummary]};
$.get(createTemplateURI(appId, "executorspage"), function (template) {
-
executorsSummary.append(Mustache.render($(template).filter("#executors-summary-template").html(),
data));
+
executorsSummary.append($(template).filter("#executors-summary-template").html());
var selector = "#active-executors-table";
var conf = {
"data": response,
diff --git
a/core/src/main/resources/org/apache/spark/ui/static/historypage-template.html
b/core/src/main/resources/org/apache/spark/ui/static/historypage-template.html
index fd9003c4f91b..a9d147c8e052 100644
---
a/core/src/main/resources/org/apache/spark/ui/static/historypage-template.html
+++
b/core/src/main/resources/org/apache/spark/ui/static/historypage-template.html
@@ -47,19 +47,16 @@
Log Source
</span>
</th>
- {{#hasMultipleAttempts}}
<th>
<span data-bs-toggle="tooltip" title="The attempt ID of this
application since one application might be launched several times">
Attempt ID
</span>
</th>
- {{/hasMultipleAttempts}}
<th>
<span data-bs-toggle="tooltip" title="Started time of this
application.">
Started
</span>
</th>
- {{#showCompletedColumns}}
<th>
<span data-bs-toggle="tooltip" title="The completed time of this
application.">
Completed
@@ -70,7 +67,6 @@
Duration
</span>
</th>
- {{/showCompletedColumns}}
<th>
<span data-bs-toggle="tooltip" title="The Spark user of this
application">
Spark User
diff --git a/core/src/main/resources/org/apache/spark/ui/static/historypage.js
b/core/src/main/resources/org/apache/spark/ui/static/historypage.js
index 80d9ba050645..f5dd5a0ab763 100644
--- a/core/src/main/resources/org/apache/spark/ui/static/historypage.js
+++ b/core/src/main/resources/org/apache/spark/ui/static/historypage.js
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-/* global $, Mustache, jQuery, uiRoot */
+/* global $, jQuery, uiRoot */
import {formatDuration, formatTimeMillis, stringAbbreviate} from "./utils.js";
@@ -173,17 +173,10 @@ $(document).ready(function() {
$.fn.dataTable.defaults.paging = false;
}
- var data = {
- "uiroot": uiRoot,
- "applications": array,
- "hasMultipleAttempts": hasMultipleAttempts,
- "showCompletedColumns": !requestedIncomplete,
- };
-
$.get(uiRoot + "/static/historypage-template.html", function(template) {
var sibling = historySummary.prev();
historySummary.detach();
- var apps =
$(Mustache.render($(template).filter("#history-summary-template").html(),data));
+ var apps = $($(template).filter("#history-summary-template").html());
var attemptIdColumnName = 'attemptId';
var startedColumnName = 'started';
var completedColumnName = 'completed';
diff --git
a/core/src/main/resources/org/apache/spark/ui/static/jquery.mustache.js
b/core/src/main/resources/org/apache/spark/ui/static/jquery.mustache.js
deleted file mode 100644
index 68631dee5360..000000000000
--- a/core/src/main/resources/org/apache/spark/ui/static/jquery.mustache.js
+++ /dev/null
@@ -1,682 +0,0 @@
-/*!
- * mustache.js - Logic-less {{mustache}} templates with JavaScript
- * http://github.com/janl/mustache.js
- */
-
-/*global define: false Mustache: true*/
-
-(function defineMustache (global, factory) {
- if (typeof exports === 'object' && exports && typeof exports.nodeName !==
'string') {
- factory(exports); // CommonJS
- } else if (typeof define === 'function' && define.amd) {
- define(['exports'], factory); // AMD
- } else {
- global.Mustache = {};
- factory(global.Mustache); // script, wsh, asp
- }
-}(this, function mustacheFactory (mustache) {
-
- var objectToString = Object.prototype.toString;
- var isArray = Array.isArray || function isArrayPolyfill (object) {
- return objectToString.call(object) === '[object Array]';
- };
-
- function isFunction (object) {
- return typeof object === 'function';
- }
-
- /**
- * More correct typeof string handling array
- * which normally returns typeof 'object'
- */
- function typeStr (obj) {
- return isArray(obj) ? 'array' : typeof obj;
- }
-
- function escapeRegExp (string) {
- return string.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, '\\$&');
- }
-
- /**
- * Null safe way of checking whether or not an object,
- * including its prototype, has a given property
- */
- function hasProperty (obj, propName) {
- return obj != null && typeof obj === 'object' && (propName in obj);
- }
-
- /**
- * Safe way of detecting whether or not the given thing is a primitive and
- * whether it has the given property
- */
- function primitiveHasOwnProperty (primitive, propName) {
- return (
- primitive != null
- && typeof primitive !== 'object'
- && primitive.hasOwnProperty
- && primitive.hasOwnProperty(propName)
- );
- }
-
- // Workaround for https://issues.apache.org/jira/browse/COUCHDB-577
- // See https://github.com/janl/mustache.js/issues/189
- var regExpTest = RegExp.prototype.test;
- function testRegExp (re, string) {
- return regExpTest.call(re, string);
- }
-
- var nonSpaceRe = /\S/;
- function isWhitespace (string) {
- return !testRegExp(nonSpaceRe, string);
- }
-
- var entityMap = {
- '&': '&',
- '<': '<',
- '>': '>',
- '"': '"',
- "'": ''',
- '/': '/',
- '`': '`',
- '=': '='
- };
-
- function escapeHtml (string) {
- return String(string).replace(/[&<>"'`=\/]/g, function fromEntityMap (s) {
- return entityMap[s];
- });
- }
-
- var whiteRe = /\s*/;
- var spaceRe = /\s+/;
- var equalsRe = /\s*=/;
- var curlyRe = /\s*\}/;
- var tagRe = /#|\^|\/|>|\{|&|=|!/;
-
- /**
- * Breaks up the given `template` string into a tree of tokens. If the `tags`
- * argument is given here it must be an array with two string values: the
- * opening and closing tags used in the template (e.g. [ "<%", "%>" ]). Of
- * course, the default is to use mustaches (i.e. mustache.tags).
- *
- * A token is an array with at least 4 elements. The first element is the
- * mustache symbol that was used inside the tag, e.g. "#" or "&". If the tag
- * did not contain a symbol (i.e. {{myValue}}) this element is "name". For
- * all text that appears outside a symbol this element is "text".
- *
- * The second element of a token is its "value". For mustache tags this is
- * whatever else was inside the tag besides the opening symbol. For text
tokens
- * this is the text itself.
- *
- * The third and fourth elements of the token are the start and end indices,
- * respectively, of the token in the original template.
- *
- * Tokens that are the root node of a subtree contain two more elements: 1)
an
- * array of tokens in the subtree and 2) the index in the original template
at
- * which the closing tag for that section begins.
- */
- function parseTemplate (template, tags) {
- if (!template)
- return [];
-
- var sections = []; // Stack to hold section tokens
- var tokens = []; // Buffer to hold the tokens
- var spaces = []; // Indices of whitespace tokens on the current line
- var hasTag = false; // Is there a {{tag}} on the current line?
- var nonSpace = false; // Is there a non-space char on the current line?
-
- // Strips all whitespace tokens array for the current line
- // if there was a {{#tag}} on it and otherwise only space.
- function stripSpace () {
- if (hasTag && !nonSpace) {
- while (spaces.length)
- delete tokens[spaces.pop()];
- } else {
- spaces = [];
- }
-
- hasTag = false;
- nonSpace = false;
- }
-
- var openingTagRe, closingTagRe, closingCurlyRe;
- function compileTags (tagsToCompile) {
- if (typeof tagsToCompile === 'string')
- tagsToCompile = tagsToCompile.split(spaceRe, 2);
-
- if (!isArray(tagsToCompile) || tagsToCompile.length !== 2)
- throw new Error('Invalid tags: ' + tagsToCompile);
-
- openingTagRe = new RegExp(escapeRegExp(tagsToCompile[0]) + '\\s*');
- closingTagRe = new RegExp('\\s*' + escapeRegExp(tagsToCompile[1]));
- closingCurlyRe = new RegExp('\\s*' + escapeRegExp('}' +
tagsToCompile[1]));
- }
-
- compileTags(tags || mustache.tags);
-
- var scanner = new Scanner(template);
-
- var start, type, value, chr, token, openSection;
- while (!scanner.eos()) {
- start = scanner.pos;
-
- // Match any text between tags.
- value = scanner.scanUntil(openingTagRe);
-
- if (value) {
- for (var i = 0, valueLength = value.length; i < valueLength; ++i) {
- chr = value.charAt(i);
-
- if (isWhitespace(chr)) {
- spaces.push(tokens.length);
- } else {
- nonSpace = true;
- }
-
- tokens.push([ 'text', chr, start, start + 1 ]);
- start += 1;
-
- // Check for whitespace on the current line.
- if (chr === '\n')
- stripSpace();
- }
- }
-
- // Match the opening tag.
- if (!scanner.scan(openingTagRe))
- break;
-
- hasTag = true;
-
- // Get the tag type.
- type = scanner.scan(tagRe) || 'name';
- scanner.scan(whiteRe);
-
- // Get the tag value.
- if (type === '=') {
- value = scanner.scanUntil(equalsRe);
- scanner.scan(equalsRe);
- scanner.scanUntil(closingTagRe);
- } else if (type === '{') {
- value = scanner.scanUntil(closingCurlyRe);
- scanner.scan(curlyRe);
- scanner.scanUntil(closingTagRe);
- type = '&';
- } else {
- value = scanner.scanUntil(closingTagRe);
- }
-
- // Match the closing tag.
- if (!scanner.scan(closingTagRe))
- throw new Error('Unclosed tag at ' + scanner.pos);
-
- token = [ type, value, start, scanner.pos ];
- tokens.push(token);
-
- if (type === '#' || type === '^') {
- sections.push(token);
- } else if (type === '/') {
- // Check section nesting.
- openSection = sections.pop();
-
- if (!openSection)
- throw new Error('Unopened section "' + value + '" at ' + start);
-
- if (openSection[1] !== value)
- throw new Error('Unclosed section "' + openSection[1] + '" at ' +
start);
- } else if (type === 'name' || type === '{' || type === '&') {
- nonSpace = true;
- } else if (type === '=') {
- // Set the tags for the next time around.
- compileTags(value);
- }
- }
-
- // Make sure there are no open sections when we're done.
- openSection = sections.pop();
-
- if (openSection)
- throw new Error('Unclosed section "' + openSection[1] + '" at ' +
scanner.pos);
-
- return nestTokens(squashTokens(tokens));
- }
-
- /**
- * Combines the values of consecutive text tokens in the given `tokens` array
- * to a single token.
- */
- function squashTokens (tokens) {
- var squashedTokens = [];
-
- var token, lastToken;
- for (var i = 0, numTokens = tokens.length; i < numTokens; ++i) {
- token = tokens[i];
-
- if (token) {
- if (token[0] === 'text' && lastToken && lastToken[0] === 'text') {
- lastToken[1] += token[1];
- lastToken[3] = token[3];
- } else {
- squashedTokens.push(token);
- lastToken = token;
- }
- }
- }
-
- return squashedTokens;
- }
-
- /**
- * Forms the given array of `tokens` into a nested tree structure where
- * tokens that represent a section have two additional items: 1) an array of
- * all tokens that appear in that section and 2) the index in the original
- * template that represents the end of that section.
- */
- function nestTokens (tokens) {
- var nestedTokens = [];
- var collector = nestedTokens;
- var sections = [];
-
- var token, section;
- for (var i = 0, numTokens = tokens.length; i < numTokens; ++i) {
- token = tokens[i];
-
- switch (token[0]) {
- case '#':
- case '^':
- collector.push(token);
- sections.push(token);
- collector = token[4] = [];
- break;
- case '/':
- section = sections.pop();
- section[5] = token[2];
- collector = sections.length > 0 ? sections[sections.length - 1][4] :
nestedTokens;
- break;
- default:
- collector.push(token);
- }
- }
-
- return nestedTokens;
- }
-
- /**
- * A simple string scanner that is used by the template parser to find
- * tokens in template strings.
- */
- function Scanner (string) {
- this.string = string;
- this.tail = string;
- this.pos = 0;
- }
-
- /**
- * Returns `true` if the tail is empty (end of string).
- */
- Scanner.prototype.eos = function eos () {
- return this.tail === '';
- };
-
- /**
- * Tries to match the given regular expression at the current position.
- * Returns the matched text if it can match, the empty string otherwise.
- */
- Scanner.prototype.scan = function scan (re) {
- var match = this.tail.match(re);
-
- if (!match || match.index !== 0)
- return '';
-
- var string = match[0];
-
- this.tail = this.tail.substring(string.length);
- this.pos += string.length;
-
- return string;
- };
-
- /**
- * Skips all text until the given regular expression can be matched. Returns
- * the skipped string, which is the entire tail if no match can be made.
- */
- Scanner.prototype.scanUntil = function scanUntil (re) {
- var index = this.tail.search(re), match;
-
- switch (index) {
- case -1:
- match = this.tail;
- this.tail = '';
- break;
- case 0:
- match = '';
- break;
- default:
- match = this.tail.substring(0, index);
- this.tail = this.tail.substring(index);
- }
-
- this.pos += match.length;
-
- return match;
- };
-
- /**
- * Represents a rendering context by wrapping a view object and
- * maintaining a reference to the parent context.
- */
- function Context (view, parentContext) {
- this.view = view;
- this.cache = { '.': this.view };
- this.parent = parentContext;
- }
-
- /**
- * Creates a new context using the given view with this context
- * as the parent.
- */
- Context.prototype.push = function push (view) {
- return new Context(view, this);
- };
-
- /**
- * Returns the value of the given name in this context, traversing
- * up the context hierarchy if the value is absent in this context's view.
- */
- Context.prototype.lookup = function lookup (name) {
- var cache = this.cache;
-
- var value;
- if (cache.hasOwnProperty(name)) {
- value = cache[name];
- } else {
- var context = this, intermediateValue, names, index, lookupHit = false;
-
- while (context) {
- if (name.indexOf('.') > 0) {
- intermediateValue = context.view;
- names = name.split('.');
- index = 0;
-
- /**
- * Using the dot notion path in `name`, we descend through the
- * nested objects.
- *
- * To be certain that the lookup has been successful, we have to
- * check if the last object in the path actually has the property
- * we are looking for. We store the result in `lookupHit`.
- *
- * This is specially necessary for when the value has been set to
- * `undefined` and we want to avoid looking up parent contexts.
- *
- * In the case where dot notation is used, we consider the lookup
- * to be successful even if the last "object" in the path is
- * not actually an object but a primitive (e.g., a string, or an
- * integer), because it is sometimes useful to access a property
- * of an autoboxed primitive, such as the length of a string.
- **/
- while (intermediateValue != null && index < names.length) {
- if (index === names.length - 1)
- lookupHit = (
- hasProperty(intermediateValue, names[index])
- || primitiveHasOwnProperty(intermediateValue, names[index])
- );
-
- intermediateValue = intermediateValue[names[index++]];
- }
- } else {
- intermediateValue = context.view[name];
-
- /**
- * Only checking against `hasProperty`, which always returns `false`
if
- * `context.view` is not an object. Deliberately omitting the check
- * against `primitiveHasOwnProperty` if dot notation is not used.
- *
- * Consider this example:
- * ```
- * Mustache.render("The length of a football field is
{{#length}}{{length}}{{/length}}.", {length: "100 yards"})
- * ```
- *
- * If we were to check also against `primitiveHasOwnProperty`, as we
do
- * in the dot notation case, then render call would return:
- *
- * "The length of a football field is 9."
- *
- * rather than the expected:
- *
- * "The length of a football field is 100 yards."
- **/
- lookupHit = hasProperty(context.view, name);
- }
-
- if (lookupHit) {
- value = intermediateValue;
- break;
- }
-
- context = context.parent;
- }
-
- cache[name] = value;
- }
-
- if (isFunction(value))
- value = value.call(this.view);
-
- return value;
- };
-
- /**
- * A Writer knows how to take a stream of tokens and render them to a
- * string, given a context. It also maintains a cache of templates to
- * avoid the need to parse the same template twice.
- */
- function Writer () {
- this.cache = {};
- }
-
- /**
- * Clears all cached templates in this writer.
- */
- Writer.prototype.clearCache = function clearCache () {
- this.cache = {};
- };
-
- /**
- * Parses and caches the given `template` according to the given `tags` or
- * `mustache.tags` if `tags` is omitted, and returns the array of tokens
- * that is generated from the parse.
- */
- Writer.prototype.parse = function parse (template, tags) {
- var cache = this.cache;
- var cacheKey = template + ':' + (tags || mustache.tags).join(':');
- var tokens = cache[cacheKey];
-
- if (tokens == null)
- tokens = cache[cacheKey] = parseTemplate(template, tags);
-
- return tokens;
- };
-
- /**
- * High-level method that is used to render the given `template` with
- * the given `view`.
- *
- * The optional `partials` argument may be an object that contains the
- * names and templates of partials that are used in the template. It may
- * also be a function that is used to load partial templates on the fly
- * that takes a single argument: the name of the partial.
- *
- * If the optional `tags` argument is given here it must be an array with two
- * string values: the opening and closing tags used in the template (e.g.
- * [ "<%", "%>" ]). The default is to mustache.tags.
- */
- Writer.prototype.render = function render (template, view, partials, tags) {
- var tokens = this.parse(template, tags);
- var context = (view instanceof Context) ? view : new Context(view);
- return this.renderTokens(tokens, context, partials, template, tags);
- };
-
- /**
- * Low-level method that renders the given array of `tokens` using
- * the given `context` and `partials`.
- *
- * Note: The `originalTemplate` is only ever used to extract the portion
- * of the original template that was contained in a higher-order section.
- * If the template doesn't use higher-order sections, this argument may
- * be omitted.
- */
- Writer.prototype.renderTokens = function renderTokens (tokens, context,
partials, originalTemplate, tags) {
- var buffer = '';
-
- var token, symbol, value;
- for (var i = 0, numTokens = tokens.length; i < numTokens; ++i) {
- value = undefined;
- token = tokens[i];
- symbol = token[0];
-
- if (symbol === '#') value = this.renderSection(token, context, partials,
originalTemplate);
- else if (symbol === '^') value = this.renderInverted(token, context,
partials, originalTemplate);
- else if (symbol === '>') value = this.renderPartial(token, context,
partials, tags);
- else if (symbol === '&') value = this.unescapedValue(token, context);
- else if (symbol === 'name') value = this.escapedValue(token, context);
- else if (symbol === 'text') value = this.rawValue(token);
-
- if (value !== undefined)
- buffer += value;
- }
-
- return buffer;
- };
-
- Writer.prototype.renderSection = function renderSection (token, context,
partials, originalTemplate) {
- var self = this;
- var buffer = '';
- var value = context.lookup(token[1]);
-
- // This function is used to render an arbitrary template
- // in the current context by higher-order sections.
- function subRender (template) {
- return self.render(template, context, partials);
- }
-
- if (!value) return;
-
- if (isArray(value)) {
- for (var j = 0, valueLength = value.length; j < valueLength; ++j) {
- buffer += this.renderTokens(token[4], context.push(value[j]),
partials, originalTemplate);
- }
- } else if (typeof value === 'object' || typeof value === 'string' ||
typeof value === 'number') {
- buffer += this.renderTokens(token[4], context.push(value), partials,
originalTemplate);
- } else if (isFunction(value)) {
- if (typeof originalTemplate !== 'string')
- throw new Error('Cannot use higher-order sections without the original
template');
-
- // Extract the portion of the original template that the section
contains.
- value = value.call(context.view, originalTemplate.slice(token[3],
token[5]), subRender);
-
- if (value != null)
- buffer += value;
- } else {
- buffer += this.renderTokens(token[4], context, partials,
originalTemplate);
- }
- return buffer;
- };
-
- Writer.prototype.renderInverted = function renderInverted (token, context,
partials, originalTemplate) {
- var value = context.lookup(token[1]);
-
- // Use JavaScript's definition of falsy. Include empty arrays.
- // See https://github.com/janl/mustache.js/issues/186
- if (!value || (isArray(value) && value.length === 0))
- return this.renderTokens(token[4], context, partials, originalTemplate);
- };
-
- Writer.prototype.renderPartial = function renderPartial (token, context,
partials, tags) {
- if (!partials) return;
-
- var value = isFunction(partials) ? partials(token[1]) : partials[token[1]];
- if (value != null)
- return this.renderTokens(this.parse(value, tags), context, partials,
value);
- };
-
- Writer.prototype.unescapedValue = function unescapedValue (token, context) {
- var value = context.lookup(token[1]);
- if (value != null)
- return value;
- };
-
- Writer.prototype.escapedValue = function escapedValue (token, context) {
- var value = context.lookup(token[1]);
- if (value != null)
- return mustache.escape(value);
- };
-
- Writer.prototype.rawValue = function rawValue (token) {
- return token[1];
- };
-
- mustache.name = 'mustache.js';
- mustache.version = '3.0.1';
- mustache.tags = [ '{{', '}}' ];
-
- // All high-level mustache.* functions use this writer.
- var defaultWriter = new Writer();
-
- /**
- * Clears all cached templates in the default writer.
- */
- mustache.clearCache = function clearCache () {
- return defaultWriter.clearCache();
- };
-
- /**
- * Parses and caches the given template in the default writer and returns the
- * array of tokens it contains. Doing this ahead of time avoids the need to
- * parse templates on the fly as they are rendered.
- */
- mustache.parse = function parse (template, tags) {
- return defaultWriter.parse(template, tags);
- };
-
- /**
- * Renders the `template` with the given `view` and `partials` using the
- * default writer. If the optional `tags` argument is given here it must be
an
- * array with two string values: the opening and closing tags used in the
- * template (e.g. [ "<%", "%>" ]). The default is to mustache.tags.
- */
- mustache.render = function render (template, view, partials, tags) {
- if (typeof template !== 'string') {
- throw new TypeError('Invalid template! Template should be a "string" ' +
- 'but "' + typeStr(template) + '" was given as the
first ' +
- 'argument for mustache#render(template, view,
partials)');
- }
-
- return defaultWriter.render(template, view, partials, tags);
- };
-
- // This is here for backwards compatibility with 0.4.x.,
- /*eslint-disable */ // eslint wants camel cased function name
- mustache.to_html = function to_html (template, view, partials, send) {
- /*eslint-enable*/
-
- var result = mustache.render(template, view, partials);
-
- if (isFunction(send)) {
- send(result);
- } else {
- return result;
- }
- };
-
- // Export the escaping function so that the user may override it.
- // See https://github.com/janl/mustache.js/issues/244
- mustache.escape = escapeHtml;
-
- // Export these mainly for testing, but also for advanced usage.
- mustache.Scanner = Scanner;
- mustache.Context = Context;
- mustache.Writer = Writer;
-
- return mustache;
-}));
\ No newline at end of file
diff --git a/core/src/main/resources/org/apache/spark/ui/static/stagepage.js
b/core/src/main/resources/org/apache/spark/ui/static/stagepage.js
index 8550ae74a466..dcba4f544b50 100644
--- a/core/src/main/resources/org/apache/spark/ui/static/stagepage.js
+++ b/core/src/main/resources/org/apache/spark/ui/static/stagepage.js
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-/* global $, Mustache, uiRoot */
+/* global $, uiRoot */
import {
ConvertDurationString, createRESTEndPointForExecutorsPage,
createTemplateURI, errorMessageCell,
@@ -378,7 +378,7 @@ $(document).ready(function () {
getStandAloneAppId(function (appId) {
// rendering the UI page
$.get(createTemplateURI(appId, "stagespage"), function(template) {
-
tasksSummary.append(Mustache.render($(template).filter("#stages-summary-template").html()));
+
tasksSummary.append($(template).filter("#stages-summary-template").html());
$("#additionalMetrics").click(function(){
$("#arrowtoggle1").toggleClass("arrow-open arrow-closed");
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 4e64b4c394d8..cd2bc6d58075 100644
--- a/core/src/main/scala/org/apache/spark/ui/UIUtils.scala
+++ b/core/src/main/scala/org/apache/spark/ui/UIUtils.scala
@@ -258,7 +258,6 @@ private[spark] object UIUtils extends Logging {
<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.bootstrap5.min.js")}></script>
- <script src={prependBaseUri(request,
"/static/jquery.mustache.js")}></script>
}
/** Returns a spark page with correctly formatted headers */
diff --git a/dev/.rat-excludes b/dev/.rat-excludes
index e254267fdc69..0fa4dcb3b71e 100644
--- a/dev/.rat-excludes
+++ b/dev/.rat-excludes
@@ -39,7 +39,6 @@ jquery.blockUI.min.js
jquery.cookies.2.2.0.min.js
jquery.dataTables.min.css
jquery.dataTables.min.js
-jquery.mustache.js
.*\.avsc
.*\.txt
.*\.json
diff --git a/licenses-binary/LICENSE-mustache.txt
b/licenses-binary/LICENSE-mustache.txt
deleted file mode 100644
index 038cbb95d1cd..000000000000
--- a/licenses-binary/LICENSE-mustache.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-The MIT License
-
-Copyright (c) 2009 Chris Wanstrath (Ruby)
-Copyright (c) 2010-2014 Jan Lehnardt (JavaScript)
-Copyright (c) 2010-2015 The mustache.js community
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
\ No newline at end of file
diff --git a/licenses/LICENSE-mustache.txt b/licenses/LICENSE-mustache.txt
deleted file mode 100644
index 038cbb95d1cd..000000000000
--- a/licenses/LICENSE-mustache.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-The MIT License
-
-Copyright (c) 2009 Chris Wanstrath (Ruby)
-Copyright (c) 2010-2014 Jan Lehnardt (JavaScript)
-Copyright (c) 2010-2015 The mustache.js community
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
\ No newline at end of file
diff --git a/ui-test/tests/table-structure.test.js
b/ui-test/tests/table-structure.test.js
new file mode 100644
index 000000000000..c2e537d75dc9
--- /dev/null
+++ b/ui-test/tests/table-structure.test.js
@@ -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.
+ */
+
+import { readFileSync } from 'fs';
+import { join, dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const staticDir = join(__dirname,
'../../core/src/main/resources/org/apache/spark/ui/static');
+
+function readStatic(filename) {
+ return readFileSync(join(staticDir, filename), 'utf8');
+}
+
+function extractTemplateContent(html, id) {
+ const re = new RegExp(`<script[^>]*id="${id}"[^>]*>([\\s\\S]*?)<\\/script>`);
+ return html.match(re)[1];
+}
+
+function extractThTexts(html) {
+ return [...html.matchAll(/<th[\s>][\s\S]*?<\/th>/g)]
+ .map(m => m[0].replace(/<[^>]+>/g, '').replace(/\s+/g, ' ').trim());
+}
+
+function extractTableIds(html) {
+ return [...html.matchAll(/<table[^>]*id="([^"]+)"/g)].map(m => m[1]);
+}
+
+test('historypage template has expected column structure', function () {
+ const html = readStatic('historypage-template.html');
+ const template = extractTemplateContent(html, 'history-summary-template');
+ const headers = extractThTexts(template);
+
+ // All columns must always be present in the template.
+ // historypage.js uses removeColumnByName() to conditionally hide
+ // Attempt ID, Completed, and Duration at runtime.
+ expect(headers).toEqual([
+ 'Version',
+ 'App ID',
+ 'App Name',
+ 'Log Source',
+ 'Attempt ID',
+ 'Started',
+ 'Completed',
+ 'Duration',
+ 'Spark User',
+ 'Last Updated',
+ 'Event Log',
+ ]);
+
+ expect(extractTableIds(template)).toContain('history-summary-table');
+});
+
+test('executorspage template has expected table structure', function () {
+ const html = readStatic('executorspage-template.html');
+ const template = extractTemplateContent(html, 'executors-summary-template');
+ const tableIds = extractTableIds(template);
+
+ expect(tableIds).toContain('summary-execs-table');
+ expect(tableIds).toContain('active-executors-table');
+
+ // Summary table columns
+ const summaryTable = template.match(
+ /id="summary-execs-table"[\s\S]*?<thead>([\s\S]*?)<\/thead>/
+ )[1];
+ const summaryHeaders = extractThTexts(summaryTable);
+ expect(summaryHeaders).toEqual([
+ '', // row label column (Active/Dead/Total)
+ 'RDD Blocks',
+ 'Storage Memory',
+ 'On Heap Storage Memory',
+ 'Off Heap Storage Memory',
+ 'Disk Used',
+ 'Cores',
+ 'Active Tasks',
+ 'Failed Tasks',
+ 'Complete Tasks',
+ 'Total Tasks',
+ 'Task Time (GC Time)',
+ 'Input',
+ 'Shuffle Read',
+ 'Shuffle Write',
+ 'Excluded',
+ ]);
+});
+
+test('stagespage template has expected table structure', function () {
+ const html = readStatic('stagespage-template.html');
+ const template = extractTemplateContent(html, 'stages-summary-template');
+ const tableIds = extractTableIds(template);
+
+ expect(tableIds).toContain('summary-metrics-table');
+ expect(tableIds).toContain('speculation-metrics-table');
+ expect(tableIds).toContain('summary-executor-table');
+ expect(tableIds).toContain('accumulator-table');
+ expect(tableIds).toContain('active-tasks-table');
+
+ // Task table columns
+ const taskTable = template.match(
+ /id="active-tasks-table"[\s\S]*?<thead>([\s\S]*?)<\/thead>/
+ )[1];
+ const taskHeaders = extractThTexts(taskTable);
+ expect(taskHeaders).toEqual([
+ 'Index', 'Task ID', 'Attempt', 'Status', 'Locality level',
+ 'Executor ID', 'Host', 'Logs', 'Launch Time', 'Duration',
+ 'GC Time', 'Scheduler Delay', 'Task Deserialization Time',
+ 'Shuffle Read Fetch Wait Time', 'Shuffle Remote Reads',
+ 'Result Serialization Time', 'Getting Result Time',
+ 'Peak Execution Memory', 'Accumulators',
+ 'Input Size / Records', 'Output Size / Records',
+ 'Shuffle Write Time', 'Shuffle Write Size / Records',
+ 'Shuffle Read Size / Records', 'Spill (Memory)', 'Spill (Disk)', 'Errors',
+ ]);
+});
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
