minor, add commit to htable
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/4a1bc194 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/4a1bc194 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/4a1bc194 Branch: refs/heads/master Commit: 4a1bc1945c990e9e9752e19f63d27afd3f840941 Parents: 6dffd97 Author: lidongsjtu <[email protected]> Authored: Thu Apr 14 16:16:48 2016 +0800 Committer: lidongsjtu <[email protected]> Committed: Thu Apr 14 16:19:34 2016 +0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/kylin/common/KylinVersion.java | 1 - .../kylin/metadata/realization/IRealizationConstants.java | 2 ++ .../apache/kylin/storage/hbase/steps/CubeHTableUtil.java | 6 ++++++ .../kylin/storage/hbase/util/DeployCoprocessorCLI.java | 9 +++++++++ 4 files changed, 17 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/4a1bc194/core-common/src/main/java/org/apache/kylin/common/KylinVersion.java ---------------------------------------------------------------------- diff --git a/core-common/src/main/java/org/apache/kylin/common/KylinVersion.java b/core-common/src/main/java/org/apache/kylin/common/KylinVersion.java index 1c893f3..4ed74cd 100644 --- a/core-common/src/main/java/org/apache/kylin/common/KylinVersion.java +++ b/core-common/src/main/java/org/apache/kylin/common/KylinVersion.java @@ -23,7 +23,6 @@ import java.util.Set; import javax.annotation.Nullable; -import org.apache.commons.collections.CollectionUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; http://git-wip-us.apache.org/repos/asf/kylin/blob/4a1bc194/core-metadata/src/main/java/org/apache/kylin/metadata/realization/IRealizationConstants.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/realization/IRealizationConstants.java b/core-metadata/src/main/java/org/apache/kylin/metadata/realization/IRealizationConstants.java index 6c0a973..f5c6428 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/realization/IRealizationConstants.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/realization/IRealizationConstants.java @@ -40,4 +40,6 @@ public class IRealizationConstants { public final static String HTableSegmentTag = "SEGMENT"; + public final static String HTableGitTag = "GIT_COMMIT"; + } http://git-wip-us.apache.org/repos/asf/kylin/blob/4a1bc194/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CubeHTableUtil.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CubeHTableUtil.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CubeHTableUtil.java index 65192c2..182cffe 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CubeHTableUtil.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CubeHTableUtil.java @@ -33,6 +33,7 @@ import org.apache.hadoop.hbase.regionserver.BloomType; import org.apache.hadoop.hbase.regionserver.DisabledRegionSplitPolicy; import org.apache.hadoop.hbase.security.User; import org.apache.kylin.common.KylinConfig; +import org.apache.kylin.common.KylinVersion; import org.apache.kylin.cube.CubeInstance; import org.apache.kylin.cube.CubeSegment; import org.apache.kylin.cube.model.CubeDesc; @@ -67,6 +68,11 @@ public class CubeHTableUtil { tableDesc.setValue(IRealizationConstants.HTableOwner, kylinConfig.getKylinOwner()); } + String commitInfo = KylinVersion.getGitCommitInfo(); + if (!StringUtils.isEmpty(commitInfo)) { + tableDesc.setValue(IRealizationConstants.HTableGitTag, commitInfo); + } + //HTableUser is the cube owner, which will be the "user" tableDesc.setValue(IRealizationConstants.HTableUser, cubeInstance.getOwner()); http://git-wip-us.apache.org/repos/asf/kylin/blob/4a1bc194/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/DeployCoprocessorCLI.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/DeployCoprocessorCLI.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/DeployCoprocessorCLI.java index 8bf06b7..2a5c950 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/DeployCoprocessorCLI.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/DeployCoprocessorCLI.java @@ -43,6 +43,7 @@ import org.apache.hadoop.hbase.TableNotFoundException; import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; import org.apache.kylin.common.KylinConfig; +import org.apache.kylin.common.KylinVersion; import org.apache.kylin.common.util.Bytes; import org.apache.kylin.cube.CubeInstance; import org.apache.kylin.cube.CubeManager; @@ -51,6 +52,7 @@ import org.apache.kylin.invertedindex.IIInstance; import org.apache.kylin.invertedindex.IIManager; import org.apache.kylin.invertedindex.IISegment; import org.apache.kylin.metadata.model.SegmentStatusEnum; +import org.apache.kylin.metadata.realization.IRealizationConstants; import org.apache.kylin.metadata.realization.RealizationStatusEnum; import org.apache.kylin.storage.hbase.HBaseConnection; import org.slf4j.Logger; @@ -210,6 +212,13 @@ public class DeployCoprocessorCLI { desc.removeCoprocessor(IIEndpointClassOld); } addCoprocessorOnHTable(desc, hdfsCoprocessorJar); + + // update commit tags + String commitInfo = KylinVersion.getGitCommitInfo(); + if (!StringUtils.isEmpty(commitInfo)) { + desc.setValue(IRealizationConstants.HTableGitTag, commitInfo); + } + hbaseAdmin.modifyTable(tableName, desc); logger.info("Enable " + tableName);
