svn commit: r1444090 - in /hadoop/common/branches/branch-0.23/hadoop-yarn-project: CHANGES.txt hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/yarn.dt.plugins.js

[jl...@apache.org]

Author: jlowe
Date: Fri Feb  8 16:06:27 2013
New Revision: 1444090

URL: http://svn.apache.org/r1444090
Log:
svn merge -c 1444085 FIXES: YARN-362. Unexpected extra results when using webUI table search. Contributed by Ravi Prakash

Modified:
    hadoop/common/branches/branch-0.23/hadoop-yarn-project/CHANGES.txt
    hadoop/common/branches/branch-0.23/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/yarn.dt.plugins.js

Modified: hadoop/common/branches/branch-0.23/hadoop-yarn-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-yarn-project/CHANGES.txt?rev=1444090&r1=1444089&r2=1444090&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.23/hadoop-yarn-project/CHANGES.txt Fri Feb  8 16:06:27 2013
@@ -38,6 +38,9 @@ Release 0.23.7 - UNRELEASED
     YARN-150. AppRejectedTransition does not unregister app from master service
     and scheduler (Bikas Shah via tgraves)
 
+    YARN-362. Unexpected extra results when using webUI table search (Ravi
+    Prakash via jlowe)
+
 Release 0.23.6 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/branches/branch-0.23/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/yarn.dt.plugins.js
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/yarn.dt.plugins.js?rev=1444090&r1=1444089&r2=1444090&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/yarn.dt.plugins.js (original)
+++ hadoop/common/branches/branch-0.23/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/yarn.dt.plugins.js Fri Feb  8 16:06:27 2013
@@ -74,19 +74,19 @@ jQuery.fn.dataTableExt.oApi.fnSetFilteri
 }
 
 function renderHadoopDate(data, type, full) {
-  if (type === 'display') {
+  if (type === 'display' || type === 'filter') {
     if(data === '0') {
       return "N/A";
     }
     return new Date(parseInt(data)).toUTCString();
   }
-  // 'filter', 'sort', 'type' and undefined all just use the number
+  // 'sort', 'type' and undefined all just use the number
   // If date is 0, then for purposes of sorting it should be consider max_int
   return data === '0' ? '9007199254740992' : data;  
 }
 
 function renderHadoopElapsedTime(data, type, full) {
-  if (type === 'display') {
+  if (type === 'display' || type === 'filter') {
     var timeDiff = parseInt(data);
     if(timeDiff < 0)
       return "N/A";
@@ -110,24 +110,37 @@ function renderHadoopElapsedTime(data, t
     toReturn += "sec";
     return toReturn;
   }
-  // 'filter', 'sort', 'type' and undefined all just use the number
+  // 'sort', 'type' and undefined all just use the number
   return data;  
 }
 
 function parseHadoopID(data, type, full) {
-  if (type === 'display' || type === 'filter') {
+  if (type === 'display') {
     return data;
   }
+  //Return the visible string rather than the entire HTML tag
+  if (type === 'filter') {
+    return data.split('>')[1].split('<')[0];
+  }
   //Parse the ID for 'sort', 'type' and undefined
   //The number after the last '_' and before the end tag '<'
   var splits = data.split('_');
   return splits[parseInt(splits.length-1)].split('<')[0];
 }
 
+//JSON array element is "20000 attempt_1360183373897_0001_m_000002_0"
+function parseHadoopAttemptID(data, type, full) {
+  if (type === 'display' || type === 'filter') {
+    return data.split(' ')[1];
+  }
+  //For sorting use the order as defined in the JSON element
+  return data.split(' ')[0];
+}
+
 function parseHadoopProgress(data, type, full) {
   if (type === 'display') {
     return data;
   }
   //Return the title attribute for 'sort', 'filter', 'type' and undefined
   return data.split("'")[1];
-}
+}
\ No newline at end of file