address comments

zjffdu · zjffdu · commit 39f161a36aad · 2016-10-08T16:40:04.000+08:00
diff --git a/docs/interpreter/pig.md b/docs/interpreter/pig.md
@@ -74,6 +74,8 @@ dump c;
 
 **pig.query**
 ```
+%pig.query
+
 b = foreach raw_data generate Category;
 c = group b by Category;
 foreach c generate group as category, COUNT($1) as count;
diff --git a/pig/pom.xml b/pig/pom.xml
@@ -122,20 +122,6 @@
             <scope>test</scope>
         </dependency>
 
-        <!--<dependency>-->
-        <!--<groupId>org.mockito</groupId>-->
-        <!--<artifactId>mockito-all</artifactId>-->
-        <!--<version>1.9.5</version>-->
-        <!--<scope>test</scope>-->
-        <!--</dependency>-->
-
-        <!--<dependency>-->
-        <!--<groupId>com.mockrunner</groupId>-->
-        <!--<artifactId>mockrunner-jdbc</artifactId>-->
-        <!--<version>1.0.8</version>-->
-        <!--<scope>test</scope>-->
-        <!--</dependency>-->
-
     </dependencies>
 
     <build>
diff --git a/pig/src/main/java/org/apache/zeppelin/pig/PigInterpreter.java b/pig/src/main/java/org/apache/zeppelin/pig/PigInterpreter.java
@@ -94,14 +94,15 @@ public InterpreterResult interpret(String cmd, InterpreterContext contextInterpr
         if (!fe.getMessage().contains("Backend error :")) {
           // If the error message contains "Backend error :", that means the exception is from
           // backend.
+          LOGGER.error("Fail to run pig script.", e);
           return new InterpreterResult(Code.ERROR, ExceptionUtils.getStackTrace(e));
         }
       }
       PigStats stats = PigStats.get();
       if (stats != null) {
         String errorMsg = PigUtils.extactJobStats(stats);
         if (errorMsg != null) {
-          LOGGER.debug("Error Message:" + errorMsg);
+          LOGGER.error("Fail to run pig script, " + errorMsg);
           return new InterpreterResult(Code.ERROR, errorMsg);
         }
       }
diff --git a/pig/src/main/java/org/apache/zeppelin/pig/PigQueryInterpreter.java b/pig/src/main/java/org/apache/zeppelin/pig/PigQueryInterpreter.java
@@ -126,6 +126,7 @@ public InterpreterResult interpret(String st, InterpreterContext context) {
       if (e instanceof FrontendException) {
         FrontendException fe = (FrontendException) e;
         if (!fe.getMessage().contains("Backend error :")) {
+          LOGGER.error("Fail to run pig script.", e);
           return new InterpreterResult(Code.ERROR, ExceptionUtils.getStackTrace(e));
         }
       }
diff --git a/pig/src/main/java/org/apache/zeppelin/pig/PigUtils.java b/pig/src/main/java/org/apache/zeppelin/pig/PigUtils.java
@@ -267,6 +267,7 @@ public static List<String> extractJobIdsFromSimplePigStats(SimplePigStats stat)
       }
       return jobIds;
     } catch (Exception e) {
+      LOGGER.error("Can not extract jobIds from SimpelPigStats", e);
       throw new RuntimeException("Can not extract jobIds from SimpelPigStats", e);
     }
   }
@@ -279,11 +280,12 @@ public static List<String> extractJobIdsFromTezPigStats(TezPigScriptStats stat)
       Map<String, TezDAGStats> tezDAGStatsMap =
               (Map<String, TezDAGStats>) tezDAGStatsMapField.get(stat);
       for (TezDAGStats dagStats : tezDAGStatsMap.values()) {
-        LOGGER.info("Tez JobId:" + dagStats.getJobId());
+        LOGGER.debug("Tez JobId:" + dagStats.getJobId());
         jobIds.add(dagStats.getJobId());
       }
       return jobIds;
     } catch (Exception e) {
+      LOGGER.error("Can not extract jobIds from TezPigScriptStats", e);
       throw new RuntimeException("Can not extract jobIds from TezPigScriptStats", e);
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -94,14 +94,15 @@ public InterpreterResult interpret(String cmd, InterpreterContext contextInterpr`
`94`	`94`	`if (!fe.getMessage().contains("Backend error :")) {`
`95`	`95`	`// If the error message contains "Backend error :", that means the exception is from`
`96`	`96`	`// backend.`
	`97`	`+ LOGGER.error("Fail to run pig script.", e);`
`97`	`98`	`return new InterpreterResult(Code.ERROR, ExceptionUtils.getStackTrace(e));`
`98`	`99`	`}`
`99`	`100`	`}`
`100`	`101`	`PigStats stats = PigStats.get();`
`101`	`102`	`if (stats != null) {`
`102`	`103`	`String errorMsg = PigUtils.extactJobStats(stats);`
`103`	`104`	`if (errorMsg != null) {`
`104`		`- LOGGER.debug("Error Message:" + errorMsg);`
	`105`	`+ LOGGER.error("Fail to run pig script, " + errorMsg);`
`105`	`106`	`return new InterpreterResult(Code.ERROR, errorMsg);`
`106`	`107`	`}`
`107`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,7 @@ public InterpreterResult interpret(String st, InterpreterContext context) {`
`126`	`126`	`if (e instanceof FrontendException) {`
`127`	`127`	`FrontendException fe = (FrontendException) e;`
`128`	`128`	`if (!fe.getMessage().contains("Backend error :")) {`
	`129`	`+ LOGGER.error("Fail to run pig script.", e);`
`129`	`130`	`return new InterpreterResult(Code.ERROR, ExceptionUtils.getStackTrace(e));`
`130`	`131`	`}`
`131`	`132`	`}`
Original file line number	Diff line number	Diff line change
`@@ -267,6 +267,7 @@ public static List<String> extractJobIdsFromSimplePigStats(SimplePigStats stat)`
`267`	`267`	`}`
`268`	`268`	`return jobIds;`
`269`	`269`	`} catch (Exception e) {`
	`270`	`+ LOGGER.error("Can not extract jobIds from SimpelPigStats", e);`
`270`	`271`	`throw new RuntimeException("Can not extract jobIds from SimpelPigStats", e);`
`271`	`272`	`}`
`272`	`273`	`}`
`@@ -279,11 +280,12 @@ public static List<String> extractJobIdsFromTezPigStats(TezPigScriptStats stat)`
`279`	`280`	`Map<String, TezDAGStats> tezDAGStatsMap =`
`280`	`281`	`(Map<String, TezDAGStats>) tezDAGStatsMapField.get(stat);`
`281`	`282`	`for (TezDAGStats dagStats : tezDAGStatsMap.values()) {`
`282`		`- LOGGER.info("Tez JobId:" + dagStats.getJobId());`
	`283`	`+ LOGGER.debug("Tez JobId:" + dagStats.getJobId());`
`283`	`284`	`jobIds.add(dagStats.getJobId());`
`284`	`285`	`}`
`285`	`286`	`return jobIds;`
`286`	`287`	`} catch (Exception e) {`
	`288`	`+ LOGGER.error("Can not extract jobIds from TezPigScriptStats", e);`
`287`	`289`	`throw new RuntimeException("Can not extract jobIds from TezPigScriptStats", e);`
`288`	`290`	`}`
`289`	`291`	`}`