Repository: kylin Updated Branches: refs/heads/master 9c578e709 -> 9595b1603
KYLIN-1858 further remove IRealizationSegment Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/9595b160 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/9595b160 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/9595b160 Branch: refs/heads/master Commit: 9595b160340a08398e0fe5de0ec5cbcf954e1ebb Parents: 9c578e7 Author: Li Yang <[email protected]> Authored: Mon Jul 11 13:59:22 2016 +0800 Committer: Li Yang <[email protected]> Committed: Mon Jul 11 13:59:34 2016 +0800 ---------------------------------------------------------------------- .../java/org/apache/kylin/cube/CubeSegment.java | 9 +---- .../realization/IRealizationSegment.java | 40 -------------------- .../org/apache/kylin/engine/mr/IMRInput.java | 4 +- .../kylin/engine/mr/JobBuilderSupport.java | 5 +-- .../java/org/apache/kylin/engine/mr/MRUtil.java | 3 +- .../apache/kylin/source/hive/HiveMRInput.java | 8 ++-- .../kylin/storage/hbase/steps/HBaseMRSteps.java | 3 +- 7 files changed, 12 insertions(+), 60 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/9595b160/core-cube/src/main/java/org/apache/kylin/cube/CubeSegment.java ---------------------------------------------------------------------- diff --git a/core-cube/src/main/java/org/apache/kylin/cube/CubeSegment.java b/core-cube/src/main/java/org/apache/kylin/cube/CubeSegment.java index fb6aa05..dca4381 100644 --- a/core-cube/src/main/java/org/apache/kylin/cube/CubeSegment.java +++ b/core-cube/src/main/java/org/apache/kylin/cube/CubeSegment.java @@ -36,11 +36,11 @@ import org.apache.kylin.cube.kv.CubeDimEncMap; import org.apache.kylin.cube.kv.RowConstants; import org.apache.kylin.cube.model.CubeDesc; import org.apache.kylin.cube.model.CubeJoinedFlatTableDesc; +import org.apache.kylin.metadata.model.IBuildable; import org.apache.kylin.metadata.model.IJoinedFlatTableDesc; import org.apache.kylin.metadata.model.SegmentStatusEnum; import org.apache.kylin.metadata.model.TblColRef; import org.apache.kylin.metadata.realization.IRealization; -import org.apache.kylin.metadata.realization.IRealizationSegment; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility; @@ -51,7 +51,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; @JsonAutoDetect(fieldVisibility = Visibility.NONE, getterVisibility = Visibility.NONE, isGetterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE) -public class CubeSegment implements Comparable<CubeSegment>, IRealizationSegment { +public class CubeSegment implements Comparable<CubeSegment>, IBuildable { @JsonBackReference private CubeInstance cubeInstance; @@ -138,7 +138,6 @@ public class CubeSegment implements Comparable<CubeSegment>, IRealizationSegment // ============================================================================ - @Override public KylinConfig getConfig() { return cubeInstance.getConfig(); } @@ -151,7 +150,6 @@ public class CubeSegment implements Comparable<CubeSegment>, IRealizationSegment this.uuid = id; } - @Override public String getName() { return name; } @@ -248,7 +246,6 @@ public class CubeSegment implements Comparable<CubeSegment>, IRealizationSegment this.cubeInstance = cubeInstance; } - @Override public String getStorageLocationIdentifier() { return storageLocationIdentifier; } @@ -513,12 +510,10 @@ public class CubeSegment implements Comparable<CubeSegment>, IRealizationSegment return this.blackoutCuboids; } - @Override public IRealization getRealization() { return cubeInstance; } - @Override public IJoinedFlatTableDesc getJoinedFlatTableDesc() { return new CubeJoinedFlatTableDesc(this.getCubeDesc(), this); } http://git-wip-us.apache.org/repos/asf/kylin/blob/9595b160/core-metadata/src/main/java/org/apache/kylin/metadata/realization/IRealizationSegment.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/realization/IRealizationSegment.java b/core-metadata/src/main/java/org/apache/kylin/metadata/realization/IRealizationSegment.java deleted file mode 100644 index 3a1a2e7..0000000 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/realization/IRealizationSegment.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. -*/ - -package org.apache.kylin.metadata.realization; - -import org.apache.kylin.common.KylinConfig; -import org.apache.kylin.metadata.model.IBuildable; -import org.apache.kylin.metadata.model.IJoinedFlatTableDesc; - -/** - */ -public interface IRealizationSegment extends IBuildable { - - public KylinConfig getConfig(); - - public String getUuid(); - - public String getName(); - - public String getStorageLocationIdentifier(); - - public IRealization getRealization(); - - public IJoinedFlatTableDesc getJoinedFlatTableDesc(); -} http://git-wip-us.apache.org/repos/asf/kylin/blob/9595b160/engine-mr/src/main/java/org/apache/kylin/engine/mr/IMRInput.java ---------------------------------------------------------------------- diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/IMRInput.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/IMRInput.java index a61e0dd..336a66f 100644 --- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/IMRInput.java +++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/IMRInput.java @@ -19,9 +19,9 @@ package org.apache.kylin.engine.mr; import org.apache.hadoop.mapreduce.Job; +import org.apache.kylin.cube.CubeSegment; import org.apache.kylin.job.execution.DefaultChainedExecutable; import org.apache.kylin.metadata.model.TableDesc; -import org.apache.kylin.metadata.realization.IRealizationSegment; /** * Any ITableSource that wishes to serve as input of MapReduce build engine must adapt to this interface. @@ -29,7 +29,7 @@ import org.apache.kylin.metadata.realization.IRealizationSegment; public interface IMRInput { /** Return a helper to participate in batch cubing job flow. */ - public IMRBatchCubingInputSide getBatchCubingInputSide(IRealizationSegment seg); + public IMRBatchCubingInputSide getBatchCubingInputSide(CubeSegment seg); /** Return an InputFormat that reads from specified table. */ public IMRTableInputFormat getTableInputFormat(TableDesc table); http://git-wip-us.apache.org/repos/asf/kylin/blob/9595b160/engine-mr/src/main/java/org/apache/kylin/engine/mr/JobBuilderSupport.java ---------------------------------------------------------------------- diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/JobBuilderSupport.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/JobBuilderSupport.java index 5a82fe5..010eeeb 100644 --- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/JobBuilderSupport.java +++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/JobBuilderSupport.java @@ -33,7 +33,6 @@ import org.apache.kylin.engine.mr.steps.UpdateCubeInfoAfterBuildStep; import org.apache.kylin.engine.mr.steps.UpdateCubeInfoAfterMergeStep; import org.apache.kylin.job.constant.ExecutableConstants; import org.apache.kylin.job.engine.JobEngineConfig; -import org.apache.kylin.metadata.realization.IRealizationSegment; import com.google.common.base.Preconditions; @@ -43,10 +42,10 @@ import com.google.common.base.Preconditions; public class JobBuilderSupport { final protected JobEngineConfig config; - final protected IRealizationSegment seg; + final protected CubeSegment seg; final protected String submitter; - public JobBuilderSupport(IRealizationSegment seg, String submitter) { + public JobBuilderSupport(CubeSegment seg, String submitter) { Preconditions.checkNotNull(seg, "segment cannot be null"); this.config = new JobEngineConfig(seg.getConfig()); this.seg = seg; http://git-wip-us.apache.org/repos/asf/kylin/blob/9595b160/engine-mr/src/main/java/org/apache/kylin/engine/mr/MRUtil.java ---------------------------------------------------------------------- diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/MRUtil.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/MRUtil.java index abe05d7..1a86329 100644 --- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/MRUtil.java +++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/MRUtil.java @@ -31,13 +31,12 @@ import org.apache.kylin.engine.mr.IMROutput2.IMRBatchCubingOutputSide2; import org.apache.kylin.engine.mr.IMROutput2.IMRBatchMergeOutputSide2; import org.apache.kylin.metadata.MetadataManager; import org.apache.kylin.metadata.model.TableDesc; -import org.apache.kylin.metadata.realization.IRealizationSegment; import org.apache.kylin.source.SourceFactory; import org.apache.kylin.storage.StorageFactory; public class MRUtil { - public static IMRBatchCubingInputSide getBatchCubingInputSide(IRealizationSegment seg) { + public static IMRBatchCubingInputSide getBatchCubingInputSide(CubeSegment seg) { return SourceFactory.createEngineAdapter(seg, IMRInput.class).getBatchCubingInputSide(seg); } http://git-wip-us.apache.org/repos/asf/kylin/blob/9595b160/source-hive/src/main/java/org/apache/kylin/source/hive/HiveMRInput.java ---------------------------------------------------------------------- diff --git a/source-hive/src/main/java/org/apache/kylin/source/hive/HiveMRInput.java b/source-hive/src/main/java/org/apache/kylin/source/hive/HiveMRInput.java index e4492da..72c84fc 100644 --- a/source-hive/src/main/java/org/apache/kylin/source/hive/HiveMRInput.java +++ b/source-hive/src/main/java/org/apache/kylin/source/hive/HiveMRInput.java @@ -29,6 +29,7 @@ import org.apache.hive.hcatalog.data.HCatRecord; import org.apache.hive.hcatalog.mapreduce.HCatInputFormat; import org.apache.kylin.common.KylinConfig; import org.apache.kylin.cube.CubeManager; +import org.apache.kylin.cube.CubeSegment; import org.apache.kylin.cube.model.CubeDesc; import org.apache.kylin.engine.mr.HadoopUtil; import org.apache.kylin.engine.mr.IMRInput; @@ -47,7 +48,6 @@ import org.apache.kylin.metadata.MetadataManager; import org.apache.kylin.metadata.model.IJoinedFlatTableDesc; import org.apache.kylin.metadata.model.LookupDesc; import org.apache.kylin.metadata.model.TableDesc; -import org.apache.kylin.metadata.realization.IRealizationSegment; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -56,7 +56,7 @@ import com.google.common.collect.Sets; public class HiveMRInput implements IMRInput { @Override - public IMRBatchCubingInputSide getBatchCubingInputSide(IRealizationSegment seg) { + public IMRBatchCubingInputSide getBatchCubingInputSide(CubeSegment seg) { return new BatchCubingInputSide(seg); } @@ -101,11 +101,11 @@ public class HiveMRInput implements IMRInput { public static class BatchCubingInputSide implements IMRBatchCubingInputSide { final JobEngineConfig conf; - final IRealizationSegment seg; + final CubeSegment seg; final IJoinedFlatTableDesc flatHiveTableDesc; String hiveViewIntermediateTables = ""; - public BatchCubingInputSide(IRealizationSegment seg) { + public BatchCubingInputSide(CubeSegment seg) { this.conf = new JobEngineConfig(KylinConfig.getInstanceFromEnv()); this.seg = seg; this.flatHiveTableDesc = seg.getJoinedFlatTableDesc(); http://git-wip-us.apache.org/repos/asf/kylin/blob/9595b160/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/HBaseMRSteps.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/HBaseMRSteps.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/HBaseMRSteps.java index 9102fbc..8a8a750 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/HBaseMRSteps.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/HBaseMRSteps.java @@ -30,7 +30,6 @@ import org.apache.kylin.engine.mr.common.HadoopShellExecutable; import org.apache.kylin.engine.mr.common.MapReduceExecutable; import org.apache.kylin.job.constant.ExecutableConstants; import org.apache.kylin.job.execution.DefaultChainedExecutable; -import org.apache.kylin.metadata.realization.IRealizationSegment; import org.apache.kylin.storage.hbase.HBaseConnection; import com.google.common.base.Preconditions; @@ -38,7 +37,7 @@ import com.google.common.collect.Lists; public class HBaseMRSteps extends JobBuilderSupport { - public HBaseMRSteps(IRealizationSegment seg) { + public HBaseMRSteps(CubeSegment seg) { super(seg, null); }
