Mailing-List: contact commits-help@tez.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@tez.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: prakash@apache.org
To: commits@tez.apache.org
Message-Id: <ad347c04af9145829cbef33ec1c25a3b@git.apache.org>
Subject: tez git commit: TEZ-2357. Tez UI: misc.js.orig is committed by
 accident (pramachandran)
Date: Thu, 23 Apr 2015 13:58:19 +0000 (UTC)

Repository: tez
Updated Branches:
  refs/heads/master fe11c5e67 -> 67609af4b


TEZ-2357. Tez UI: misc.js.orig is committed by accident (pramachandran)


Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/67609af4
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/67609af4
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/67609af4

Branch: refs/heads/master
Commit: 67609af4b310c67305cc5e5f87530756ce15a206
Parents: fe11c5e
Author: Prakash Ramachandran <pramachandran@hortonworks.com>
Authored: Thu Apr 23 19:27:22 2015 +0530
Committer: Prakash Ramachandran <pramachandran@hortonworks.com>
Committed: Thu Apr 23 19:27:22 2015 +0530

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 .../webapp/app/scripts/helpers/misc.js.orig     | 436 -------------------
 2 files changed, 1 insertion(+), 436 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/67609af4/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index af39092..1c41714 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,6 +9,7 @@ INCOMPATIBLE CHANGES
   TEZ-1993. Implement a pluggable InputSizeEstimator for grouping fairly
 
 ALL CHANGES:
+  TEZ-2357. Tez UI: misc.js.orig is committed by accident
   TEZ-2261. Should add diagnostics in DAGAppMaster when recovery error happens
   TEZ-2340. TestRecoveryParser fails
   TEZ-2345. Tez UI: Enable cell level loading in all DAGs table

