You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by zh...@apache.org on 2016/05/10 06:34:18 UTC
[1/2] kylin git commit: KYLIN-1600 Diagnosis UI for job status update
Repository: kylin
Updated Branches:
refs/heads/master ecc57ee63 -> d83a32888
KYLIN-1600 Diagnosis UI for job status update
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/a943113f
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/a943113f
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/a943113f
Branch: refs/heads/master
Commit: a943113f6141e5af9b58502094749ac821976e17
Parents: ecc57ee
Author: Jason <ji...@163.com>
Authored: Tue May 10 14:32:43 2016 +0800
Committer: Jason <ji...@163.com>
Committed: Tue May 10 14:32:43 2016 +0800
----------------------------------------------------------------------
webapp/app/partials/jobs/jobList.html | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/a943113f/webapp/app/partials/jobs/jobList.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/jobs/jobList.html b/webapp/app/partials/jobs/jobList.html
index 8b122cc..98fb25d 100644
--- a/webapp/app/partials/jobs/jobList.html
+++ b/webapp/app/partials/jobs/jobList.html
@@ -124,8 +124,7 @@
<td>{{ job.last_modified == 0 ? '' : (job.last_modified |utcToConfigTimeZone)}}</td>
<td>{{(job.duration/60 | number:2) + ' mins'}}</td>
<td>
- <div class="btn-group"
- ng-if="job.job_status!='DISCARDED' && job.job_status!='FINISHED'">
+ <div class="btn-group">
<button type="button" class="btn btn-default btn-xs dropdown-toggle"
data-toggle="dropdown">
Action <span class="ace-icon fa fa-caret-down icon-on-right"></span>
@@ -134,11 +133,12 @@
<li ng-if="job.job_status=='ERROR'"><a ng-click="resume(job)">Resume</a></li>
<li ng-if="job.job_status=='RUNNING' || job.job_status=='NEW' || job.job_status=='PENDING' || job.job_status=='ERROR'">
<a ng-click="cancel(job)">Discard</a>
+ </li>
+ <li>
<a ng-click="diagnosisJob(job)" tooltip="Download Diagnosis Info For This Job">Diagnosis</a>
</li>
</ul>
</div>
- <span ng-if="job.job_status=='DISCARDED' || job.job_status=='FINISHED'">N/A</span>
</td>
<td>
<button class="btn btn-info btn-xs" ng-click="state.showSteps= !state.showSteps; state.selectedJob = job">
[2/2] kylin git commit: KYLIN-1662 tableName truncated issue
Posted by zh...@apache.org.
KYLIN-1662 tableName truncated issue
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/d83a3288
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/d83a3288
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/d83a3288
Branch: refs/heads/master
Commit: d83a32888d59155928079d01da9505e94e142af4
Parents: a943113
Author: Jason <ji...@163.com>
Authored: Tue May 10 14:33:57 2016 +0800
Committer: Jason <ji...@163.com>
Committed: Tue May 10 14:33:57 2016 +0800
----------------------------------------------------------------------
.../java/org/apache/kylin/rest/controller/TableController.java | 2 +-
webapp/app/js/services/tables.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/d83a3288/server/src/main/java/org/apache/kylin/rest/controller/TableController.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/controller/TableController.java b/server/src/main/java/org/apache/kylin/rest/controller/TableController.java
index 3be769d..b0da2db 100644
--- a/server/src/main/java/org/apache/kylin/rest/controller/TableController.java
+++ b/server/src/main/java/org/apache/kylin/rest/controller/TableController.java
@@ -103,7 +103,7 @@ public class TableController extends BasicController {
* @return Table metadata array
* @throws IOException
*/
- @RequestMapping(value = "/{tableName}/load", method = { RequestMethod.GET })
+ @RequestMapping(value = "/{tableName:.+}", method = { RequestMethod.GET })
@ResponseBody
public TableDesc getHiveTable(@PathVariable String tableName) {
return cubeMgmtService.getMetadataManager().getTableDesc(tableName);
http://git-wip-us.apache.org/repos/asf/kylin/blob/d83a3288/webapp/app/js/services/tables.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/services/tables.js b/webapp/app/js/services/tables.js
index dec32bb..4199d6c 100755
--- a/webapp/app/js/services/tables.js
+++ b/webapp/app/js/services/tables.js
@@ -19,7 +19,7 @@
KylinApp.factory('TableService', ['$resource', function ($resource, config) {
return $resource(Config.service.url + 'tables/:tableName/:action/:database', {}, {
list: {method: 'GET', params: {}, cache: true, isArray: true},
- get: {method: 'GET', params: {action:'load'}, isArray: false},
+ get: {method: 'GET', params: {}, isArray: false},
getExd: {method: 'GET', params: {action: 'exd-map'}, isArray: false},
reload: {method: 'PUT', params: {action: 'reload'}, isArray: false},
loadHiveTable: {method: 'POST', params: {}, isArray: false},