[kylin] branch KYLIN-3369 updated: minor, fix ci

[shaofengshi]

This is an automated email from the ASF dual-hosted git repository.

shaofengshi pushed a commit to branch KYLIN-3369
in repository https://gitbox.apache.org/repos/asf/kylin.git


The following commit(s) were added to refs/heads/KYLIN-3369 by this push:
     new c4f38a5  minor, fix ci
c4f38a5 is described below

commit c4f38a5b8f6bd318d7792f94be99001e81f4d586
Author: shaofengshi <shaofeng...@apache.org>
AuthorDate: Thu May 31 11:45:23 2018 +0800

    minor, fix ci
---
 .../java/org/apache/kylin/source/kafka/KafkaMRInput.java     | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git 
a/source-kafka/src/main/java/org/apache/kylin/source/kafka/KafkaMRInput.java 
b/source-kafka/src/main/java/org/apache/kylin/source/kafka/KafkaMRInput.java
index b2c5360..a55b120 100644
--- a/source-kafka/src/main/java/org/apache/kylin/source/kafka/KafkaMRInput.java
+++ b/source-kafka/src/main/java/org/apache/kylin/source/kafka/KafkaMRInput.java
@@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory;
 public class KafkaMRInput implements IMRInput {
 
     private static final Logger logger = 
LoggerFactory.getLogger(KafkaMRInput.class);
-    CubeSegment cubeSegment;
+    private CubeSegment cubeSegment;
 
     @Override
     public IMRBatchCubingInputSide 
getBatchCubingInputSide(IJoinedFlatTableDesc flatDesc) {
@@ -122,6 +122,7 @@ public class KafkaMRInput implements IMRInput {
         protected String hiveTableDatabase;
         private List<String> intermediateTables = Lists.newArrayList();
         private List<String> intermediatePaths = Lists.newArrayList();
+        private String cubeName;
 
         public BatchCubingInputSide(CubeSegment seg, IJoinedFlatTableDesc 
flatDesc) {
             config = seg.getConfig();
@@ -129,6 +130,7 @@ public class KafkaMRInput implements IMRInput {
             this.hiveTableDatabase = 
config.getHiveDatabaseForIntermediateTable();
             this.seg = seg;
             this.cubeDesc = seg.getCubeDesc();
+            this.cubeName = seg.getCubeInstance().getName();
         }
 
         @Override
@@ -144,7 +146,7 @@ public class KafkaMRInput implements IMRInput {
                 intermediateTables.add(intermediateFactTable);
                 intermediatePaths.add(baseLocation + "/" + 
intermediateFactTable);
             } else {
-                final String mockFactTableName =  
MetadataConstants.KYLIN_INTERMEDIATE_PREFIX + cubeDesc.getName().toLowerCase() 
+ "_"
+                final String mockFactTableName =  
MetadataConstants.KYLIN_INTERMEDIATE_PREFIX + cubeName.toLowerCase() + "_"
                         + seg.getUuid().replaceAll("-", "_") + "_fact";
                 jobFlow.addTask(createSaveKafkaDataStep(jobFlow.getId(), 
baseLocation + "/" + mockFactTableName));
                 jobFlow.addTask(createMockFactTable(mockFactTableName, 
baseLocation));
@@ -164,7 +166,7 @@ public class KafkaMRInput implements IMRInput {
             insertDataHqls = 
insertDataHqls.replace(flatDesc.getDataModel().getRootFactTableName() + " ", 
mockRootTableName + " ");
 
             CreateFlatHiveTableStep step = new CreateFlatHiveTableStep();
-            CubingExecutableUtil.setCubeName(cubeDesc.getName(), 
step.getParams());
+            CubingExecutableUtil.setCubeName(cubeName, step.getParams());
             step.setInitStatement(hiveInitStatements);
             step.setCreateTableStatement(dropTableHql + createTableHql + 
insertDataHqls);
             step.setName(ExecutableConstants.STEP_NAME_CREATE_FLAT_HIVE_TABLE);
@@ -236,7 +238,7 @@ public class KafkaMRInput implements IMRInput {
             CreateFlatHiveTableStep step = new CreateFlatHiveTableStep();
             step.setInitStatement(hiveInitStatements);
             step.setCreateTableStatement(dropTableHql + createTableHql);
-            CubingExecutableUtil.setCubeName(cubeDesc.getName(), 
step.getParams());
+            CubingExecutableUtil.setCubeName(cubeName, step.getParams());
             step.setName(ExecutableConstants.STEP_NAME_CREATE_HIVE_TABLE);
             return step;
         }
@@ -289,7 +291,7 @@ public class KafkaMRInput implements IMRInput {
             final MergeOffsetStep result = new MergeOffsetStep();
             result.setName("Merge offset step");
 
-            
CubingExecutableUtil.setCubeName(cubeSegment.getRealization().getName(), 
result.getParams());
+            
CubingExecutableUtil.setCubeName(cubeSegment.getCubeInstance().getName(), 
result.getParams());
             CubingExecutableUtil.setSegmentId(cubeSegment.getUuid(), 
result.getParams());
             CubingExecutableUtil.setCubingJobId(jobFlow.getId(), 
result.getParams());
             jobFlow.addTask(result);

-- 
To stop receiving notification emails like this one, please contact
shaofeng...@apache.org.