Repository: calcite Updated Branches: refs/heads/master 4e9064fa9 -> 0c0f61e96
[CALCITE-2520] Make SparkHandlerImpl#compile silent by default, print code in calcite.debug=true mode only Project: http://git-wip-us.apache.org/repos/asf/calcite/repo Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/0c0f61e9 Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/0c0f61e9 Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/0c0f61e9 Branch: refs/heads/master Commit: 0c0f61e963497070a62ccdfc50c84b2826ca2d5f Parents: 4e9064f Author: Vladimir Sitnikov <[email protected]> Authored: Sat Sep 1 04:38:07 2018 +0300 Committer: Vladimir Sitnikov <[email protected]> Committed: Sat Sep 1 04:38:18 2018 +0300 ---------------------------------------------------------------------- .../java/org/apache/calcite/util/javac/JaninoCompiler.java | 6 ++++++ .../org/apache/calcite/adapter/spark/SparkHandlerImpl.java | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/calcite/blob/0c0f61e9/core/src/main/java/org/apache/calcite/util/javac/JaninoCompiler.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/util/javac/JaninoCompiler.java b/core/src/main/java/org/apache/calcite/util/javac/JaninoCompiler.java index a84fbdb..74e542a 100644 --- a/core/src/main/java/org/apache/calcite/util/javac/JaninoCompiler.java +++ b/core/src/main/java/org/apache/calcite/util/javac/JaninoCompiler.java @@ -16,6 +16,8 @@ */ package org.apache.calcite.util.javac; +import org.apache.calcite.prepare.CalcitePrepareImpl; + import org.codehaus.janino.JavaSourceClassLoader; import org.codehaus.janino.util.ClassFile; import org.codehaus.janino.util.resource.MapResourceFinder; @@ -77,6 +79,10 @@ public class JaninoCompiler implements JavaCompiler { sourceFinder, null, args.destdir == null ? null : new File(args.destdir)); + if (CalcitePrepareImpl.DEBUG) { + // Add line numbers to the generated janino class + classLoader.setDebuggingInfo(true, true, true); + } try { classLoader.loadClass(args.fullClassName); } catch (ClassNotFoundException ex) { http://git-wip-us.apache.org/repos/asf/calcite/blob/0c0f61e9/spark/src/main/java/org/apache/calcite/adapter/spark/SparkHandlerImpl.java ---------------------------------------------------------------------- diff --git a/spark/src/main/java/org/apache/calcite/adapter/spark/SparkHandlerImpl.java b/spark/src/main/java/org/apache/calcite/adapter/spark/SparkHandlerImpl.java index 6935490..e73b4bd 100644 --- a/spark/src/main/java/org/apache/calcite/adapter/spark/SparkHandlerImpl.java +++ b/spark/src/main/java/org/apache/calcite/adapter/spark/SparkHandlerImpl.java @@ -21,6 +21,7 @@ import org.apache.calcite.jdbc.CalcitePrepare; import org.apache.calcite.linq4j.tree.ClassDeclaration; import org.apache.calcite.plan.RelOptPlanner; import org.apache.calcite.plan.RelOptRule; +import org.apache.calcite.prepare.CalcitePrepareImpl; import org.apache.calcite.rel.RelNode; import org.apache.calcite.runtime.ArrayBindable; import org.apache.calcite.util.Util; @@ -111,9 +112,9 @@ public class SparkHandlerImpl implements CalcitePrepare.SparkHandler { + s + "\n" + "}\n"; - System.out.println("======================"); - System.out.println(source); - System.out.println("======================"); + if (CalcitePrepareImpl.DEBUG) { + Util.debugCode(System.out, source); + } JaninoCompiler compiler = new JaninoCompiler(); compiler.getArgs().setDestdir(CLASS_DIR.getAbsolutePath());
