Repository: kylin Updated Branches: refs/heads/master 4d50b2697 -> 6f4dbc121
KYLIN-2723 Rename config kylin.core.metrics.xxx to kylin.metrics.xxx for consistency. Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/6f4dbc12 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/6f4dbc12 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/6f4dbc12 Branch: refs/heads/master Commit: 6f4dbc1210ad77578f37fcb21a9acd6024571765 Parents: 4d50b26 Author: Li Yang <liy...@apache.org> Authored: Mon Jan 1 07:35:11 2018 +0800 Committer: Li Yang <liy...@apache.org> Committed: Mon Jan 1 07:35:11 2018 +0800 ---------------------------------------------------------------------- .../apache/kylin/common/KylinConfigBase.java | 22 ++++++++++---------- .../kylin/rest/metrics/QueryMetricsTest.java | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/6f4dbc12/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 2effdfb..667eea9 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 @@ -1516,28 +1516,28 @@ abstract public class KylinConfigBase implements Serializable { } public boolean isKylinMetricsMonitorEnabled() { - return Boolean.parseBoolean(getOptional("kylin.core.metrics.monitor-enabled", "false")); + return Boolean.parseBoolean(getOptional("kylin.metrics.monitor-enabled", "false")); } public boolean isKylinMetricsReporterForQueryEnabled() { - return Boolean.parseBoolean(getOptional("kylin.core.metrics.reporter-query-enabled", "false")); + return Boolean.parseBoolean(getOptional("kylin.metrics.reporter-query-enabled", "false")); } public boolean isKylinMetricsReporterForJobEnabled() { - return Boolean.parseBoolean(getOptional("kylin.core.metrics.reporter-job-enabled", "false")); + return Boolean.parseBoolean(getOptional("kylin.metrics.reporter-job-enabled", "false")); } public String getKylinMetricsPrefix() { - return getOptional("kylin.core.metrics.prefix", "KYLIN").toUpperCase(); + return getOptional("kylin.metrics.prefix", "KYLIN").toUpperCase(); } public String getKylinMetricsActiveReservoirDefaultClass() { - return getOptional("kylin.core.metrics.active-reservoir-default-class", + return getOptional("kylin.metrics.active-reservoir-default-class", "org.apache.kylin.metrics.lib.impl.StubReservoir"); } public String getKylinSystemCubeSinkDefaultClass() { - return getOptional("kylin.core.metrics.system-cube-sink-default-class", + return getOptional("kylin.metrics.system-cube-sink-default-class", "org.apache.kylin.metrics.lib.impl.hive.HiveSink"); } @@ -1546,25 +1546,25 @@ abstract public class KylinConfigBase implements Serializable { } public String getKylinMetricsSubjectJob() { - return getOptional("kylin.core.metrics.subject-job", "METRICS_JOB") + "_" + getKylinMetricsSubjectSuffix(); + return getOptional("kylin.metrics.subject-job", "METRICS_JOB") + "_" + getKylinMetricsSubjectSuffix(); } public String getKylinMetricsSubjectJobException() { - return getOptional("kylin.core.metrics.subject-job-exception", "METRICS_JOB_EXCEPTION") + "_" + return getOptional("kylin.metrics.subject-job-exception", "METRICS_JOB_EXCEPTION") + "_" + getKylinMetricsSubjectSuffix(); } public String getKylinMetricsSubjectQuery() { - return getOptional("kylin.core.metrics.subject-query", "METRICS_QUERY") + "_" + getKylinMetricsSubjectSuffix(); + return getOptional("kylin.metrics.subject-query", "METRICS_QUERY") + "_" + getKylinMetricsSubjectSuffix(); } public String getKylinMetricsSubjectQueryCube() { - return getOptional("kylin.core.metrics.subject-query-cube", "METRICS_QUERY_CUBE") + "_" + return getOptional("kylin.metrics.subject-query-cube", "METRICS_QUERY_CUBE") + "_" + getKylinMetricsSubjectSuffix(); } public String getKylinMetricsSubjectQueryRpcCall() { - return getOptional("kylin.core.metrics.subject-query-rpc", "METRICS_QUERY_RPC") + "_" + return getOptional("kylin.metrics.subject-query-rpc", "METRICS_QUERY_RPC") + "_" + getKylinMetricsSubjectSuffix(); } } http://git-wip-us.apache.org/repos/asf/kylin/blob/6f4dbc12/server/src/test/java/org/apache/kylin/rest/metrics/QueryMetricsTest.java ---------------------------------------------------------------------- diff --git a/server/src/test/java/org/apache/kylin/rest/metrics/QueryMetricsTest.java b/server/src/test/java/org/apache/kylin/rest/metrics/QueryMetricsTest.java index bbfe97c..e23fc20 100644 --- a/server/src/test/java/org/apache/kylin/rest/metrics/QueryMetricsTest.java +++ b/server/src/test/java/org/apache/kylin/rest/metrics/QueryMetricsTest.java @@ -114,7 +114,7 @@ public class QueryMetricsTest extends ServiceTestBase { @Test public void testQueryStatisticsResult() throws Exception { - System.setProperty("kylin.core.metrics.reporter-query-enabled", "true"); + System.setProperty("kylin.metrics.reporter-query-enabled", "true"); QueryMetricsFacade.init(); SQLRequest sqlRequest = new SQLRequest();
