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/01/23 09:32:36 UTC
[49/50] [abbrv] incubator-kylin git commit: Merge branch
'inverted-index' of https://github.com/KylinOLAP/Kylin into inverted-index
Merge branch 'inverted-index' of https://github.com/KylinOLAP/Kylin into inverted-index
Conflicts:
job/src/main/java/com/kylinolap/job/cube/UpdateCubeInfoAfterBuildStep.java
job/src/main/java/com/kylinolap/job/cube/UpdateCubeInfoAfterMergeStep.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/d72f7895
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/d72f7895
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/d72f7895
Branch: refs/heads/inverted-index
Commit: d72f7895abe4f7b0d2ba6db9f1aeea00a74ffd41
Parents: ccfecdb 1a1fd07
Author: qianhao.zhou <qi...@ebay.com>
Authored: Fri Jan 23 16:21:34 2015 +0800
Committer: qianhao.zhou <qi...@ebay.com>
Committed: Fri Jan 23 16:21:34 2015 +0800
----------------------------------------------------------------------
.../java/com/kylinolap/cube/CubeManager.java | 157 ++++++++++++++----
.../kylinolap/cube/CubeSegmentValidator.java | 161 -------------------
.../java/com/kylinolap/cube/model/CubeDesc.java | 13 +-
.../kylinolap/job/cube/MergeDictionaryStep.java | 14 +-
.../job/cube/UpdateCubeInfoAfterBuildStep.java | 7 +-
.../job/cube/UpdateCubeInfoAfterMergeStep.java | 30 ++--
.../kylinolap/job/hadoop/AbstractHadoopJob.java | 10 +-
.../cardinality/HiveColumnCardinalityJob.java | 2 +-
.../HiveColumnCardinalityUpdateJob.java | 2 +-
.../kylinolap/job/hadoop/cube/CuboidJob.java | 14 +-
.../job/hadoop/cube/MergeCuboidJob.java | 3 +-
.../cube/RowKeyDistributionCheckerJob.java | 2 +-
.../job/hadoop/cube/StorageCleanupJob.java | 2 +-
.../job/hadoop/dict/CreateDictionaryJob.java | 2 +-
.../dict/CreateInvertedIndexDictionaryJob.java | 2 +-
.../job/hadoop/hbase/CreateHTableJob.java | 2 +-
.../hadoop/invertedindex/IICreateHTableJob.java | 2 +-
.../kylinolap/job/tools/CubeMigrationCLI.java | 4 +-
18 files changed, 185 insertions(+), 244 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/d72f7895/job/src/main/java/com/kylinolap/job/cube/MergeDictionaryStep.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/d72f7895/job/src/main/java/com/kylinolap/job/cube/UpdateCubeInfoAfterBuildStep.java
----------------------------------------------------------------------
diff --cc job/src/main/java/com/kylinolap/job/cube/UpdateCubeInfoAfterBuildStep.java
index f9539c1,1ac2257..d07a8cf
--- a/job/src/main/java/com/kylinolap/job/cube/UpdateCubeInfoAfterBuildStep.java
+++ b/job/src/main/java/com/kylinolap/job/cube/UpdateCubeInfoAfterBuildStep.java
@@@ -13,9 -13,7 +13,7 @@@ import com.kylinolap.job.dao.Executable
import com.kylinolap.job.exception.ExecuteException;
import com.kylinolap.job.execution.ExecutableContext;
import com.kylinolap.job.execution.ExecuteResult;
-import com.kylinolap.job.impl.threadpool.AbstractExecutable;
+import com.kylinolap.job.execution.AbstractExecutable;
- import com.kylinolap.metadata.model.SegmentStatusEnum;
- import com.kylinolap.metadata.realization.RealizationStatusEnum;
/**
* Created by qianzhou on 1/4/15.
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/d72f7895/job/src/main/java/com/kylinolap/job/cube/UpdateCubeInfoAfterMergeStep.java
----------------------------------------------------------------------
diff --cc job/src/main/java/com/kylinolap/job/cube/UpdateCubeInfoAfterMergeStep.java
index 7d6d4a4,dfcab68..c045179
--- a/job/src/main/java/com/kylinolap/job/cube/UpdateCubeInfoAfterMergeStep.java
+++ b/job/src/main/java/com/kylinolap/job/cube/UpdateCubeInfoAfterMergeStep.java
@@@ -7,18 -14,11 +7,17 @@@ import com.kylinolap.cube.CubeInstance
import com.kylinolap.cube.CubeManager;
import com.kylinolap.cube.CubeSegment;
import com.kylinolap.job.constant.ExecutableConstants;
-import com.kylinolap.job.dao.JobPO;
+import com.kylinolap.job.dao.ExecutablePO;
import com.kylinolap.job.exception.ExecuteException;
++import com.kylinolap.job.execution.AbstractExecutable;
import com.kylinolap.job.execution.ExecutableContext;
import com.kylinolap.job.execution.ExecuteResult;
- import com.kylinolap.job.execution.AbstractExecutable;
- import com.kylinolap.metadata.model.SegmentStatusEnum;
-import com.kylinolap.job.impl.threadpool.AbstractExecutable;
+import org.apache.commons.lang.StringUtils;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
/**
* Created by qianzhou on 1/7/15.
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/d72f7895/job/src/main/java/com/kylinolap/job/hadoop/cube/StorageCleanupJob.java
----------------------------------------------------------------------