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/29 10:37:42 UTC
kylin git commit: fix ci and enable HTable read-only
Repository: kylin
Updated Branches:
refs/heads/1.x-staging 16e5466c0 -> 7fef20524
fix ci and enable HTable read-only
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/7fef2052
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/7fef2052
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/7fef2052
Branch: refs/heads/1.x-staging
Commit: 7fef205240afabd44effddfafc26cad3472a7382
Parents: 16e5466
Author: shaofengshi <sh...@apache.org>
Authored: Tue Dec 29 17:36:57 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Tue Dec 29 17:36:57 2015 +0800
----------------------------------------------------------------------
.../org/apache/kylin/job/hadoop/hbase/CreateHTableJob.java | 1 +
.../java/org/apache/kylin/rest/controller/CubeController.java | 7 ++++---
.../org/apache/kylin/rest/controller/CubeControllerTest.java | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/7fef2052/job/src/main/java/org/apache/kylin/job/hadoop/hbase/CreateHTableJob.java
----------------------------------------------------------------------
diff --git a/job/src/main/java/org/apache/kylin/job/hadoop/hbase/CreateHTableJob.java b/job/src/main/java/org/apache/kylin/job/hadoop/hbase/CreateHTableJob.java
index 027c0ca..af2850c 100644
--- a/job/src/main/java/org/apache/kylin/job/hadoop/hbase/CreateHTableJob.java
+++ b/job/src/main/java/org/apache/kylin/job/hadoop/hbase/CreateHTableJob.java
@@ -79,6 +79,7 @@ public class CreateHTableJob extends AbstractHadoopJob {
// https://hbase.apache.org/apidocs/org/apache/hadoop/hbase/regionserver/ConstantSizeRegionSplitPolicy.html
tableDesc.setValue(HTableDescriptor.SPLIT_POLICY, ConstantSizeRegionSplitPolicy.class.getName());
tableDesc.setValue(IRealizationConstants.HTableTag, config.getMetadataUrlPrefix());
+ tableDesc.setReadOnly(true);
Configuration conf = HadoopUtil.getCurrentHBaseConfiguration();
HBaseAdmin admin = new HBaseAdmin(conf);
http://git-wip-us.apache.org/repos/asf/kylin/blob/7fef2052/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 2538f57..182a34d 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
@@ -278,7 +278,7 @@ public class CubeController extends BasicController {
//model name same as cube
modelDesc.setName(targetCubeName);
modelDesc.setLastModified(0);
- modelDesc.setUuid(UUID.randomUUID().toString());
+ modelDesc.updateRandomUuid();
DataModelDesc newModel = null;
try {
newModel = metaManager.createDataModelDesc(modelDesc);
@@ -288,7 +288,7 @@ public class CubeController extends BasicController {
cubeDesc.setName(targetCubeName);
cubeDesc.setLastModified(0);
- cubeDesc.setUuid(UUID.randomUUID().toString());
+ cubeDesc.updateRandomUuid();
cubeDesc.setModelName(targetCubeName);
CubeInstance newCube = null;
try {
@@ -372,6 +372,7 @@ public class CubeController extends BasicController {
}
try {
+ modelDesc.updateRandomUuid();
metaManager.createDataModelDesc(modelDesc);
} catch (IOException e) {
logger.error("Failed to deal with the request:" + e.getLocalizedMessage(), e);
@@ -382,7 +383,7 @@ public class CubeController extends BasicController {
try {
- desc.setUuid(UUID.randomUUID().toString());
+ desc.updateRandomUuid();
String projectName = (null == cubeRequest.getProject()) ? ProjectInstance.DEFAULT_PROJECT_NAME : cubeRequest.getProject();
CubeInstance createdCube = cubeService.createCubeAndDesc(desc.getName(), projectName, desc);
updateCubeSuccess = true;
http://git-wip-us.apache.org/repos/asf/kylin/blob/7fef2052/server/src/test/java/org/apache/kylin/rest/controller/CubeControllerTest.java
----------------------------------------------------------------------
diff --git a/server/src/test/java/org/apache/kylin/rest/controller/CubeControllerTest.java b/server/src/test/java/org/apache/kylin/rest/controller/CubeControllerTest.java
index feb8261..0d14711 100644
--- a/server/src/test/java/org/apache/kylin/rest/controller/CubeControllerTest.java
+++ b/server/src/test/java/org/apache/kylin/rest/controller/CubeControllerTest.java
@@ -127,7 +127,7 @@ public class CubeControllerTest extends ServiceTestBase {
Assert.assertNotNull(cubeController.getSql(SRC_CUBE_NAME, "20130331080000_20131212080000"));
Assert.assertNotNull(cubeController.getCubes(null, null, 0, 5));
- DataModelDesc model = modelController.getModel(TEST_CUBE_NAME);
+ DataModelDesc model = modelController.getModel(TEST_MODEL_NAME);
Assert.assertNotNull(model);
List<String> notifyList = Lists.newArrayList();