zeppelin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mina...@apache.org
Subject zeppelin git commit: [Zeppelin-1161] Revert precise execution time
Date Tue, 19 Jul 2016 06:55:33 GMT
Repository: zeppelin
Updated Branches:
  refs/heads/branch-0.6 26250f38f -> 36580c665


[Zeppelin-1161] Revert precise execution time

### What is this PR for?
It had been pointed out in the mailing list that after https://github.com/apache/zeppelin/pull/862,
the execution time was changed to humanized fashion, while we would want to keep something
more precise in that case.

This PR is rolling back to the old precise time for execution time.

### What type of PR is it?
Improvement

### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-1161

### How should this be tested?
Run a paragraph, after it is finished, it should show: `Took x seconds.` instead of `Took
a few seconds` (or Hours, Minutes, Sec)

### Screenshot
![screen shot 2016-07-13 at 2 19 45 pm](https://cloud.githubusercontent.com/assets/710411/16792626/0ff3ccb8-4905-11e6-89b6-a202944d66b8.png)

### Questions:
* Does the licenses files need update? Yes
* Is there breaking changes for older versions? No
* Does this needs documentation? No

Author: Damien CORNEAU <corneadoug@gmail.com>

Closes #1172 from corneadoug/ZEPPELIN-1161 and squashes the following commits:

df752bd [Damien CORNEAU] Add licence of new dependency
2c21894 [Damien CORNEAU] Fix jscs errors
9f756e3 [Damien CORNEAU] add moment plugin for duration
935f348 [Damien CORNEAU] Fix jxcs
e4f7625 [Damien CORNEAU] Revert seconds ago for execution time

(cherry picked from commit dbe5e6c12f327803af63e282e055af1a2e08ff02)
Signed-off-by: Mina Lee <minalee@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/36580c66
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/36580c66
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/36580c66

Branch: refs/heads/branch-0.6
Commit: 36580c665f1ed24eb3481b3f8f5dba44ab134dc2
Parents: 26250f3
Author: Damien CORNEAU <corneadoug@gmail.com>
Authored: Thu Jul 14 11:29:55 2016 +0900
Committer: Mina Lee <minalee@apache.org>
Committed: Tue Jul 19 15:54:45 2016 +0900

----------------------------------------------------------------------
 zeppelin-distribution/src/bin_license/LICENSE                   | 2 +-
 zeppelin-web/bower.json                                         | 3 ++-
 zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js | 3 +--
 zeppelin-web/src/index.html                                     | 1 +
 zeppelin-web/test/karma.conf.js                                 | 1 +
 5 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/36580c66/zeppelin-distribution/src/bin_license/LICENSE
----------------------------------------------------------------------
diff --git a/zeppelin-distribution/src/bin_license/LICENSE b/zeppelin-distribution/src/bin_license/LICENSE
index 292b8d3..7abc826 100644
--- a/zeppelin-distribution/src/bin_license/LICENSE
+++ b/zeppelin-distribution/src/bin_license/LICENSE
@@ -136,6 +136,7 @@ The text of each license is also included at licenses/LICENSE-[project]-[version
     (The MIT License) slf4j-log4j12 v1.7.10 (org.slf4j:slf4j-log4j12:jar:1.7.10 - http://www.slf4j.org)
- http://www.slf4j.org/license.html
     (The MIT License) bcprov-jdk15on v1.51 (org.bouncycastle:bcprov-jdk15on:jar:1.51 - http://www.bouncycastle.org/java.html)
- http://www.bouncycastle.org/licence.html
     (The MIT License) AnchorJS (https://github.com/bryanbraun/anchorjs) - https://github.com/bryanbraun/anchorjs/blob/master/README.md#license
+    (The MIT License) moment-duration-format v1.3.0 (https://github.com/jsmreese/moment-duration-format)
- https://github.com/jsmreese/moment-duration-format/blob/master/LICENSE
 
 The following components are provided under the MIT License.
 
@@ -145,7 +146,6 @@ The following components are provided under the MIT License.
     (The MIT License) angular-resource (angular-resource - https://github.com/angular/angular.js/tree/master/src/ngResource)
     (The MIT License) minimal-json (com.eclipsesource.minimal-json:minimal-json:0.9.4 - https://github.com/ralfstx/minimal-json)
 
-
 ========================================================================
 BSD-style licenses
 ========================================================================

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/36580c66/zeppelin-web/bower.json
----------------------------------------------------------------------
diff --git a/zeppelin-web/bower.json b/zeppelin-web/bower.json
index 2000281..a4c335d 100644
--- a/zeppelin-web/bower.json
+++ b/zeppelin-web/bower.json
@@ -30,7 +30,8 @@
     "ngtoast": "~2.0.0",
     "ng-focus-if": "~1.0.2",
     "bootstrap3-dialog": "bootstrap-dialog#~1.34.7",
-    "handsontable": "~0.24.2"
+    "handsontable": "~0.24.2",
+    "moment-duration-format": "^1.3.0"
   },
   "devDependencies": {
     "angular-mocks": "1.5.0"

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/36580c66/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
index 1142a07..9800a1d 100644
--- a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
+++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
@@ -981,8 +981,7 @@ angular.module('zeppelinWebApp')
       return '';
     }
     var user = (pdata.user === undefined || pdata.user === null) ? 'anonymous' : pdata.user;
-    var desc = 'Took ' +
-      moment.duration(moment(pdata.dateFinished).diff(moment(pdata.dateStarted))).humanize()
+
+    var desc = 'Took ' + moment.duration((timeMs / 1000), 'seconds').format('h [hrs] m [min]
s [sec]') +
       '. Last updated by ' + user + ' at ' + moment(pdata.dateUpdated).format('MMMM DD YYYY,
h:mm:ss A') + '.';
     if ($scope.isResultOutdated()){
       desc += ' (outdated)';

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/36580c66/zeppelin-web/src/index.html
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/index.html b/zeppelin-web/src/index.html
index cb03939..0bda500 100644
--- a/zeppelin-web/src/index.html
+++ b/zeppelin-web/src/index.html
@@ -140,6 +140,7 @@ limitations under the License.
     <script src="bower_components/moment/moment.js"></script>
     <script src="bower_components/pikaday/pikaday.js"></script>
     <script src="bower_components/handsontable/dist/handsontable.js"></script>
+    <script src="bower_components/moment-duration-format/lib/moment-duration-format.js"></script>
     <!-- endbower -->
     <!-- endbuild -->
     <!-- build:js({.tmp,src}) scripts/scripts.js -->

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/36580c66/zeppelin-web/test/karma.conf.js
----------------------------------------------------------------------
diff --git a/zeppelin-web/test/karma.conf.js b/zeppelin-web/test/karma.conf.js
index 1ec6eb6..28434ef 100644
--- a/zeppelin-web/test/karma.conf.js
+++ b/zeppelin-web/test/karma.conf.js
@@ -63,6 +63,7 @@ module.exports = function(config) {
       'bower_components/moment/moment.js',
       'bower_components/pikaday/pikaday.js',
       'bower_components/handsontable/dist/handsontable.js',
+      'bower_components/moment-duration-format/lib/moment-duration-format.js',
       'bower_components/angular-mocks/angular-mocks.js',
       // endbower
       'src/app/app.js',


Mime
View raw message