Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 1573E200BA9 for ; Wed, 14 Sep 2016 10:49:52 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 145C0160AE3; Wed, 14 Sep 2016 08:49:52 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id F2EB5160AD4 for ; Wed, 14 Sep 2016 10:49:50 +0200 (CEST) Received: (qmail 52758 invoked by uid 500); 14 Sep 2016 08:49:50 -0000 Mailing-List: contact commits-help@kylin.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@kylin.apache.org Delivered-To: mailing list commits@kylin.apache.org Received: (qmail 51769 invoked by uid 99); 14 Sep 2016 08:49:49 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Sep 2016 08:49:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8B15ADFE61; Wed, 14 Sep 2016 08:49:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: shaofengshi@apache.org To: commits@kylin.apache.org Date: Wed, 14 Sep 2016 08:50:12 -0000 Message-Id: <5e9eb20c0d8f4374b8fcb640e273b4a6@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [25/50] [abbrv] kylin git commit: KYLIN-1827 code format archived-at: Wed, 14 Sep 2016 08:49:52 -0000 KYLIN-1827 code format Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/aef7869c Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/aef7869c Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/aef7869c Branch: refs/heads/KYLIN-1726 Commit: aef7869c953dec1caaf4b0e426b77c0a9a8938b1 Parents: 0954176 Author: shaofengshi Authored: Mon Sep 12 11:36:52 2016 +0800 Committer: shaofengshi Committed: Mon Sep 12 11:36:52 2016 +0800 ---------------------------------------------------------------------- .../kylin/job/execution/AbstractExecutable.java | 20 ++++++++++---------- .../org/apache/kylin/engine/mr/CubingJob.java | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/aef7869c/core-job/src/main/java/org/apache/kylin/job/execution/AbstractExecutable.java ---------------------------------------------------------------------- diff --git a/core-job/src/main/java/org/apache/kylin/job/execution/AbstractExecutable.java b/core-job/src/main/java/org/apache/kylin/job/execution/AbstractExecutable.java index 1eee5da..90e4d3c 100644 --- a/core-job/src/main/java/org/apache/kylin/job/execution/AbstractExecutable.java +++ b/core-job/src/main/java/org/apache/kylin/job/execution/AbstractExecutable.java @@ -125,10 +125,10 @@ public abstract class AbstractExecutable implements Executable, Idempotent { onExecuteFinished(result, executableContext); } catch (Exception e) { - if (isMetaDataPersistException(e)){ + if (isMetaDataPersistException(e)) { handleMetaDataPersistException(e); } - if (e instanceof ExecuteException){ + if (e instanceof ExecuteException) { throw e; } else { throw new ExecuteException(e); @@ -142,15 +142,15 @@ public abstract class AbstractExecutable implements Executable, Idempotent { } private boolean isMetaDataPersistException(Exception e) { - if (e instanceof PersistentException){ + if (e instanceof PersistentException) { return true; } Throwable t = e.getCause(); int depth = 0; - while (t!= null && depth<5) { - depth ++; - if (t instanceof PersistentException){ + while (t != null && depth < 5) { + depth++; + if (t instanceof PersistentException) { return true; } t = t.getCause(); @@ -242,19 +242,19 @@ public abstract class AbstractExecutable implements Executable, Idempotent { protected final void notifyUserStatusChange(ExecutableContext context, ExecutableState state) { try { final KylinConfig kylinConfig = KylinConfig.getInstanceFromEnv(); - List users = getAllNofifyUsers(kylinConfig); + List users = getAllNofifyUsers(kylinConfig); if (users.isEmpty()) { logger.warn("no need to send email, user list is empty"); return; } final Pair email = formatNotifications(context, state); - doSendMail(kylinConfig,users,email); + doSendMail(kylinConfig, users, email); } catch (Exception e) { logger.error("error send email", e); } } - private List getAllNofifyUsers(KylinConfig kylinConfig){ + private List getAllNofifyUsers(KylinConfig kylinConfig) { List users = Lists.newArrayList(); users.addAll(getNotifyList()); final String[] adminDls = kylinConfig.getAdminDls(); @@ -266,7 +266,7 @@ public abstract class AbstractExecutable implements Executable, Idempotent { return users; } - private void doSendMail(KylinConfig kylinConfig, List users, Pair email){ + private void doSendMail(KylinConfig kylinConfig, List users, Pair email) { if (email == null) { logger.warn("no need to send email, content is null"); return; http://git-wip-us.apache.org/repos/asf/kylin/blob/aef7869c/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 9c7f57a..1a0113d 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 @@ -220,7 +220,7 @@ public class CubingJob extends DefaultChainedExecutable { } catch (UnknownHostException e) { logger.warn(e.getLocalizedMessage(), e); } - sendMail(Pair.of(title,content)); + sendMail(Pair.of(title, content)); } public long getMapReduceWaitTime() {