You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2015/12/24 04:15:49 UTC
[1/2] kylin git commit: KYLIN-1250 fix NPE when discarding a job
Repository: kylin
Updated Branches:
refs/heads/1.x-staging 20104d3d9 -> 7a41f44c5
KYLIN-1250 fix NPE when discarding a job
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/87ac53b5
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/87ac53b5
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/87ac53b5
Branch: refs/heads/1.x-staging
Commit: 87ac53b5cd85e05ef0e58e8ebe60f75839acf686
Parents: 20104d3
Author: shaofengshi <sh...@apache.org>
Authored: Thu Dec 24 10:58:04 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Thu Dec 24 11:15:23 2015 +0800
----------------------------------------------------------------------
.../main/java/org/apache/kylin/cube/CubeDescManager.java | 10 +---------
.../org/apache/kylin/rest/controller/CubeController.java | 8 ++++++++
.../java/org/apache/kylin/rest/service/JobService.java | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/87ac53b5/cube/src/main/java/org/apache/kylin/cube/CubeDescManager.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/org/apache/kylin/cube/CubeDescManager.java b/cube/src/main/java/org/apache/kylin/cube/CubeDescManager.java
index dfb1b88..89f8b01 100644
--- a/cube/src/main/java/org/apache/kylin/cube/CubeDescManager.java
+++ b/cube/src/main/java/org/apache/kylin/cube/CubeDescManager.java
@@ -252,15 +252,7 @@ public class CubeDescManager {
}
desc.setSignature(desc.calculateSignature());
-
- // drop cube segments if signature changes
- CubeInstance cube = getCubeManager().getCube(desc.getName());
- if (cube != null && !StringUtils.equals(desc.getSignature(), cube.getDescriptor().getSignature())) {
- logger.info("Detect signature change of [" + desc.getName() + "], drop all existing segments");
- cube.getSegments().clear();
- getCubeManager().updateCube(cube);
- }
-
+
// Save Source
String path = desc.getResourcePath();
getStore().putResource(path, desc, CUBE_DESC_SERIALIZER);
http://git-wip-us.apache.org/repos/asf/kylin/blob/87ac53b5/server/src/main/java/org/apache/kylin/rest/controller/CubeController.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/controller/CubeController.java b/server/src/main/java/org/apache/kylin/rest/controller/CubeController.java
index 679e4e6..85cbae7 100644
--- a/server/src/main/java/org/apache/kylin/rest/controller/CubeController.java
+++ b/server/src/main/java/org/apache/kylin/rest/controller/CubeController.java
@@ -459,9 +459,17 @@ public class CubeController extends BasicController {
}
CubeInstance cube = cubeService.getCubeManager().getCube(cubeName);
+ String previousCubeDescSignature = cube.getDescriptor().getSignature();
String projectName = (null == cubeRequest.getProject()) ? ProjectInstance.DEFAULT_PROJECT_NAME : cubeRequest.getProject();
desc = cubeService.updateCubeAndDesc(cube, desc, projectName);
+ // drop cube segments if signature changes
+ if (!StringUtils.equals(desc.getSignature(), previousCubeDescSignature)) {
+ logger.info("Detect signature change of [" + desc.getName() + "], drop all existing segments");
+ cube = cubeService.getCubeManager().getCube(cubeName);
+ cubeService.purgeCube(cube);
+ }
+
ProjectManager projectManager = cubeService.getProjectManager();
if (!cubeService.isCubeInProject(projectName, cube)) {
String owner = SecurityContextHolder.getContext().getAuthentication().getName();
http://git-wip-us.apache.org/repos/asf/kylin/blob/87ac53b5/server/src/main/java/org/apache/kylin/rest/service/JobService.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/service/JobService.java b/server/src/main/java/org/apache/kylin/rest/service/JobService.java
index 0903f83..1be9bd5 100644
--- a/server/src/main/java/org/apache/kylin/rest/service/JobService.java
+++ b/server/src/main/java/org/apache/kylin/rest/service/JobService.java
@@ -312,7 +312,7 @@ public class JobService extends BasicService {
CubeInstance cubeInstance = getCubeManager().getCube(job.getRelatedCube());
for (String segmentId : segmentIds) {
final CubeSegment segment = cubeInstance.getSegmentById(segmentId);
- if (segment.getStatus() == SegmentStatusEnum.NEW) {
+ if (segment != null && segment.getStatus() == SegmentStatusEnum.NEW) {
cubeInstance.getSegments().remove(segment);
getCubeManager().updateCube(cubeInstance);
}
[2/2] kylin git commit: KYLIN-1234 enable ACL check on query
Posted by sh...@apache.org.
KYLIN-1234 enable ACL check on query
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/7a41f44c
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/7a41f44c
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/7a41f44c
Branch: refs/heads/1.x-staging
Commit: 7a41f44c5a254189b938668d505c1c611818f253
Parents: 87ac53b
Author: shaofengshi <sh...@apache.org>
Authored: Thu Dec 24 11:14:21 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Thu Dec 24 11:15:24 2015 +0800
----------------------------------------------------------------------
common/src/main/java/org/apache/kylin/common/KylinConfig.java | 2 +-
conf/kylin.properties | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/7a41f44c/common/src/main/java/org/apache/kylin/common/KylinConfig.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/kylin/common/KylinConfig.java b/common/src/main/java/org/apache/kylin/common/KylinConfig.java
index 8a123dc..b043b2a 100644
--- a/common/src/main/java/org/apache/kylin/common/KylinConfig.java
+++ b/common/src/main/java/org/apache/kylin/common/KylinConfig.java
@@ -485,7 +485,7 @@ public class KylinConfig {
}
public boolean isQuerySecureEnabled() {
- return Boolean.parseBoolean(this.getOptional("kylin.query.security.enabled", "false"));
+ return Boolean.parseBoolean(this.getOptional("kylin.query.security.enabled", "true"));
}
public boolean isQueryCacheEnabled() {
http://git-wip-us.apache.org/repos/asf/kylin/blob/7a41f44c/conf/kylin.properties
----------------------------------------------------------------------
diff --git a/conf/kylin.properties b/conf/kylin.properties
index 7f2af8a..68db224 100644
--- a/conf/kylin.properties
+++ b/conf/kylin.properties
@@ -80,6 +80,9 @@ kylin.hbase.region.cut.large=100
kylin.hbase.region.count.min=1
kylin.hbase.region.count.max=500
+# Enable/disable ACL check for cube query
+kylin.query.security.enabled=true
+
## Config for Restful APP ##
# database connection settings:
ldap.server=