You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2015/08/11 08:06:16 UTC

incubator-kylin git commit: KYLIN-863 Add “source record count” in the email notification

Repository: incubator-kylin
Updated Branches:
  refs/heads/0.8 448b38225 -> 8660c8ba6


KYLIN-863 Add “source record count” in the email notification

Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/8660c8ba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/8660c8ba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/8660c8ba

Branch: refs/heads/0.8
Commit: 8660c8ba6594653f9321d832f0b8c48ec2577078
Parents: 448b382
Author: shaofengshi <sh...@apache.org>
Authored: Tue Aug 11 14:06:07 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Tue Aug 11 14:06:07 2015 +0800

----------------------------------------------------------------------
 .../java/org/apache/kylin/job/constant/ExecutableConstants.java   | 3 +--
 engine-mr/src/main/java/org/apache/kylin/engine/mr/CubingJob.java | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/8660c8ba/core-job/src/main/java/org/apache/kylin/job/constant/ExecutableConstants.java
----------------------------------------------------------------------
diff --git a/core-job/src/main/java/org/apache/kylin/job/constant/ExecutableConstants.java b/core-job/src/main/java/org/apache/kylin/job/constant/ExecutableConstants.java
index fdcfdbe..c340dec 100644
--- a/core-job/src/main/java/org/apache/kylin/job/constant/ExecutableConstants.java
+++ b/core-job/src/main/java/org/apache/kylin/job/constant/ExecutableConstants.java
@@ -75,6 +75,5 @@ public final class ExecutableConstants {
     public static final String PROP_JOB_KILLED = "jobKilled";
     public static final String PROP_JOB_RUNTIME_FLOWS = "jobFlows";
 
-    public static final String NOTIFY_EMAIL_TEMPLATE = "<div><b>Build Result of Job ${job_name}</b><pre><ul>" + "<li>Build Result: <b>${result}</b></li>" + "<li>Job Engine: ${job_engine}</li>" + "<li>Cube Name: ${cube_name}</li>" + "<li>Start Time: ${start_time}</li>" + "<li>Duration: ${duration}</li>" + "<li>MR Waiting: ${mr_waiting}</li>" + "<li>Last Update Time: ${last_update_time}</li>" + "<li>Submitter: ${submitter}</li>" + "<li>Error Log: ${error_log}</li>" + "</ul></pre><div/>";
-
+    public static final String NOTIFY_EMAIL_TEMPLATE = "<div><b>Build Result of Job ${job_name}</b><pre><ul>" + "<li>Build Result: <b>${result}</b></li>" + "<li>Job Engine: ${job_engine}</li>" + "<li>Cube Name: ${cube_name}</li>" + "<li>Source Records Count: ${source_records_count}</li>" + "<li>Start Time: ${start_time}</li>" + "<li>Duration: ${duration}</li>" + "<li>MR Waiting: ${mr_waiting}</li>" + "<li>Last Update Time: ${last_update_time}</li>" + "<li>Submitter: ${submitter}</li>" + "<li>Error Log: ${error_log}</li>" + "</ul></pre><div/>";
 }

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/8660c8ba/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 fd65209..a3ca99c 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
@@ -124,6 +124,7 @@ public class CubingJob extends DefaultChainedExecutable {
         content = content.replaceAll("\\$\\{job_name\\}", getName());
         content = content.replaceAll("\\$\\{result\\}", state.toString());
         content = content.replaceAll("\\$\\{cube_name\\}", getCubeName());
+        content = content.replaceAll("\\$\\{source_records_count\\}", String.valueOf(findSourceRecordCount()));
         content = content.replaceAll("\\$\\{start_time\\}", new Date(getStartTime()).toString());
         content = content.replaceAll("\\$\\{duration\\}", getDuration() / 60000 + "mins");
         content = content.replaceAll("\\$\\{mr_waiting\\}", getMapReduceWaitTime() / 60000 + "mins");
@@ -177,7 +178,7 @@ public class CubingJob extends DefaultChainedExecutable {
     public long findCubeSizeBytes() {
         return Long.parseLong(findExtraInfo(CUBE_SIZE_BYTES, "0"));
     }
-    
+
     private String findExtraInfo(String key, String dft) {
         for (AbstractExecutable child : getTasks()) {
             Output output = executableManager.getOutput(child.getId());