http://git-wip-us.apache.org/repos/asf/tez/blob/67609af4/tez-ui/src/main/webapp/app/scripts/helpers/misc.js.orig
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/helpers/misc.js.orig b/tez-ui/src/main/webapp/app/scripts/helpers/misc.js.orig
deleted file mode 100644
index fdd69bd..0000000
--- a/tez-ui/src/main/webapp/app/scripts/helpers/misc.js.orig
+++ /dev/null
@@ -1,436 +0,0 @@
-/**
- * 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.
- */
-
-App.Helpers.misc = {
-  getStatusClassForEntity: function(status, hasFailedTasks) {
-    if(!status) return '';
-
-    switch(status) {
-      case 'FAILED':
-        return 'failed';
-      case 'KILLED':
-        return 'killed';
-      case 'RUNNING':
-        return 'running';
-      case 'ERROR':
-        return 'error';
-      case 'SUCCEEDED':
-        if (!!hasFailedTasks) {
-          return 'warning';
-        }
-        /*
-        TODO: TEZ-2113
-        var counterGroups = dag.get('counterGroups');
-        var numFailedTasks = this.getCounterValueForDag(counterGroups,
-          dag.get('id'), 'org.apache.tez.common.counters.DAGCounter',
-          'NUM_FAILED_TASKS'
-        ); 
-
-        if (numFailedTasks > 0) {
-          return 'warning';
-        }*/
-
-        return 'success';
-      case 'UNDEFINED':
-        return 'unknown';
-      default:
-        return 'submitted';
-    }
-  },
-
-  getRealStatus: function(entityState, yarnAppState, yarnAppFinalState) {
-    if (entityState != 'RUNNING' || (yarnAppState != 'FINISHED' && yarnAppState != 'KILLED' && yarnAppState != 'FAILED')) {
-      return entityState;
-    }
-
-    if (yarnAppState == 'KILLED' || yarnAppState == 'FAILED') {
-      return yarnAppState;
-    }
-
-    return yarnAppFinalState;
-  },
-
-	getCounterValueForDag: function(counterGroups, dagID, counterGroupName, counterName) {
-		if (!counterGroups) {
-			return 0;
-		}
-
-		var cgName = dagID + '/' + counterGroupName;
-		var cg = 	counterGroups.findBy('id', cgName);
-		if (!cg) {
-			return 0;
-		}
-		var counters = cg.get('counters');
-		if (!counters) {
-			return 0;
-		}
-		
-		var counter = counters.findBy('id', cgName + '/' + counterName);
-		if (!counter) return 0;
-
-		return counter.get('value');
-	},
-
-  isValidDagStatus: function(status) {
-    return $.inArray(status, ['SUBMITTED', 'INITING', 'RUNNING', 'SUCCEEDED',
-      'KILLED', 'FAILED', 'ERROR']) != -1;
-  },
-
-  isValidTaskStatus: function(status) {
-    return $.inArray(status, ['RUNNING', 'SUCCEEDED', 'FAILED', 'KILLED']) != -1;
-  },
-
-  isStatusInUnsuccessful: function(status) {
-    return $.inArray(status, ['FAILED', 'KILLED', 'UNDEFINED']) != -1;
-  },
-
-  /**
-   * To trim a complete class path with namespace to the class name.
-   */
-  getClassName: function (classPath) {
-    return classPath.substr(classPath.lastIndexOf('.') + 1);
-  },
-
-  /*
-   * Normalizes counter style configurations
-   * @param counterConfigs Array
-   * @return Normalized configurations
-   */
-  normalizeCounterConfigs: function (counterConfigs) {
-    return counterConfigs.map(function (configuration) {
-      configuration.headerCellName = configuration.counterName || configuration.counterId;
-      configuration.id = '%@/%@'.fmt(configuration.counterGroupName || configuration.groupId,
-          configuration.counterName || configuration.counterId),
-      configuration.getCellContent = App.Helpers.misc.getCounterCellContent;
-      return configuration;
-    });
-  },
-
-  /*
-   * Creates column definitions form configuration object array
-   * @param columnConfigs Array
-   * @return columnDefinitions Array
-   */
-  createColumnsFromConfigs: function (columnConfigs) {
-    return columnConfigs.map(function (columnConfig) {
-      if(columnConfig.getCellContentHelper) {
-        columnConfig.getCellContent = App.Helpers.get(columnConfig.getCellContentHelper);
-      }
-      columnConfig.minWidth = columnConfig.minWidth || 135;
-
-      return columnConfig.filterID ?
-          App.ExTable.ColumnDefinition.createWithMixins(App.ExTable.FilterColumnMixin, columnConfig) :
-          App.ExTable.ColumnDefinition.create(columnConfig);
-    });
-  },
-
-  /*
-   * Returns a counter value from for a row
-   * @param row
-   * @return value
-   */
-  getCounterCellContent: function (row) {
-    var contentPath = this.id.split('/'),
-        group = contentPath[0],
-        counter = contentPath[1],
-        id = row.get('id'),
-        value = 'Not Available';
-
-    try{
-      value = row.get('counterGroups').
-          findBy('id', '%@/%@'.fmt(id, group)).
-          get('counters').
-          findBy('id', '%@/%@/%@'.fmt(id, group, counter)).
-          get('value');
-    }catch(e){}
-
-    return App.Helpers.number.formatNumThousands(value);
-  },
-
-  /* 
-   * returns a formatted message, the real cause is unknown and the error object details
-   * depends on the error cause. the function tries to handle ajax error or a native errors
-   */
-  formatError: function(error, defaultErrorMessage) {
-    var msg;
-    // for cross domain requests, the error is not set if no access control headers were found.
-    // this could be either because there was a n/w error or the cors headers being not set.
-    if (error.status === 0 && error.statusText === 'error') {
-      msg = defaultErrorMessage ;
-    } else {
-      msg = error.statusText || error.message;
-    }
-    msg = msg || 'Unknown error';
-    if (!!error.responseText) {
-      msg += error.responseText;
-    }
-
-    if(error.requestOptions) {
-      msg = '%@<br/>Could not retrieve expected data from %@ @ %@'.fmt(
-        msg,
-        error.requestOptions.targetServer,
-        error.requestOptions.url
-      )
-    }
-
-    return {
-      errCode: error.status || 'Unknown', 
-      msg: msg,
-      details: error.stack
-    };
-  },
-
-  /**
-   * Normalize path
-   * @param path {String}
-   * @return normalized path {String}
-   */
-  normalizePath: function (path) {
-    if(path && path.charAt(path.length - 1) == '/') {
-      path = path.slice(0, -1);
-    }
-    return path;
-  },
-
-  // Tez originally shows the status for task and task attempt only on
-  // completion. this causes confusion to the user as the status would not be
-  // displayed. so if status is not set return the status as 'RUNNING'. We do
-  // not diffentiate between running and scheduled.
-  getFixedupDisplayStatus: function(originalStatus) {
-    // if status is not set show it as running, since originally the task did
-    // not have a status set on scheduled/running.
-    // with the new version we set the status of task as scheduled and that of
-    // task attempt as running
-    if (!originalStatus || originalStatus == 'SCHEDULED') {
-      originalStatus = 'RUNNING';
-    }
-    return originalStatus;
-  },
-
-  /**
-   * Merge content of obj2 into obj2, array elements will be concated.
-   * @param obj1 {Object}
-   * @param obj2 {Object}
-   */
-  merge: function objectMerge(obj1, obj2) {
-    $.each(obj2, function (key, val) {
-      if(Array.isArray(obj1[key]) && Array.isArray(val)) {
-        $.merge(obj1[key], val);
-      }
-      else if($.isPlainObject(obj1[key]) && $.isPlainObject(val)) {
-        objectMerge(obj1[key], val);
-      }
-      else {
-        obj1[key] = val;
-      }
-    });
-  },
-
-  getTaskIndex: function(dagID, taskID) {
-    var idPrefix = 'task_%@_'.fmt(dagID.substr(4));
-    return taskID.indexOf(idPrefix) == 0 ? taskID.substr(idPrefix.length) : id;
-  },
-
-  getVertexIdFromName: function(idToNameMap, vertexName) {
-    idToNameMap = idToNameMap || {};
-    var vertexId = undefined;
-    $.each(idToNameMap, function(id, name) {
-      if (name === vertexName) {
-        vertexId = id;
-        return false;
-      }
-    });
-    return vertexId;
-  },
-
-  /**
-   * Remove the specific record from store
-   * @param store {DS.Store}
-   * @param type {String}
-   * @param id {String}
-   */
-  removeRecord: function (store, type, id) {
-    var record = store.getById(type, id);
-    if(record) {
-      store.unloadRecord(record);
-    }
-  },
-
-  downloadDAG: function(dagID, options) {
-    var opts = options || {},
-        batchSize = opts.batchSize || 1000,
-        baseurl = '%@/%@'.fmt(App.env.timelineBaseUrl, App.Configs.restNamespace.timeline),
-        itemsToDownload = [
-          {
-            url: getUrl('TEZ_DAG_ID', dagID),
-            context: { name: 'dag', type: 'TEZ_DAG_ID' },
-            onItemFetched: processSingleItem
-          },
-          {
-            url: getUrl('TEZ_VERTEX_ID', dagID),
-            context: { name: 'vertices', type: 'TEZ_VERTEX_ID', part: 0 },
-            onItemFetched: processMultipleItems
-          },
-          {
-            url: getUrl('TEZ_TASK_ID', dagID),
-            context: { name: 'tasks', type: 'TEZ_TASK_ID', part: 0 },
-            onItemFetched: processMultipleItems
-          },
-          {
-            url: getUrl('TEZ_TASK_ATTEMPT_ID', dagID),
-            context: { name: 'task_attempts', type: 'TEZ_TASK_ATTEMPT_ID', part: 0 },
-            onItemFetched: processMultipleItems
-          }
-        ],
-        numItemTypesToDownload = itemsToDownload.length,
-        downloader = App.Helpers.io.fileDownloader(),
-        zipHelper = App.Helpers.io.zipHelper({
-          onProgress: function(filename, current, total) {
-            Em.Logger.debug('%@: %@ of %@'.fmt(filename, current, total));
-          },
-          onAdd: function(filename) {
-            Em.Logger.debug('adding %@ to Zip'.fmt(filename));
-          }
-        });
-
-    function getUrl(type, dagID, fromID) {
-      var url;
-      if (type == 'TEZ_DAG_ID') {
-        url = '%@/%@/%@'.fmt(baseurl, type, dagID);
-      } else {
-        url = '%@/%@?primaryFilter=TEZ_DAG_ID:%@&limit=%@'.fmt(baseurl, type, dagID, batchSize + 1);
-        if (!!fromID) {
-          url = '%@&fromId=%@'.fmt(url, fromID);
-        }
-      }
-      return url;
-    }
-
-    function checkIfAllDownloaded() {
-      numItemTypesToDownload--;
-      if (numItemTypesToDownload == 0) {
-        downloader.finish();
-      }
-    }
-
-    function processSingleItem(data, context) {
-      var obj = {};
-      obj[context.name] = data;
-
-      zipHelper.addFile({name: '%@.json'.fmt(context.name), data: JSON.stringify(obj, null, 2)});
-      checkIfAllDownloaded();
-    }
-
-    function processMultipleItems(data, context) {
-      var obj = {};
-      var nextBatchStart = undefined;
-
-      if (!$.isArray(data.entities)) {
-        throw "invalid data";
-      }
-
-      // need to handle no more entries , zero entries
-      if (data.entities.length > batchSize) {
-        nextBatchStart = data.entities.pop().entity;
-      }
-      obj[context.name] = data.entities;
-
-      zipHelper.addFile({name: '%@_part_%@.json'.fmt(context.name, context.part), data: JSON.stringify(obj, null, 2)});
-
-      if (!!nextBatchStart) {
-        context.part++;
-        downloader.queueItem({
-          url: getUrl(context.type, dagID, nextBatchStart),
-          context: context,
-          onItemFetched: processMultipleItems
-        });
-      } else {
-        checkIfAllDownloaded();
-      }
-    }
-
-    downloader.queueItems(itemsToDownload);
-
-    downloader.then(function() {
-      Em.Logger.info('Finished download');
-      zipHelper.close();
-    }).catch(function() {
-      Em.Logger.error('Failed to download');
-      zipHelper.abort();
-    });
-
-    var that = this;
-    zipHelper.then(function(zippedBlob) {
-      saveAs(zippedBlob, '%@.zip'.fmt(dagID));
-      if ($.isFunction(opts.onSuccess)) {
-        opts.onSuccess();
-      }
-    }).catch(function() {
-      Em.Logger.error('zip Failed');
-      if ($.isFunction(opts.onFailure)) {
-        opts.onFailure();
-      }
-    });
-
-    return {
-      cancel: function() {
-        downloader.cancel();
-      }
-    }
-  },
-
-  dagStatusUIOptions: [
-    { label: 'All', id: null },
-    { label: 'Submitted', id: 'SUBMITTED' },
-    { label: 'Running', id: 'RUNNING' },
-    { label: 'Succeeded', id: 'SUCCEEDED' },
-    { label: 'Failed', id: 'FAILED' },
-    { label: 'Killed', id: 'KILLED' },
-    { label: 'Error', id: 'ERROR' },
-  ],
-
-  vertexStatusUIOptions: [
-    { label: 'All', id: null },
-    { label: 'Running', id: 'RUNNING' },
-    { label: 'Succeeded', id: 'SUCCEEDED' },
-    { label: 'Failed', id: 'FAILED' },
-    { label: 'Killed', id: 'KILLED' },
-    { label: 'Error', id: 'ERROR' },
-  ],
-
-  taskStatusUIOptions: [
-    { label: 'All', id: null },
-    { label: 'Running', id: 'SCHEDULED' },
-    { label: 'Succeeded', id: 'SUCCEEDED' },
-    { label: 'Failed', id: 'FAILED' },
-    { label: 'Killed', id: 'KILLED' },
-  ],
-
-  taskAttemptStatusUIOptions: [
-    { label: 'All', id: null },
-    { label: 'Running', id: 'RUNNING' },
-    { label: 'Succeeded', id: 'SUCCEEDED' },
-    { label: 'Failed', id: 'FAILED' },
-    { label: 'Killed', id: 'KILLED' },
-  ],
-
-  defaultQueryParamsConfig: {
-    refreshModel: true,
-    replace: true
-  }
-
-}