address comments

zjffdu · zjffdu · commit e858301bdfca · 2016-10-10T08:27:08.000+08:00
diff --git a/bin/interpreter.sh b/bin/interpreter.sh
@@ -164,9 +164,13 @@ elif [[ "${INTERPRETER_ID}" == "pig" ]]; then
   fi
   
   # autodetect TEZ_CONF_DIR
-  TEZ_CONF_DIR = ${TEZ_CONF_DIR:=/etc/tez/conf}
-  echo "TEZ_CONF_DIR:${TEZ_CONF_DIR}"
-  ZEPPELIN_INTP_CLASSPATH+=":${TEZ_CONF_DIR}"
+  if [[ -n "${TEZ_CONF_DIR}" ]]; then
+    ZEPPELIN_INTP_CLASSPATH+=":${TEZ_CONF_DIR}"
+  elif [[ -d "/etc/tez/conf" ]]; then
+    ZEPPELIN_INTP_CLASSPATH+=":/etc/tez/conf"
+  else
+    echo "TEZ_CONF_DIR is not set, configuration might not be loaded"
+  fi
 fi
 
 addJarInDirForIntp "${LOCAL_INTERPRETER_REPO}"
diff --git a/pig/src/main/java/org/apache/zeppelin/pig/PigInterpreter.java b/pig/src/main/java/org/apache/zeppelin/pig/PigInterpreter.java
@@ -59,7 +59,8 @@ public void open() {
     try {
       pigServer = new PigServer(execType);
     } catch (IOException e) {
-      throw new RuntimeException("Fail to launch PigServer", e);
+      LOGGER.error("Fail to initialize PigServer", e);
+      throw new RuntimeException("Fail to initialize PigServer", e);
     }
   }
 
@@ -106,6 +107,7 @@ public InterpreterResult interpret(String cmd, InterpreterContext contextInterpr
           return new InterpreterResult(Code.ERROR, errorMsg);
         }
       }
+      LOGGER.error("Fail to run pig script.", e);
       return new InterpreterResult(Code.ERROR, ExceptionUtils.getStackTrace(e));
     } finally {
       System.setOut(originalStdOut);
@@ -122,9 +124,6 @@ public InterpreterResult interpret(String cmd, InterpreterContext contextInterpr
         outputBuilder.append(jobStats);
       }
     }
-    if (!outputBuilder.toString().isEmpty() || !bytesOutput.toString().isEmpty()) {
-      outputBuilder.append("------------- Pig Output --------------\n");
-    }
     outputBuilder.append(bytesOutput.toString());
     return new InterpreterResult(Code.SUCCESS, outputBuilder.toString());
   }
diff --git a/pig/src/main/java/org/apache/zeppelin/pig/PigQueryInterpreter.java b/pig/src/main/java/org/apache/zeppelin/pig/PigQueryInterpreter.java
@@ -65,6 +65,7 @@ public void close() {
 
   @Override
   public InterpreterResult interpret(String st, InterpreterContext context) {
+    // '-' is invalid for pig alias
     String alias = "paragraph_" + context.getParagraphId().replace("-", "_");
     String[] lines = st.split("\n");
     List<String> queries = new ArrayList<String>();
@@ -126,7 +127,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);
+          LOGGER.error("Fail to run pig query.", e);
           return new InterpreterResult(Code.ERROR, ExceptionUtils.getStackTrace(e));
         }
       }
@@ -137,6 +138,7 @@ public InterpreterResult interpret(String st, InterpreterContext context) {
           return new InterpreterResult(Code.ERROR, errorMsg);
         }
       }
