You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by jx...@apache.org on 2016/11/16 17:09:25 UTC
hive git commit: HIVE-15208: Query string should be HTML encoded for
Web UI (Jimmy Xiang, reviewed by Xuefu Zhang)
Repository: hive
Updated Branches:
refs/heads/master e4e3a07d8 -> 5aff550b9
HIVE-15208: Query string should be HTML encoded for Web UI (Jimmy Xiang, reviewed by Xuefu Zhang)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/5aff550b
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/5aff550b
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/5aff550b
Branch: refs/heads/master
Commit: 5aff550b96f50bd65a37756ec19d66e0c8a8eceb
Parents: e4e3a07
Author: Jimmy Xiang <jx...@apache.org>
Authored: Tue Nov 15 09:41:24 2016 -0800
Committer: Jimmy Xiang <jx...@apache.org>
Committed: Wed Nov 16 09:08:51 2016 -0800
----------------------------------------------------------------------
service/src/jamon/org/apache/hive/tmpl/QueryProfileTmpl.jamon | 4 ++--
service/src/resources/hive-webapps/hiveserver2/hiveserver2.jsp | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/5aff550b/service/src/jamon/org/apache/hive/tmpl/QueryProfileTmpl.jamon
----------------------------------------------------------------------
diff --git a/service/src/jamon/org/apache/hive/tmpl/QueryProfileTmpl.jamon b/service/src/jamon/org/apache/hive/tmpl/QueryProfileTmpl.jamon
index 690c6f3..07aa3c1 100644
--- a/service/src/jamon/org/apache/hive/tmpl/QueryProfileTmpl.jamon
+++ b/service/src/jamon/org/apache/hive/tmpl/QueryProfileTmpl.jamon
@@ -160,7 +160,7 @@ org.apache.hive.service.cli.operation.SQLOperationDisplay;
</%if>
<tr>
<td>Latency (s)</td>
- <td><% sod.getRuntime()/1000 %></td>
+ <td><% sod.getRuntime() == null ? "Not finished" : sod.getRuntime()/1000 %></td>
</tr>
</table>
</%def>
@@ -299,4 +299,4 @@ org.apache.hive.service.cli.operation.SQLOperationDisplay;
<script src="/static/js/bootstrap.min.js" type="text/javascript"></script>
<script src="/static/js/tab.js" type="text/javascript"></script>
</body>
-</html>
\ No newline at end of file
+</html>
http://git-wip-us.apache.org/repos/asf/hive/blob/5aff550b/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 3c187b6..6e89981 100644
--- a/service/src/resources/hive-webapps/hiveserver2/hiveserver2.jsp
+++ b/service/src/resources/hive-webapps/hiveserver2/hiveserver2.jsp
@@ -31,6 +31,7 @@
import="java.util.Collection"
import="java.util.Date"
import="java.util.List"
+ import="jodd.util.HtmlEncoder"
%>
<%
@@ -146,7 +147,7 @@ for (HiveSession hiveSession: hiveSessions) {
%>
<tr>
<td><%= operation.getUserName() %></td>
- <td><%= operation.getQueryDisplay() == null ? "Unknown" : operation.getQueryDisplay().getQueryString() %></td>
+ <td><%= HtmlEncoder.strict(operation.getQueryDisplay() == null ? "Unknown" : operation.getQueryDisplay().getQueryString()) %></td>
<td><%= operation.getExecutionEngine() %>
<td><%= operation.getState() %></td>
<td><%= new Date(operation.getBeginTime()) %></td>
@@ -187,7 +188,7 @@ for (HiveSession hiveSession: hiveSessions) {
%>
<tr>
<td><%= operation.getUserName() %></td>
- <td><%= operation.getQueryDisplay() == null ? "Unknown" : operation.getQueryDisplay().getQueryString() %></td>
+ <td><%= HtmlEncoder.strict(operation.getQueryDisplay() == null ? "Unknown" : operation.getQueryDisplay().getQueryString()) %></td>
<td><%= operation.getExecutionEngine() %>
<td><%= operation.getState() %></td>
<td><%= operation.getElapsedTime()/1000 %></td>