KYLIN-2415 Change back default metadata name to kylin_metadata
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/b6d247c2 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/b6d247c2 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/b6d247c2 Branch: refs/heads/spark-it Commit: b6d247c2c1412d7eb1024048ae7aad0ba5d1ea82 Parents: 971bf80 Author: shaofengshi <shaofeng...@apache.org> Authored: Tue Jan 24 13:43:04 2017 +0800 Committer: shaofengshi <shaofeng...@apache.org> Committed: Tue Jan 24 13:43:04 2017 +0800 ---------------------------------------------------------------------- build/conf/kylin.properties | 2 +- .../src/main/java/org/apache/kylin/common/KylinConfigBase.java | 2 +- .../apache/kylin/metadata/realization/IRealizationConstants.java | 2 +- examples/test_case_data/sandbox/kylin.properties | 2 +- .../org/apache/kylin/storage/hdfs/ITHDFSResourceStoreTest.java | 2 +- .../java/org/apache/kylin/storage/hbase/HBaseResourceStore.java | 2 +- .../org/apache/kylin/storage/hbase/util/StorageCleanupJob.java | 2 +- .../main/java/org/apache/kylin/storage/hdfs/HDFSResourceStore.java | 2 +- tool/src/main/java/org/apache/kylin/tool/StorageCleanupJob.java | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/b6d247c2/build/conf/kylin.properties ---------------------------------------------------------------------- diff --git a/build/conf/kylin.properties b/build/conf/kylin.properties index 196a711..eceb886 100644 --- a/build/conf/kylin.properties +++ b/build/conf/kylin.properties @@ -18,7 +18,7 @@ ### METADATA | ENV ### # The metadata store in hbase -kylin.metadata.url=kylin_default_instance@hbase +kylin.metadata.url=kylin_metadata@hbase # Working folder in HDFS, make sure user has the right access to the hdfs directory kylin.env.hdfs-working-dir=/kylin http://git-wip-us.apache.org/repos/asf/kylin/blob/b6d247c2/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java ---------------------------------------------------------------------- diff --git a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java index 75b38ff..07cb124 100644 --- a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java +++ b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java @@ -216,7 +216,7 @@ abstract public class KylinConfigBase implements Serializable { public String getMetadataUrlPrefix() { String metadataUrl = getMetadataUrl(); - String defaultPrefix = "kylin_default_instance"; + String defaultPrefix = "kylin_metadata"; if (metadataUrl.endsWith("@hbase")) { int cut = metadataUrl.lastIndexOf('@'); http://git-wip-us.apache.org/repos/asf/kylin/blob/b6d247c2/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 adc53a1..2a3b01e 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 @@ -28,7 +28,7 @@ public class IRealizationConstants { /** * For each cube htable, we leverage htable's metadata to keep track of - * which kylin server(represented by its kylin_default_instance prefix) owns this htable + * which kylin server(represented by its kylin_metadata prefix) owns this htable */ public final static String HTableTag = "KYLIN_HOST"; http://git-wip-us.apache.org/repos/asf/kylin/blob/b6d247c2/examples/test_case_data/sandbox/kylin.properties ---------------------------------------------------------------------- diff --git a/examples/test_case_data/sandbox/kylin.properties b/examples/test_case_data/sandbox/kylin.properties index 2c2da91..fa0c6bc 100644 --- a/examples/test_case_data/sandbox/kylin.properties +++ b/examples/test_case_data/sandbox/kylin.properties @@ -39,7 +39,7 @@ kylin.source.hive.client=cli ### STORAGE ### # The metadata store in hbase -kylin.metadata.url=kylin_default_instance@hbase +kylin.metadata.url=kylin_metadata@hbase # The storage for final cube file in hbase http://git-wip-us.apache.org/repos/asf/kylin/blob/b6d247c2/kylin-it/src/test/java/org/apache/kylin/storage/hdfs/ITHDFSResourceStoreTest.java ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/java/org/apache/kylin/storage/hdfs/ITHDFSResourceStoreTest.java b/kylin-it/src/test/java/org/apache/kylin/storage/hdfs/ITHDFSResourceStoreTest.java index 47afb01..ff66048 100644 --- a/kylin-it/src/test/java/org/apache/kylin/storage/hdfs/ITHDFSResourceStoreTest.java +++ b/kylin-it/src/test/java/org/apache/kylin/storage/hdfs/ITHDFSResourceStoreTest.java @@ -43,7 +43,7 @@ public class ITHDFSResourceStoreTest extends HBaseMetadataTestCase { @Test public void testResourceStoreBasic() throws Exception { String oldUrl = kylinConfig.getMetadataUrl(); - kylinConfig.setProperty("kylin.metadata.url", "kylin_default_instance@hdfs"); + kylinConfig.setProperty("kylin.metadata.url", "kylin_metadata@hdfs"); HDFSResourceStore store = new HDFSResourceStore(kylinConfig); ResourceStoreTest.testAStore(store); kylinConfig.setProperty("kylin.metadata.url", oldUrl); http://git-wip-us.apache.org/repos/asf/kylin/blob/b6d247c2/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseResourceStore.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseResourceStore.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseResourceStore.java index 84670dd..0901b54 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseResourceStore.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseResourceStore.java @@ -59,7 +59,7 @@ public class HBaseResourceStore extends ResourceStore { private static final Logger logger = LoggerFactory.getLogger(HBaseResourceStore.class); - private static final String DEFAULT_TABLE_NAME = "kylin_default_instance"; + private static final String DEFAULT_TABLE_NAME = "kylin_metadata"; private static final String FAMILY = "f"; private static final byte[] B_FAMILY = Bytes.toBytes(FAMILY); private static final String COLUMN = "c"; http://git-wip-us.apache.org/repos/asf/kylin/blob/b6d247c2/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/StorageCleanupJob.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/StorageCleanupJob.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/StorageCleanupJob.java index 0784305..f6b65ab 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/StorageCleanupJob.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/StorageCleanupJob.java @@ -190,7 +190,7 @@ public class StorageCleanupJob extends AbstractApplication { // GlobFilter filter = new // GlobFilter(KylinConfig.getInstanceFromEnv().getHdfsWorkingDirectory() // + "/kylin-.*"); - // TODO: when first use, /kylin/kylin_default_instance does not exist. + // TODO: when first use, /kylin/kylin_metadata does not exist. FileStatus[] fStatus = fs.listStatus(new Path(KylinConfig.getInstanceFromEnv().getHdfsWorkingDirectory())); for (FileStatus status : fStatus) { String path = status.getPath().getName(); http://git-wip-us.apache.org/repos/asf/kylin/blob/b6d247c2/storage-hbase/src/main/java/org/apache/kylin/storage/hdfs/HDFSResourceStore.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hdfs/HDFSResourceStore.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hdfs/HDFSResourceStore.java index bdd3917..0ad6964 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hdfs/HDFSResourceStore.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hdfs/HDFSResourceStore.java @@ -47,7 +47,7 @@ public class HDFSResourceStore extends ResourceStore { private static final long DEFAULT_ACQUIRE_LOCK_TIMEOUT = 10; - private static final String DEFAULT_FOLDER_NAME = "kylin_default_instance"; + private static final String DEFAULT_FOLDER_NAME = "kylin_metadata"; private static final String DEFAULT_METADATA_FOLDER_NAME = "hdfs_metadata"; http://git-wip-us.apache.org/repos/asf/kylin/blob/b6d247c2/tool/src/main/java/org/apache/kylin/tool/StorageCleanupJob.java ---------------------------------------------------------------------- diff --git a/tool/src/main/java/org/apache/kylin/tool/StorageCleanupJob.java b/tool/src/main/java/org/apache/kylin/tool/StorageCleanupJob.java index b48c076..477c58a 100644 --- a/tool/src/main/java/org/apache/kylin/tool/StorageCleanupJob.java +++ b/tool/src/main/java/org/apache/kylin/tool/StorageCleanupJob.java @@ -190,7 +190,7 @@ public class StorageCleanupJob extends AbstractApplication { // GlobFilter filter = new // GlobFilter(KylinConfig.getInstanceFromEnv().getHdfsWorkingDirectory() // + "/kylin-.*"); - // TODO: when first use, /kylin/kylin_default_instance does not exist. + // TODO: when first use, /kylin/kylin_metadata does not exist. FileStatus[] fStatus = fs.listStatus(new Path(KylinConfig.getInstanceFromEnv().getHdfsWorkingDirectory())); for (FileStatus status : fStatus) { String path = status.getPath().getName();