+      LOGGER.error("Fail to run pig query.", e);
       return new InterpreterResult(Code.ERROR, ExceptionUtils.getStackTrace(e));
     } finally {
       listenerMap.remove(context.getParagraphId());
diff --git a/pig/src/main/resources/interpreter-setting.json b/pig/src/main/resources/interpreter-setting.json
@@ -35,7 +35,7 @@
       "zeppelin.pig.maxResult": {
         "envName": null,
         "propertyName": "zeppelin.pig.maxResult",
-        "defaultValue": "20",
+        "defaultValue": "1000",
         "description": "max row number for %pig.query"
       }
     },

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,8 @@ public void open() {`
`59`	`59`	`try {`
`60`	`60`	`pigServer = new PigServer(execType);`
`61`	`61`	`} catch (IOException e) {`
`62`		`- throw new RuntimeException("Fail to launch PigServer", e);`
	`62`	`+ LOGGER.error("Fail to initialize PigServer", e);`
	`63`	`+ throw new RuntimeException("Fail to initialize PigServer", e);`
`63`	`64`	`}`
`64`	`65`	`}`
`65`	`66`
`@@ -106,6 +107,7 @@ public InterpreterResult interpret(String cmd, InterpreterContext contextInterpr`
`106`	`107`	`return new InterpreterResult(Code.ERROR, errorMsg);`
`107`	`108`	`}`
`108`	`109`	`}`
	`110`	`+ LOGGER.error("Fail to run pig script.", e);`
`109`	`111`	`return new InterpreterResult(Code.ERROR, ExceptionUtils.getStackTrace(e));`
`110`	`112`	`} finally {`
`111`	`113`	`System.setOut(originalStdOut);`
`@@ -122,9 +124,6 @@ public InterpreterResult interpret(String cmd, InterpreterContext contextInterpr`
`122`	`124`	`outputBuilder.append(jobStats);`
`123`	`125`	`}`
`124`	`126`	`}`
`125`		`- if (!outputBuilder.toString().isEmpty() \|\| !bytesOutput.toString().isEmpty()) {`
`126`		`- outputBuilder.append("------------- Pig Output --------------\n");`
`127`		`- }`
`128`	`127`	`outputBuilder.append(bytesOutput.toString());`
`129`	`128`	`return new InterpreterResult(Code.SUCCESS, outputBuilder.toString());`
`130`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ public void close() {`
`65`	`65`
`66`	`66`	`@Override`
`67`	`67`	`public InterpreterResult interpret(String st, InterpreterContext context) {`
	`68`	`+ // '-' is invalid for pig alias`
`68`	`69`	`String alias = "paragraph_" + context.getParagraphId().replace("-", "_");`
`69`	`70`	`String[] lines = st.split("\n");`
`70`	`71`	`List<String> queries = new ArrayList<String>();`
`@@ -126,7 +127,7 @@ public InterpreterResult interpret(String st, InterpreterContext context) {`
`126`	`127`	`if (e instanceof FrontendException) {`
`127`	`128`	`FrontendException fe = (FrontendException) e;`
`128`	`129`	`if (!fe.getMessage().contains("Backend error :")) {`
`129`		`- LOGGER.error("Fail to run pig script.", e);`
	`130`	`+ LOGGER.error("Fail to run pig query.", e);`
`130`	`131`	`return new InterpreterResult(Code.ERROR, ExceptionUtils.getStackTrace(e));`
`131`	`132`	`}`
`132`	`133`	`}`
`@@ -137,6 +138,7 @@ public InterpreterResult interpret(String st, InterpreterContext context) {`
`137`	`138`	`return new InterpreterResult(Code.ERROR, errorMsg);`
`138`	`139`	`}`
`139`	`140`	`}`
	`141`	`+ LOGGER.error("Fail to run pig query.", e);`
`140`	`142`	`return new InterpreterResult(Code.ERROR, ExceptionUtils.getStackTrace(e));`
`141`	`143`	`} finally {`
`142`	`144`	`listenerMap.remove(context.getParagraphId());`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@`
`35`	`35`	`"zeppelin.pig.maxResult": {`
`36`	`36`	`"envName": null,`
`37`	`37`	`"propertyName": "zeppelin.pig.maxResult",`
`38`		`- "defaultValue": "20",`
	`38`	`+ "defaultValue": "1000",`
`39`	`39`	`"description": "max row number for %pig.query"`
`40`	`40`	`}`
`41`	`41`	`},`