You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by sz...@apache.org on 2016/01/21 21:32:19 UTC
hive git commit: HIVE-12549 : Display execution engine in HS2 webui
query view (Shinichi Yamashita via Szehon)
Repository: hive
Updated Branches:
refs/heads/master 607f14873 -> cee2619e0
HIVE-12549 : Display execution engine in HS2 webui query view (Shinichi Yamashita via Szehon)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/cee2619e
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/cee2619e
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/cee2619e
Branch: refs/heads/master
Commit: cee2619e095b8172d77370b7baf5c04da6bea2c7
Parents: 607f148
Author: Szehon Ho <sz...@cloudera.com>
Authored: Thu Jan 21 12:31:43 2016 -0800
Committer: Szehon Ho <sz...@cloudera.com>
Committed: Thu Jan 21 12:31:43 2016 -0800
----------------------------------------------------------------------
.../org/apache/hive/service/cli/operation/SQLOperation.java | 2 +-
service/src/resources/hive-webapps/hiveserver2/hiveserver2.jsp | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/cee2619e/service/src/java/org/apache/hive/service/cli/operation/SQLOperation.java
----------------------------------------------------------------------
diff --git a/service/src/java/org/apache/hive/service/cli/operation/SQLOperation.java b/service/src/java/org/apache/hive/service/cli/operation/SQLOperation.java
index 2eaab4a..c8a69b9 100644
--- a/service/src/java/org/apache/hive/service/cli/operation/SQLOperation.java
+++ b/service/src/java/org/apache/hive/service/cli/operation/SQLOperation.java
@@ -462,7 +462,7 @@ public class SQLOperation extends ExecuteStatementOperation {
* @return new configuration
* @throws HiveSQLException
*/
- private HiveConf getConfigForOperation() throws HiveSQLException {
+ public HiveConf getConfigForOperation() throws HiveSQLException {
HiveConf sqlOperationConf = getParentSession().getHiveConf();
if (!confOverlay.isEmpty() || shouldRunAsync()) {
// clone the partent session config for this query
http://git-wip-us.apache.org/repos/asf/hive/blob/cee2619e/service/src/resources/hive-webapps/hiveserver2/hiveserver2.jsp
----------------------------------------------------------------------
diff --git a/service/src/resources/hive-webapps/hiveserver2/hiveserver2.jsp b/service/src/resources/hive-webapps/hiveserver2/hiveserver2.jsp
index 0b437dd..a91b008 100644
--- a/service/src/resources/hive-webapps/hiveserver2/hiveserver2.jsp
+++ b/service/src/resources/hive-webapps/hiveserver2/hiveserver2.jsp
@@ -19,6 +19,8 @@
--%>
<%@ page contentType="text/html;charset=UTF-8"
import="org.apache.hadoop.conf.Configuration"
+ import="org.apache.hadoop.hive.conf.HiveConf"
+ import="org.apache.hadoop.hive.conf.HiveConf.ConfVars"
import="org.apache.hive.common.util.HiveVersionInfo"
import="org.apache.hive.service.cli.operation.Operation"
import="org.apache.hive.service.cli.operation.SQLOperation"
@@ -126,6 +128,7 @@ for (HiveSession hiveSession: hiveSessions) {
<tr>
<th>User Name</th>
<th>Query</th>
+ <th>Execution Engine</th>
<th>State</th>
<th>Elapsed Time (s)</th>
</tr>
@@ -140,6 +143,7 @@ for (Operation operation: operations) {
<tr>
<td><%= query.getParentSession().getUserName() %></td>
<td><%= query.getQueryStr() %></td>
+ <td><%= query.getConfigForOperation().getVar(ConfVars.HIVE_EXECUTION_ENGINE) %>
<td><%= query.getStatus().getState() %></td>
<td><%= (currentTime - query.getLastAccessTime())/1000 %></td>
</tr>
@@ -148,7 +152,7 @@ for (Operation operation: operations) {
}
%>
<tr>
- <td colspan="4">Total number of queries: <%= queries %></td>
+ <td colspan="5">Total number of queries: <%= queries %></td>
</tr>
</table>
</section>