Repository: zeppelin Updated Branches: refs/heads/master c6b73beae -> 7691b7f09
ZEPPELIN-3141. Fixed Checkstyle errors and warnings in the pig module ### What is this PR for? Fixed the Checkstyle errors and warnings in the pig module. ### What type of PR is it? Improvement ### Todos * [ ] - Task ### What is the Jira issue? * https://issues.apache.org/jira/browse/ZEPPELIN-3141 ### How should this be tested? * CI pass ### Screenshots (if appropriate) ### Questions: * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: Jan Hentschel <[email protected]> Closes #2773 from HorizonNet/ZEPPELIN-3141 and squashes the following commits: 080fad5 [Jan Hentschel] ZEPPELIN-3141. Fixed Checkstyle errors and warnings in the pig module Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/7691b7f0 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/7691b7f0 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/7691b7f0 Branch: refs/heads/master Commit: 7691b7f09c6a2bd59f310656771d7cb7916a5a94 Parents: c6b73be Author: Jan Hentschel <[email protected]> Authored: Wed Feb 7 13:15:18 2018 +0100 Committer: Jeff Zhang <[email protected]> Committed: Thu Feb 8 12:46:15 2018 +0800 ---------------------------------------------------------------------- pig/pom.xml | 7 +++++ .../apache/zeppelin/pig/BasePigInterpreter.java | 12 ++++----- .../org/apache/zeppelin/pig/PigInterpreter.java | 15 ++++++----- .../zeppelin/pig/PigQueryInterpreter.java | 16 +++++++----- .../apache/zeppelin/pig/PigScriptListener.java | 4 +-- .../java/org/apache/zeppelin/pig/PigUtils.java | 24 ++--------------- .../zeppelin/pig/PigInterpreterSparkTest.java | 17 ++++++------ .../apache/zeppelin/pig/PigInterpreterTest.java | 23 +++++++++-------- .../zeppelin/pig/PigInterpreterTezTest.java | 21 +++++++-------- .../zeppelin/pig/PigQueryInterpreterTest.java | 27 +++++++++++--------- 10 files changed, 82 insertions(+), 84 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/7691b7f0/pig/pom.xml ---------------------------------------------------------------------- diff --git a/pig/pom.xml b/pig/pom.xml index 4553b5c..571d198 100644 --- a/pig/pom.xml +++ b/pig/pom.xml @@ -190,6 +190,13 @@ <forkMode>always</forkMode> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <configuration> + <skip>false</skip> + </configuration> + </plugin> </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/7691b7f0/pig/src/main/java/org/apache/zeppelin/pig/BasePigInterpreter.java ---------------------------------------------------------------------- diff --git a/pig/src/main/java/org/apache/zeppelin/pig/BasePigInterpreter.java b/pig/src/main/java/org/apache/zeppelin/pig/BasePigInterpreter.java index 1fb2a69..9503aa7 100644 --- a/pig/src/main/java/org/apache/zeppelin/pig/BasePigInterpreter.java +++ b/pig/src/main/java/org/apache/zeppelin/pig/BasePigInterpreter.java @@ -23,10 +23,6 @@ import org.apache.pig.PigServer; import org.apache.pig.backend.BackendException; import org.apache.pig.backend.hadoop.executionengine.HExecutionEngine; import org.apache.pig.backend.hadoop.executionengine.Launcher; -import org.apache.zeppelin.interpreter.Interpreter; -import org.apache.zeppelin.interpreter.InterpreterContext; -import org.apache.zeppelin.scheduler.Scheduler; -import org.apache.zeppelin.scheduler.SchedulerFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,12 +31,16 @@ import java.util.Properties; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; +import org.apache.zeppelin.interpreter.Interpreter; +import org.apache.zeppelin.interpreter.InterpreterContext; +import org.apache.zeppelin.scheduler.Scheduler; +import org.apache.zeppelin.scheduler.SchedulerFactory; + /** * */ public abstract class BasePigInterpreter extends Interpreter { - - private static Logger LOGGER = LoggerFactory.getLogger(BasePigInterpreter.class); + private static final Logger LOGGER = LoggerFactory.getLogger(BasePigInterpreter.class); protected ConcurrentHashMap<String, PigScriptListener> listenerMap = new ConcurrentHashMap<>(); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/7691b7f0/pig/src/main/java/org/apache/zeppelin/pig/PigInterpreter.java ---------------------------------------------------------------------- diff --git a/pig/src/main/java/org/apache/zeppelin/pig/PigInterpreter.java b/pig/src/main/java/org/apache/zeppelin/pig/PigInterpreter.java index 0f2d59b..4fc0676 100644 --- a/pig/src/main/java/org/apache/zeppelin/pig/PigInterpreter.java +++ b/pig/src/main/java/org/apache/zeppelin/pig/PigInterpreter.java @@ -22,23 +22,26 @@ import org.apache.commons.lang.exception.ExceptionUtils; import org.apache.pig.PigServer; import org.apache.pig.impl.logicalLayer.FrontendException; import org.apache.pig.tools.pigscript.parser.ParseException; -import org.apache.pig.tools.pigstats.*; -import org.apache.zeppelin.interpreter.InterpreterContext; -import org.apache.zeppelin.interpreter.InterpreterResult; -import org.apache.zeppelin.interpreter.InterpreterResult.Code; +import org.apache.pig.tools.pigstats.PigStats; +import org.apache.pig.tools.pigstats.ScriptState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.File; import java.io.IOException; import java.io.PrintStream; -import java.util.*; +import java.util.Map; +import java.util.Properties; + +import org.apache.zeppelin.interpreter.InterpreterContext; +import org.apache.zeppelin.interpreter.InterpreterResult; +import org.apache.zeppelin.interpreter.InterpreterResult.Code; /** * Pig interpreter for Zeppelin. */ public class PigInterpreter extends BasePigInterpreter { - private static Logger LOGGER = LoggerFactory.getLogger(PigInterpreter.class); + private static final Logger LOGGER = LoggerFactory.getLogger(PigInterpreter.class); private PigServer pigServer; private boolean includeJobStats = false; http://git-wip-us.apache.org/repos/asf/zeppelin/blob/7691b7f0/pig/src/main/java/org/apache/zeppelin/pig/PigQueryInterpreter.java ---------------------------------------------------------------------- diff --git a/pig/src/main/java/org/apache/zeppelin/pig/PigQueryInterpreter.java b/pig/src/main/java/org/apache/zeppelin/pig/PigQueryInterpreter.java index da3d50e..364d412 100644 --- a/pig/src/main/java/org/apache/zeppelin/pig/PigQueryInterpreter.java +++ b/pig/src/main/java/org/apache/zeppelin/pig/PigQueryInterpreter.java @@ -15,10 +15,8 @@ * limitations under the License. */ - package org.apache.zeppelin.pig; - import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.exception.ExceptionUtils; import org.apache.pig.PigServer; @@ -28,8 +26,6 @@ import org.apache.pig.impl.logicalLayer.schema.Schema; import org.apache.pig.tools.pigscript.parser.ParseException; import org.apache.pig.tools.pigstats.PigStats; import org.apache.pig.tools.pigstats.ScriptState; -import org.apache.zeppelin.interpreter.*; -import org.apache.zeppelin.interpreter.InterpreterResult.Code; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,12 +36,20 @@ import java.util.Iterator; import java.util.List; import java.util.Properties; +import org.apache.zeppelin.interpreter.Interpreter; +import org.apache.zeppelin.interpreter.InterpreterContext; +import org.apache.zeppelin.interpreter.InterpreterException; +import org.apache.zeppelin.interpreter.InterpreterResult; +import org.apache.zeppelin.interpreter.InterpreterResult.Code; +import org.apache.zeppelin.interpreter.LazyOpenInterpreter; +import org.apache.zeppelin.interpreter.ResultMessages; +import org.apache.zeppelin.interpreter.WrappedInterpreter; + /** * */ public class PigQueryInterpreter extends BasePigInterpreter { - - private static Logger LOGGER = LoggerFactory.getLogger(PigQueryInterpreter.class); + private static final Logger LOGGER = LoggerFactory.getLogger(PigQueryInterpreter.class); private static final String MAX_RESULTS = "zeppelin.pig.maxResult"; private PigServer pigServer; private int maxResult; http://git-wip-us.apache.org/repos/asf/zeppelin/blob/7691b7f0/pig/src/main/java/org/apache/zeppelin/pig/PigScriptListener.java ---------------------------------------------------------------------- diff --git a/pig/src/main/java/org/apache/zeppelin/pig/PigScriptListener.java b/pig/src/main/java/org/apache/zeppelin/pig/PigScriptListener.java index 1f88b2e..8ff1bf8 100644 --- a/pig/src/main/java/org/apache/zeppelin/pig/PigScriptListener.java +++ b/pig/src/main/java/org/apache/zeppelin/pig/PigScriptListener.java @@ -15,7 +15,6 @@ * limitations under the License. */ - package org.apache.zeppelin.pig; import org.apache.pig.impl.plan.OperatorPlan; @@ -32,8 +31,7 @@ import java.util.Set; * */ public class PigScriptListener implements PigProgressNotificationListener { - - private static Logger LOGGER = LoggerFactory.getLogger(PigScriptListener.class); + private static final Logger LOGGER = LoggerFactory.getLogger(PigScriptListener.class); private Set<String> jobIds = new HashSet(); private int progress; http://git-wip-us.apache.org/repos/asf/zeppelin/blob/7691b7f0/pig/src/main/java/org/apache/zeppelin/pig/PigUtils.java ---------------------------------------------------------------------- diff --git a/pig/src/main/java/org/apache/zeppelin/pig/PigUtils.java b/pig/src/main/java/org/apache/zeppelin/pig/PigUtils.java index 8fc69ed..1c48250 100644 --- a/pig/src/main/java/org/apache/zeppelin/pig/PigUtils.java +++ b/pig/src/main/java/org/apache/zeppelin/pig/PigUtils.java @@ -17,40 +17,21 @@ package org.apache.zeppelin.pig; - import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.exception.ExceptionUtils; -import org.apache.pig.PigRunner; -import org.apache.pig.backend.hadoop.executionengine.spark.plan.SparkOperator; -import org.apache.pig.backend.hadoop.executionengine.tez.TezExecType; -import org.apache.pig.tools.pigstats.InputStats; -import org.apache.pig.tools.pigstats.JobStats; -import org.apache.pig.tools.pigstats.OutputStats; -import org.apache.pig.tools.pigstats.PigStats; -import org.apache.pig.tools.pigstats.mapreduce.MRJobStats; -import org.apache.pig.tools.pigstats.mapreduce.SimplePigStats; -import org.apache.pig.tools.pigstats.spark.SparkJobStats; -import org.apache.pig.tools.pigstats.spark.SparkPigStats; -import org.apache.pig.tools.pigstats.spark.SparkScriptState; -import org.apache.pig.tools.pigstats.tez.TezDAGStats; -import org.apache.pig.tools.pigstats.tez.TezPigScriptStats; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.File; import java.io.FileWriter; import java.io.IOException; -import java.lang.reflect.Field; -import java.text.SimpleDateFormat; -import java.util.*; +import java.util.List; /** * */ public class PigUtils { - - private static Logger LOGGER = LoggerFactory.getLogger(PigUtils.class); + private static final Logger LOGGER = LoggerFactory.getLogger(PigUtils.class); protected static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss"; @@ -66,5 +47,4 @@ public class PigUtils { public static File createTempPigScript(List<String> lines) throws IOException { return createTempPigScript(StringUtils.join(lines, "\n")); } - } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/7691b7f0/pig/src/test/java/org/apache/zeppelin/pig/PigInterpreterSparkTest.java ---------------------------------------------------------------------- diff --git a/pig/src/test/java/org/apache/zeppelin/pig/PigInterpreterSparkTest.java b/pig/src/test/java/org/apache/zeppelin/pig/PigInterpreterSparkTest.java index 43ade16..d25d6e2 100644 --- a/pig/src/test/java/org/apache/zeppelin/pig/PigInterpreterSparkTest.java +++ b/pig/src/test/java/org/apache/zeppelin/pig/PigInterpreterSparkTest.java @@ -16,12 +16,12 @@ * limitations under the License. */ - package org.apache.zeppelin.pig; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import org.apache.commons.io.IOUtils; -import org.apache.zeppelin.interpreter.InterpreterContext; -import org.apache.zeppelin.interpreter.InterpreterResult; import org.junit.After; import org.junit.Test; @@ -30,9 +30,8 @@ import java.io.FileWriter; import java.io.IOException; import java.util.Properties; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - +import org.apache.zeppelin.interpreter.InterpreterContext; +import org.apache.zeppelin.interpreter.InterpreterResult; public class PigInterpreterSparkTest { private PigInterpreter pigInterpreter; @@ -86,7 +85,8 @@ public class PigInterpreterSparkTest { result = pigInterpreter.interpret(pigscript, context); assertEquals(InterpreterResult.Type.TEXT, result.message().get(0).getType()); assertEquals(InterpreterResult.Code.ERROR, result.code()); - assertTrue(result.message().get(0).getData().contains("Syntax error, unexpected symbol at or near 'a'")); + assertTrue(result.message().get(0).getData().contains( + "Syntax error, unexpected symbol at or near 'a'")); // syntax error pigscript = "a = load '" + tmpFile.getAbsolutePath() + "';" @@ -133,7 +133,8 @@ public class PigInterpreterSparkTest { assertEquals(InterpreterResult.Type.TEXT, result.message().get(0).getType()); assertEquals(InterpreterResult.Code.ERROR, result.code()); // no job is launched, so no jobStats - assertTrue(result.message().get(0).getData().contains("Syntax error, unexpected symbol at or near 'a'")); + assertTrue(result.message().get(0).getData().contains( + "Syntax error, unexpected symbol at or near 'a'")); // execution error pigscript = "a = load 'invalid_path';" http://git-wip-us.apache.org/repos/asf/zeppelin/blob/7691b7f0/pig/src/test/java/org/apache/zeppelin/pig/PigInterpreterTest.java ---------------------------------------------------------------------- diff --git a/pig/src/test/java/org/apache/zeppelin/pig/PigInterpreterTest.java b/pig/src/test/java/org/apache/zeppelin/pig/PigInterpreterTest.java index ac13390..59ea753 100644 --- a/pig/src/test/java/org/apache/zeppelin/pig/PigInterpreterTest.java +++ b/pig/src/test/java/org/apache/zeppelin/pig/PigInterpreterTest.java @@ -16,16 +16,13 @@ * limitations under the License. */ - package org.apache.zeppelin.pig; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import org.apache.commons.io.IOUtils; -import org.apache.zeppelin.interpreter.InterpreterContext; -import org.apache.zeppelin.interpreter.InterpreterResult; -import org.apache.zeppelin.interpreter.InterpreterResult.Code; -import org.apache.zeppelin.interpreter.InterpreterResult.Type; import org.junit.After; -import org.junit.Before; import org.junit.Test; import java.io.File; @@ -33,8 +30,10 @@ import java.io.FileWriter; import java.io.IOException; import java.util.Properties; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import org.apache.zeppelin.interpreter.InterpreterContext; +import org.apache.zeppelin.interpreter.InterpreterResult; +import org.apache.zeppelin.interpreter.InterpreterResult.Code; +import org.apache.zeppelin.interpreter.InterpreterResult.Type; public class PigInterpreterTest { @@ -48,7 +47,7 @@ public class PigInterpreterTest { pigInterpreter = new PigInterpreter(properties); pigInterpreter.open(); context = new InterpreterContext(null, "paragraph_id", null, null, null, - null, null, null, null, null, null,null, null); + null, null, null, null, null, null, null, null); } @After @@ -89,7 +88,8 @@ public class PigInterpreterTest { result = pigInterpreter.interpret(pigscript, context); assertEquals(Type.TEXT, result.message().get(0).getType()); assertEquals(Code.ERROR, result.code()); - assertTrue(result.message().get(0).getData().contains("Syntax error, unexpected symbol at or near 'a'")); + assertTrue(result.message().get(0).getData().contains( + "Syntax error, unexpected symbol at or near 'a'")); // execution error pigscript = "a = load 'invalid_path';" @@ -139,7 +139,8 @@ public class PigInterpreterTest { assertEquals(Code.ERROR, result.code()); // no job is launched, so no jobStats assertTrue(!result.message().get(0).getData().contains("Counters:")); - assertTrue(result.message().get(0).getData().contains("Syntax error, unexpected symbol at or near 'a'")); + assertTrue(result.message().get(0).getData().contains( + "Syntax error, unexpected symbol at or near 'a'")); // execution error pigscript = "a = load 'invalid_path';" http://git-wip-us.apache.org/repos/asf/zeppelin/blob/7691b7f0/pig/src/test/java/org/apache/zeppelin/pig/PigInterpreterTezTest.java ---------------------------------------------------------------------- diff --git a/pig/src/test/java/org/apache/zeppelin/pig/PigInterpreterTezTest.java b/pig/src/test/java/org/apache/zeppelin/pig/PigInterpreterTezTest.java index 48f07bf..409502b 100644 --- a/pig/src/test/java/org/apache/zeppelin/pig/PigInterpreterTezTest.java +++ b/pig/src/test/java/org/apache/zeppelin/pig/PigInterpreterTezTest.java @@ -16,16 +16,13 @@ * limitations under the License. */ - package org.apache.zeppelin.pig; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import org.apache.commons.io.IOUtils; -import org.apache.zeppelin.interpreter.InterpreterContext; -import org.apache.zeppelin.interpreter.InterpreterResult; -import org.apache.zeppelin.interpreter.InterpreterResult.Code; -import org.apache.zeppelin.interpreter.InterpreterResult.Type; import org.junit.After; -import org.junit.Before; import org.junit.Test; import java.io.File; @@ -33,8 +30,10 @@ import java.io.FileWriter; import java.io.IOException; import java.util.Properties; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import org.apache.zeppelin.interpreter.InterpreterContext; +import org.apache.zeppelin.interpreter.InterpreterResult; +import org.apache.zeppelin.interpreter.InterpreterResult.Code; +import org.apache.zeppelin.interpreter.InterpreterResult.Type; public class PigInterpreterTezTest { @@ -94,7 +93,8 @@ public class PigInterpreterTezTest { result = pigInterpreter.interpret(pigscript, context); assertEquals(Type.TEXT, result.message().get(0).getType()); assertEquals(Code.ERROR, result.code()); - assertTrue(result.message().get(0).getData().contains("Syntax error, unexpected symbol at or near 'a'")); + assertTrue(result.message().get(0).getData().contains( + "Syntax error, unexpected symbol at or near 'a'")); // syntax error pigscript = "a = load '" + tmpFile.getAbsolutePath() + "';" @@ -143,7 +143,8 @@ public class PigInterpreterTezTest { assertEquals(Code.ERROR, result.code()); // no job is launched, so no jobStats assertTrue(!result.message().get(0).getData().contains("Vertex Stats")); - assertTrue(result.message().get(0).getData().contains("Syntax error, unexpected symbol at or near 'a'")); + assertTrue(result.message().get(0).getData().contains( + "Syntax error, unexpected symbol at or near 'a'")); // execution error pigscript = "a = load 'invalid_path';" http://git-wip-us.apache.org/repos/asf/zeppelin/blob/7691b7f0/pig/src/test/java/org/apache/zeppelin/pig/PigQueryInterpreterTest.java ---------------------------------------------------------------------- diff --git a/pig/src/test/java/org/apache/zeppelin/pig/PigQueryInterpreterTest.java b/pig/src/test/java/org/apache/zeppelin/pig/PigQueryInterpreterTest.java index ad395b5..2ca586b 100644 --- a/pig/src/test/java/org/apache/zeppelin/pig/PigQueryInterpreterTest.java +++ b/pig/src/test/java/org/apache/zeppelin/pig/PigQueryInterpreterTest.java @@ -18,15 +18,12 @@ package org.apache.zeppelin.pig; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import org.apache.commons.io.IOUtils; -import org.apache.zeppelin.interpreter.Interpreter; -import org.apache.zeppelin.interpreter.InterpreterContext; -import org.apache.zeppelin.interpreter.InterpreterException; -import org.apache.zeppelin.interpreter.InterpreterGroup; -import org.apache.zeppelin.interpreter.InterpreterResult; import org.junit.After; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import java.io.File; @@ -36,8 +33,11 @@ import java.util.ArrayList; import java.util.List; import java.util.Properties; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import org.apache.zeppelin.interpreter.Interpreter; +import org.apache.zeppelin.interpreter.InterpreterContext; +import org.apache.zeppelin.interpreter.InterpreterException; +import org.apache.zeppelin.interpreter.InterpreterGroup; +import org.apache.zeppelin.interpreter.InterpreterResult; /** * @@ -93,7 +93,8 @@ public class PigQueryInterpreterTest { InterpreterResult result = pigInterpreter.interpret(pigscript, context); assertEquals(InterpreterResult.Type.TEXT, result.message().get(0).getType()); assertEquals(InterpreterResult.Code.SUCCESS, result.code()); - assertTrue(result.message().get(0).getData().contains("(andy,male,10)\n(peter,male,20)\n(amy,female,14)")); + assertTrue(result.message().get(0).getData().contains( + "(andy,male,10)\n(peter,male,20)\n(amy,female,14)")); // run single line query in PigQueryInterpreter String query = "foreach a generate name, age;"; @@ -117,11 +118,13 @@ public class PigQueryInterpreterTest { assertEquals("group\tcol_1\nmale\t2\nfemale\t1\n", result.message().get(0).getData()); // syntax error in PigQueryInterpereter - query = "b = group a by invalid_column;\nforeach b generate group as gender, COUNT($1) as count;"; + query = "b = group a by invalid_column;\nforeach b generate group as gender, " + + "COUNT($1) as count;"; result = pigQueryInterpreter.interpret(query, context); assertEquals(InterpreterResult.Type.TEXT, result.message().get(0).getType()); assertEquals(InterpreterResult.Code.ERROR, result.code()); - assertTrue(result.message().get(0).getData().contains("Projected field [invalid_column] does not exist in schema")); + assertTrue(result.message().get(0).getData().contains( + "Projected field [invalid_column] does not exist in schema")); // execution error in PigQueryInterpreter query = "foreach a2 generate name, age;"; @@ -134,7 +137,7 @@ public class PigQueryInterpreterTest { @Test public void testMaxResult() throws IOException { StringBuilder content = new StringBuilder(); - for (int i=0;i<30;++i) { + for (int i = 0; i < 30; ++i) { content.append(i + "\tname_" + i + "\n"); } File tmpFile = File.createTempFile("zeppelin", "test");
