You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2015/03/03 11:13:36 UTC
[1/5] incubator-kylin git commit: only delete related type job when
run buildWithEngineTest
Repository: incubator-kylin
Updated Branches:
refs/heads/staging [created] 352b32be6
only delete related type job when run buildWithEngineTest
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/1a9556f1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/1a9556f1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/1a9556f1
Branch: refs/heads/staging
Commit: 1a9556f1e0f6b882c8d085be803fdbb3d63d2249
Parents: d804e60
Author: jiazhong <ji...@ebay.com>
Authored: Mon Mar 2 17:48:52 2015 +0800
Committer: jiazhong <ji...@ebay.com>
Committed: Mon Mar 2 17:48:52 2015 +0800
----------------------------------------------------------------------
.../test/java/org/apache/kylin/job/BuildCubeWithEngineTest.java | 4 +++-
.../test/java/org/apache/kylin/job/BuildIIWithEngineTest.java | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1a9556f1/job/src/test/java/org/apache/kylin/job/BuildCubeWithEngineTest.java
----------------------------------------------------------------------
diff --git a/job/src/test/java/org/apache/kylin/job/BuildCubeWithEngineTest.java b/job/src/test/java/org/apache/kylin/job/BuildCubeWithEngineTest.java
index 5e5b191..2a5bacb 100644
--- a/job/src/test/java/org/apache/kylin/job/BuildCubeWithEngineTest.java
+++ b/job/src/test/java/org/apache/kylin/job/BuildCubeWithEngineTest.java
@@ -103,7 +103,9 @@ public class BuildCubeWithEngineTest {
cubeManager = CubeManager.getInstance(kylinConfig);
jobEngineConfig = new JobEngineConfig(kylinConfig);
for (String jobId : jobService.getAllJobIds()) {
- jobService.deleteJob(jobId);
+ if(jobService.getJob(jobId) instanceof CubingJob){
+ jobService.deleteJob(jobId);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1a9556f1/job/src/test/java/org/apache/kylin/job/BuildIIWithEngineTest.java
----------------------------------------------------------------------
diff --git a/job/src/test/java/org/apache/kylin/job/BuildIIWithEngineTest.java b/job/src/test/java/org/apache/kylin/job/BuildIIWithEngineTest.java
index 01e1d62..840c5db 100644
--- a/job/src/test/java/org/apache/kylin/job/BuildIIWithEngineTest.java
+++ b/job/src/test/java/org/apache/kylin/job/BuildIIWithEngineTest.java
@@ -115,7 +115,9 @@ public class BuildIIWithEngineTest {
iiManager = IIManager.getInstance(kylinConfig);
jobEngineConfig = new JobEngineConfig(kylinConfig);
for (String jobId : jobService.getAllJobIds()) {
- jobService.deleteJob(jobId);
+ if(jobService.getJob(jobId) instanceof IIJob){
+ jobService.deleteJob(jobId);
+ }
}
IIInstance ii = iiManager.getII(TEST_II_NAME);
[4/5] incubator-kylin git commit: Merge pull request #435 from
janzhongi/inverted-index
Posted by li...@apache.org.
Merge pull request #435 from janzhongi/inverted-index
stopPropagation for actions on cube
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/7fcc89bc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/7fcc89bc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/7fcc89bc
Branch: refs/heads/staging
Commit: 7fcc89bc5c92a3d10424979cf963abb8ffefc6d7
Parents: 7f21f20 698537b
Author: Zhong,Jian <ji...@ebay.com>
Authored: Tue Mar 3 16:13:02 2015 +0800
Committer: Zhong,Jian <ji...@ebay.com>
Committed: Tue Mar 3 16:13:02 2015 +0800
----------------------------------------------------------------------
webapp/app/partials/cubes/cubes.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[3/5] incubator-kylin git commit: stopPropagation for actions on cube
Posted by li...@apache.org.
stopPropagation for actions on cube
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/698537bf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/698537bf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/698537bf
Branch: refs/heads/staging
Commit: 698537bf16eafbce9e9bac81d7928ffaaad22a8b
Parents: 7f21f20
Author: jiazhong <ji...@ebay.com>
Authored: Tue Mar 3 16:11:56 2015 +0800
Committer: jiazhong <ji...@ebay.com>
Committed: Tue Mar 3 16:11:56 2015 +0800
----------------------------------------------------------------------
webapp/app/partials/cubes/cubes.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/698537bf/webapp/app/partials/cubes/cubes.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubes/cubes.html b/webapp/app/partials/cubes/cubes.html
index 19fd7d1..0a9676a 100644
--- a/webapp/app/partials/cubes/cubes.html
+++ b/webapp/app/partials/cubes/cubes.html
@@ -106,7 +106,7 @@
<td>{{ cube.owner}}</td>
<td>{{ cube.create_time_utc | utcToConfigTimeZone}}</td>
<td>
- <div class="btn-group" ng-if="userService.hasRole('ROLE_ADMIN') || hasPermission(cube, permissions.ADMINISTRATION.mask, permissions.MANAGEMENT.mask, permissions.OPERATION.mask)">
+ <div ng-click="$event.stopPropagation();" class="btn-group" ng-if="userService.hasRole('ROLE_ADMIN') || hasPermission(cube, permissions.ADMINISTRATION.mask, permissions.MANAGEMENT.mask, permissions.OPERATION.mask)">
<button type="button" class="btn btn-default btn-xs dropdown-toggle"
data-toggle="dropdown" ng-click="listAccess(cube, 'CubeInstance')">
Action <span class="ace-icon fa fa-caret-down icon-on-right"></span>
@@ -130,7 +130,7 @@
</span>
</td>
<td ng-if="userService.hasRole('ROLE_ADMIN')">
- <div class="btn-group">
+ <div ng-click="$event.stopPropagation();" class="btn-group">
<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" ng-click="listAccess(cube, 'CubeInstance')">
Action <span class="ace-icon fa fa-caret-down icon-on-right"></span>
</button>
[2/5] incubator-kylin git commit: Merge pull request #433 from
janzhongi/inverted-index
Posted by li...@apache.org.
Merge pull request #433 from janzhongi/inverted-index
only delete related type job when run buildWithEngineTest
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/7f21f20a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/7f21f20a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/7f21f20a
Branch: refs/heads/staging
Commit: 7f21f20a020c68240a5f29bf98e9e9a8c6d3a89f
Parents: 8e011db 1a9556f
Author: Zhong,Jian <ji...@ebay.com>
Authored: Mon Mar 2 17:49:45 2015 +0800
Committer: Zhong,Jian <ji...@ebay.com>
Committed: Mon Mar 2 17:49:45 2015 +0800
----------------------------------------------------------------------
.../test/java/org/apache/kylin/job/BuildCubeWithEngineTest.java | 4 +++-
.../test/java/org/apache/kylin/job/BuildIIWithEngineTest.java | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[5/5] incubator-kylin git commit: Merge branch 'inverted-index' of
https://git-wip-us.apache.org/repos/asf/incubator-kylin into inverted-index
Posted by li...@apache.org.
Merge branch 'inverted-index' of https://git-wip-us.apache.org/repos/asf/incubator-kylin into inverted-index
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/352b32be
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/352b32be
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/352b32be
Branch: refs/heads/staging
Commit: 352b32be6ab3598a8136424f10c1418f546b88fd
Parents: 7fcc89b 2b53d66
Author: Li Yang <li...@apache.org>
Authored: Tue Mar 3 10:02:40 2015 +0000
Committer: Li Yang <li...@apache.org>
Committed: Tue Mar 3 10:02:40 2015 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------