You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ep...@apache.org on 2019/02/07 22:25:49 UTC
[hadoop] branch branch-2.8 updated: YARN-7171: RM UI should sort
memory / cores numerically. Contributed by Ahmed Hussein
This is an automated email from the ASF dual-hosted git repository.
epayne pushed a commit to branch branch-2.8
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-2.8 by this push:
new a53beec YARN-7171: RM UI should sort memory / cores numerically. Contributed by Ahmed Hussein
a53beec is described below
commit a53beec79a981b202a38b50c1455eddf6239290f
Author: Eric E Payne <er...@verizonmedia.com>
AuthorDate: Thu Feb 7 22:24:24 2019 +0000
YARN-7171: RM UI should sort memory / cores numerically. Contributed by Ahmed Hussein
---
.../resources/webapps/static/yarn.dt.plugins.js | 22 ++++++++++++++++++++++
.../hadoop/yarn/server/webapp/WebPageUtils.java | 1 +
2 files changed, 23 insertions(+)
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/yarn.dt.plugins.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/yarn.dt.plugins.js
index c003272..92f2ae9 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/yarn.dt.plugins.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/yarn.dt.plugins.js
@@ -73,6 +73,28 @@ jQuery.fn.dataTableExt.oApi.fnSetFilteringDelay = function ( oSettings, iDelay )
return this;
}
+jQuery.fn.dataTableExt.oSort['num-ignore-str-asc'] = function(a, b) {
+ if (isNaN(a) && isNaN(b)) return ((a < b) ? 1 : ((a > b) ? -1 : 0));
+
+ if (isNaN(a)) return 1;
+ if (isNaN(b)) return -1;
+
+ var x = parseFloat(a);
+ var y = parseFloat(b);
+ return ((x < y) ? -1 : ((x > y) ? 1 : 0));
+};
+
+jQuery.fn.dataTableExt.oSort['num-ignore-str-desc'] = function(a, b) {
+ if (isNaN(a) && isNaN(b)) return ((a < b) ? 1 : ((a > b) ? -1 : 0));
+
+ if (isNaN(a)) return 1;
+ if (isNaN(b)) return -1;
+
+ var x = parseFloat(a);
+ var y = parseFloat(b);
+ return ((x < y) ? 1 : ((x > y) ? -1 : 0));
+};
+
function renderHadoopDate(data, type, full) {
if (type === 'display' || type === 'filter') {
if(data === '0'|| data === '-1') {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java
index a07baa2..7586046 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java
@@ -53,6 +53,7 @@ public class WebPageUtils {
.append(", 'mRender': parseHadoopID }")
.append("\n, {'sType':'numeric', 'aTargets': [6, 7]")
.append(", 'mRender': renderHadoopDate }")
+ .append("\n, {'sType':'num-ignore-str', 'aTargets': [10, 11, 12] }")
.append("\n, {'sType':'numeric', bSearchable:false, 'aTargets':");
if (isFairSchedulerPage) {
sb.append("[13]");
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org