From commits-return-4249-apmail-drill-commits-archive=drill.apache.org@drill.apache.org Thu Oct 6 05:09:59 2016 Return-Path: X-Original-To: apmail-drill-commits-archive@www.apache.org Delivered-To: apmail-drill-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5361D19E3B for ; Thu, 6 Oct 2016 05:09:59 +0000 (UTC) Received: (qmail 59916 invoked by uid 500); 6 Oct 2016 05:09:59 -0000 Delivered-To: apmail-drill-commits-archive@drill.apache.org Received: (qmail 59881 invoked by uid 500); 6 Oct 2016 05:09:59 -0000 Mailing-List: contact commits-help@drill.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: commits@drill.apache.org Delivered-To: mailing list commits@drill.apache.org Received: (qmail 59870 invoked by uid 99); 6 Oct 2016 05:09:59 -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; Thu, 06 Oct 2016 05:09:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9B82FE0381; Thu, 6 Oct 2016 05:09:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jni@apache.org To: commits@drill.apache.org Message-Id: <7d092951614a433c995b692899dd05a0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: drill git commit: DRILL-4911: Avoid plan serialization in SimpleParallelizer when debug logging is not enabled. Date: Thu, 6 Oct 2016 05:09:58 +0000 (UTC) Repository: drill Updated Branches: refs/heads/master 1375a0065 -> 4edabe7a3 DRILL-4911: Avoid plan serialization in SimpleParallelizer when debug logging is not enabled. Project: http://git-wip-us.apache.org/repos/asf/drill/repo Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/4edabe7a Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/4edabe7a Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/4edabe7a Branch: refs/heads/master Commit: 4edabe7a392f38b0f7a9c8af51a74bf6932a821d Parents: 1375a00 Author: Jinfeng Ni Authored: Wed Sep 21 16:03:49 2016 -0700 Committer: Jinfeng Ni Committed: Wed Oct 5 20:40:46 2016 -0700 ---------------------------------------------------------------------- .../drill/exec/planner/fragment/SimpleParallelizer.java | 8 ++++++-- .../exec/planner/fragment/contrib/SplittingParallelizer.java | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/drill/blob/4edabe7a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/SimpleParallelizer.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/SimpleParallelizer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/SimpleParallelizer.java index 47de88e..c389e89 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/SimpleParallelizer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/SimpleParallelizer.java @@ -316,11 +316,15 @@ public class SimpleParallelizer implements ParallelizationParameters { .build(); if (isRootNode) { - logger.debug("Root fragment:\n {}", DrillStringUtils.unescapeJava(fragment.toString())); + if (logger.isDebugEnabled()) { + logger.debug("Root fragment:\n {}", DrillStringUtils.unescapeJava(fragment.toString())); + } rootFragment = fragment; rootOperator = root; } else { - logger.debug("Remote fragment:\n {}", DrillStringUtils.unescapeJava(fragment.toString())); + if (logger.isDebugEnabled()) { + logger.debug("Remote fragment:\n {}", DrillStringUtils.unescapeJava(fragment.toString())); + } fragments.add(fragment); } } http://git-wip-us.apache.org/repos/asf/drill/blob/4edabe7a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/contrib/SplittingParallelizer.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/contrib/SplittingParallelizer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/contrib/SplittingParallelizer.java index 3488e7f..395a9e1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/contrib/SplittingParallelizer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/contrib/SplittingParallelizer.java @@ -211,11 +211,15 @@ public class SplittingParallelizer extends SimpleParallelizer { .build(); if (isRootNode) { - logger.debug("Root fragment:\n {}", DrillStringUtils.unescapeJava(fragment.toString())); + if (logger.isDebugEnabled()) { + logger.debug("Root fragment:\n {}", DrillStringUtils.unescapeJava(fragment.toString())); + } rootFragment = fragment; rootOperator = root; } else { - logger.debug("Remote fragment:\n {}", DrillStringUtils.unescapeJava(fragment.toString())); + if (logger.isDebugEnabled()) { + logger.debug("Remote fragment:\n {}", DrillStringUtils.unescapeJava(fragment.toString())); + } throw new ForemanSetupException(String.format("There should not be non-root/remote fragment present in plan split, but there is:", DrillStringUtils.unescapeJava(fragment.toString()))); }