You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by bi...@apache.org on 2018/02/05 15:42:33 UTC
[1/2] kylin git commit: KYLIN-3219
Repository: kylin
Updated Branches:
refs/heads/2.3.x d4c8fbcc5 -> 5bc5e659d
KYLIN-3219
Signed-off-by: Billy Liu <bi...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/d31a0098
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/d31a0098
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/d31a0098
Branch: refs/heads/2.3.x
Commit: d31a009887f7d8b849abb560812318533836e5f8
Parents: d4c8fbc
Author: xingpeng1 <xi...@zte.com.cn>
Authored: Thu Feb 1 11:28:46 2018 +0800
Committer: Billy Liu <bi...@apache.org>
Committed: Mon Feb 5 22:16:07 2018 +0800
----------------------------------------------------------------------
.../java/org/apache/kylin/engine/mr/CubingJob.java | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/d31a0098/engine-mr/src/main/java/org/apache/kylin/engine/mr/CubingJob.java
----------------------------------------------------------------------
diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/CubingJob.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/CubingJob.java
index 9173dbd..c9ed359 100644
--- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/CubingJob.java
+++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/CubingJob.java
@@ -282,10 +282,10 @@ public class CubingJob extends DefaultChainedExecutable {
getPerBytesTimeCost(findSourceSizeBytes(), getDuration()));
if (CubingJobTypeEnum.getByName(getJobType()) == CubingJobTypeEnum.BUILD) {
jobStats.setJobStepStats(
- getTaskByName(ExecutableConstants.STEP_NAME_FACT_DISTINCT_COLUMNS).getDuration(),
- getTaskByName(ExecutableConstants.STEP_NAME_BUILD_DICTIONARY).getDuration(),
- getTaskByName(ExecutableConstants.STEP_NAME_BUILD_IN_MEM_CUBE).getDuration(),
- getTaskByName(ExecutableConstants.STEP_NAME_CONVERT_CUBOID_TO_HFILE).getDuration());
+ getTaskDurationByName(ExecutableConstants.STEP_NAME_FACT_DISTINCT_COLUMNS),
+ getTaskDurationByName(ExecutableConstants.STEP_NAME_BUILD_DICTIONARY),
+ getTaskDurationByName(ExecutableConstants.STEP_NAME_BUILD_IN_MEM_CUBE),
+ getTaskDurationByName(ExecutableConstants.STEP_NAME_CONVERT_CUBOID_TO_HFILE));
}
} else if (state == ExecutableState.ERROR) {
jobStats.setJobException(result.getThrowable() != null ? result.getThrowable() : new Exception());
@@ -293,6 +293,15 @@ public class CubingJob extends DefaultChainedExecutable {
JobMetricsFacade.updateMetrics(jobStats);
}
+ private long getTaskDurationByName(String name) {
+ AbstractExecutable task = getTaskByName(name);
+ if (task != null) {
+ return task.getDuration();
+ } else {
+ return 0;
+ }
+ }
+
private static double getPerBytesTimeCost(long size, long timeCost) {
if (size <= 0) {
return 0;
[2/2] kylin git commit: KYLIN-2980,
Remove getKey/Value setKey/Value from Kylin's Pair.
Posted by bi...@apache.org.
KYLIN-2980, Remove getKey/Value setKey/Value from Kylin's Pair.
Signed-off-by: Billy Liu <bi...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/5bc5e659
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/5bc5e659
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/5bc5e659
Branch: refs/heads/2.3.x
Commit: 5bc5e659dc6513e560ca14f4de696af2f79fac67
Parents: d31a009
Author: tttMelody <24...@qq.com>
Authored: Tue Nov 7 21:38:15 2017 +0800
Committer: Billy Liu <bi...@apache.org>
Committed: Mon Feb 5 22:55:36 2018 +0800
----------------------------------------------------------------------
.../java/org/apache/kylin/common/util/Pair.java | 16 ----------------
.../org/apache/kylin/metrics/MetricsManager.java | 14 +++++++-------
.../tool/metrics/systemcube/CubeDescCreator.java | 8 ++++----
3 files changed, 11 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/5bc5e659/core-common/src/main/java/org/apache/kylin/common/util/Pair.java
----------------------------------------------------------------------
diff --git a/core-common/src/main/java/org/apache/kylin/common/util/Pair.java b/core-common/src/main/java/org/apache/kylin/common/util/Pair.java
index 8ea009a..aa85855 100644
--- a/core-common/src/main/java/org/apache/kylin/common/util/Pair.java
+++ b/core-common/src/main/java/org/apache/kylin/common/util/Pair.java
@@ -79,14 +79,6 @@ public class Pair<T1, T2> implements Serializable {
this.first = a;
}
- public T1 getKey() {
- return getFirst();
- }
-
- public void setKey(T1 a) {
- setFirst(a);
- }
-
/**
* Return the second element stored in the pair.
* @return T2
@@ -103,14 +95,6 @@ public class Pair<T1, T2> implements Serializable {
this.second = b;
}
- public T2 getValue() {
- return getSecond();
- }
-
- public void setValue(T2 b) {
- setSecond(b);
- }
-
@Override
@SuppressWarnings("rawtypes")
public boolean equals(Object other) {
http://git-wip-us.apache.org/repos/asf/kylin/blob/5bc5e659/core-metrics/src/main/java/org/apache/kylin/metrics/MetricsManager.java
----------------------------------------------------------------------
diff --git a/core-metrics/src/main/java/org/apache/kylin/metrics/MetricsManager.java b/core-metrics/src/main/java/org/apache/kylin/metrics/MetricsManager.java
index ce28bf6..e7f042e 100644
--- a/core-metrics/src/main/java/org/apache/kylin/metrics/MetricsManager.java
+++ b/core-metrics/src/main/java/org/apache/kylin/metrics/MetricsManager.java
@@ -94,14 +94,14 @@ public class MetricsManager {
sourceReporterBindProps.put(activeReservoir, values);
for (Pair<String, Properties> entry : sourceReporterBindProperties.get(activeReservoir)) {
try {
- Class clz = Class.forName(entry.getKey());
+ Class clz = Class.forName(entry.getFirst());
if (ActiveReservoirReporter.class.isAssignableFrom(clz)) {
- values.add(new Pair(clz, entry.getValue()));
+ values.add(new Pair(clz, entry.getSecond()));
} else {
logger.warn("The class " + clz + " is not a sub class of " + ActiveReservoir.class);
}
} catch (ClassNotFoundException e) {
- logger.warn("Cannot find class " + entry.getKey());
+ logger.warn("Cannot find class " + entry.getFirst());
}
}
}
@@ -119,12 +119,12 @@ public class MetricsManager {
.get(activeReservoir);
for (Pair<Class<? extends ActiveReservoirReporter>, Properties> subEntry : reportProps) {
try {
- Method method = subEntry.getKey().getMethod(METHOD_FOR_REGISTRY, ActiveReservoir.class);
- ((ReporterBuilder) method.invoke(null, activeReservoir)).setConfig(subEntry.getValue()).build()
+ Method method = subEntry.getFirst().getMethod(METHOD_FOR_REGISTRY, ActiveReservoir.class);
+ ((ReporterBuilder) method.invoke(null, activeReservoir)).setConfig(subEntry.getSecond()).build()
.start();
} catch (Exception e) {
- logger.warn("Cannot initialize ActiveReservoirReporter: Builder class - " + subEntry.getKey()
- + ", Properties - " + subEntry.getValue());
+ logger.warn("Cannot initialize ActiveReservoirReporter: Builder class - " + subEntry.getFirst()
+ + ", Properties - " + subEntry.getSecond());
}
}
Metrics.register(registerName, activeReservoir);
http://git-wip-us.apache.org/repos/asf/kylin/blob/5bc5e659/tool/src/main/java/org/apache/kylin/tool/metrics/systemcube/CubeDescCreator.java
----------------------------------------------------------------------
diff --git a/tool/src/main/java/org/apache/kylin/tool/metrics/systemcube/CubeDescCreator.java b/tool/src/main/java/org/apache/kylin/tool/metrics/systemcube/CubeDescCreator.java
index 666d23a..9eb5ab2 100644
--- a/tool/src/main/java/org/apache/kylin/tool/metrics/systemcube/CubeDescCreator.java
+++ b/tool/src/main/java/org/apache/kylin/tool/metrics/systemcube/CubeDescCreator.java
@@ -75,7 +75,7 @@ public class CubeDescCreator {
List<Pair<String, String>> measureTypeList = HiveTableCreator.getHiveColumnsForMetricsQuery();
Map<String, String> measureTypeMap = Maps.newHashMapWithExpectedSize(measureTypeList.size());
for (Pair<String, String> entry : measureTypeList) {
- measureTypeMap.put(entry.getKey(), entry.getValue());
+ measureTypeMap.put(entry.getFirst(), entry.getSecond());
}
measureDescList.add(getMeasureCount());
measureDescList.add(getMeasureMin(QueryPropertyEnum.TIME_COST.toString(),
@@ -157,7 +157,7 @@ public class CubeDescCreator {
List<Pair<String, String>> measureTypeList = HiveTableCreator.getHiveColumnsForMetricsQueryCube();
Map<String, String> measureTypeMap = Maps.newHashMapWithExpectedSize(measureTypeList.size());
for (Pair<String, String> entry : measureTypeList) {
- measureTypeMap.put(entry.getKey(), entry.getValue());
+ measureTypeMap.put(entry.getFirst(), entry.getSecond());
}
measureDescList.add(getMeasureCount());
for (String measure : measures) {
@@ -242,7 +242,7 @@ public class CubeDescCreator {
List<Pair<String, String>> measureTypeList = HiveTableCreator.getHiveColumnsForMetricsQueryRPC();
Map<String, String> measureTypeMap = Maps.newHashMapWithExpectedSize(measureTypeList.size());
for (Pair<String, String> entry : measureTypeList) {
- measureTypeMap.put(entry.getKey(), entry.getValue());
+ measureTypeMap.put(entry.getFirst(), entry.getSecond());
}
measureDescList.add(getMeasureCount());
for (String measure : measures) {
@@ -319,7 +319,7 @@ public class CubeDescCreator {
List<Pair<String, String>> measureTypeList = HiveTableCreator.getHiveColumnsForMetricsJob();
Map<String, String> measureTypeMap = Maps.newHashMapWithExpectedSize(measureTypeList.size());
for (Pair<String, String> entry : measureTypeList) {
- measureTypeMap.put(entry.getKey(), entry.getValue());
+ measureTypeMap.put(entry.getFirst(), entry.getSecond());
}
measureDescList.add(getMeasureCount());
for (String measure : measures) {