diff --git itests/hive-unit/src/test/java/org/apache/hive/service/cli/session/TestQueryDisplay.java itests/hive-unit/src/test/java/org/apache/hive/service/cli/session/TestQueryDisplay.java index 155c65dd26..da01a2947d 100644 --- itests/hive-unit/src/test/java/org/apache/hive/service/cli/session/TestQueryDisplay.java +++ itests/hive-unit/src/test/java/org/apache/hive/service/cli/session/TestQueryDisplay.java @@ -172,7 +172,8 @@ private void verifyDDLHtml(String stmt, String opHandle) throws Exception { StringWriter sw = new StringWriter(); QueryInfo queryInfo = sessionManager.getOperationManager().getQueryInfo( opHandle); - new QueryProfileTmpl().render(sw, queryInfo); + HiveConf hiveConf = sessionManager.getOperationManager().getHiveConf(); + new QueryProfileTmpl().render(sw, queryInfo, hiveConf); String html = sw.toString(); Assert.assertTrue(html.contains(stmt)); diff --git ql/src/java/org/apache/hadoop/hive/ql/QueryDisplay.java ql/src/java/org/apache/hadoop/hive/ql/QueryDisplay.java index 5bf22107dc..0c94b472da 100644 --- ql/src/java/org/apache/hadoop/hive/ql/QueryDisplay.java +++ ql/src/java/org/apache/hadoop/hive/ql/QueryDisplay.java @@ -206,8 +206,7 @@ public synchronized String getQueryString() { return returnStringOrUnknown(queryStr); } - public synchronized String getExplainPlan() { - return explainPlan == null ? "SET hive.log.explain.output TO true TO VIEW PLANS" : explainPlan; + public synchronized String getExplainPlan() { return returnStringOrUnknown(explainPlan); } public synchronized void setExplainPlan(String explainPlan) { diff --git service/src/jamon/org/apache/hive/tmpl/QueryProfileTmpl.jamon service/src/jamon/org/apache/hive/tmpl/QueryProfileTmpl.jamon index 5e2d68c4a4..5746d4072f 100644 --- service/src/jamon/org/apache/hive/tmpl/QueryProfileTmpl.jamon +++ service/src/jamon/org/apache/hive/tmpl/QueryProfileTmpl.jamon @@ -18,11 +18,13 @@ limitations under the License. <%args> QueryInfo queryInfo; +HiveConf hiveConf; <%import> java.util.*; org.apache.hadoop.hive.ql.QueryDisplay; org.apache.hadoop.hive.ql.QueryInfo; +org.apache.hadoop.hive.conf.HiveConf;