You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by jv...@apache.org on 2010/09/17 20:54:30 UTC
svn commit: r998253 - in /hadoop/hive/trunk: CHANGES.txt
hwi/src/java/org/apache/hadoop/hive/hwi/HWISessionItem.java
hwi/web/session_result.jsp hwi/web/show_database.jsp
hwi/web/show_databases.jsp
Author: jvs
Date: Fri Sep 17 18:54:30 2010
New Revision: 998253
URL: http://svn.apache.org/viewvc?rev=998253&view=rev
Log:
HIVE-1615. Web Interface JSP needs Refactoring for removed
metastore methods
(Edward Capriolo via jvs)
Modified:
hadoop/hive/trunk/CHANGES.txt
hadoop/hive/trunk/hwi/src/java/org/apache/hadoop/hive/hwi/HWISessionItem.java
hadoop/hive/trunk/hwi/web/session_result.jsp
hadoop/hive/trunk/hwi/web/show_database.jsp
hadoop/hive/trunk/hwi/web/show_databases.jsp
Modified: hadoop/hive/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/CHANGES.txt?rev=998253&r1=998252&r2=998253&view=diff
==============================================================================
--- hadoop/hive/trunk/CHANGES.txt (original)
+++ hadoop/hive/trunk/CHANGES.txt Fri Sep 17 18:54:30 2010
@@ -859,6 +859,10 @@ Release 0.6.0 - Unreleased
defined
(Edward Capriolo via jvs)
+ HIVE-1615. Web Interface JSP needs Refactoring for removed
+ metastore methods
+ (Edward Capriolo via jvs)
+
Release 0.5.0 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/hive/trunk/hwi/src/java/org/apache/hadoop/hive/hwi/HWISessionItem.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/hwi/src/java/org/apache/hadoop/hive/hwi/HWISessionItem.java?rev=998253&r1=998252&r2=998253&view=diff
==============================================================================
--- hadoop/hive/trunk/hwi/src/java/org/apache/hadoop/hive/hwi/HWISessionItem.java (original)
+++ hadoop/hive/trunk/hwi/src/java/org/apache/hadoop/hive/hwi/HWISessionItem.java Fri Sep 17 18:54:30 2010
@@ -334,7 +334,9 @@ public class HWISessionItem implements R
ArrayList<String> res = new ArrayList<String>();
try {
while (qp.getResults(res)) {
- resultBucket.add(res);
+ ArrayList<String> resCopy = new ArrayList<String>();
+ resCopy.addAll(res);
+ resultBucket.add(resCopy);
if (resultBucket.size() > resultBucketMaxSize) {
resultBucket.remove(0);
}
@@ -347,7 +349,7 @@ public class HWISessionItem implements R
throw new RuntimeException("ss was null");
}
}
- // res.clear();
+ res.clear();
}
} catch (IOException ex) {
l4j.error(getSessionName() + " getting results " + getResultFile()
Modified: hadoop/hive/trunk/hwi/web/session_result.jsp
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/hwi/web/session_result.jsp?rev=998253&r1=998252&r2=998253&view=diff
==============================================================================
--- hadoop/hive/trunk/hwi/web/session_result.jsp (original)
+++ hadoop/hive/trunk/hwi/web/session_result.jsp Fri Sep 17 18:54:30 2010
@@ -50,12 +50,10 @@
<% if (si!=null) { %>
<table border=1">
- <% for (List<String> rows : si.getResultBucket() ) { %>
- <tr>
- <% for (String row : rows ) { %>
- <td><%=row%></td>
- <% } %>
- </tr>
+ <% for (List<String> rows : si.getResultBucket() ) { %>
+ <% for (String row : rows ) { %>
+ <tr><td><%=row%></td></tr>
+ <% } %>
<% } %>
</table>
<% } %>
Modified: hadoop/hive/trunk/hwi/web/show_database.jsp
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/hwi/web/show_database.jsp?rev=998253&r1=998252&r2=998253&view=diff
==============================================================================
--- hadoop/hive/trunk/hwi/web/show_database.jsp (original)
+++ hadoop/hive/trunk/hwi/web/show_database.jsp Fri Sep 17 18:54:30 2010
@@ -14,7 +14,7 @@ org.apache.hadoop.hive.cli.*" %>
HiveMetaStoreClient client = new HiveMetaStoreClient(hiveConf);
String db = request.getParameter("db");
Database db2 = client.getDatabase(db);
- List<String> tables = client.getTables(".*");
+ List<String> tables = client.getAllTables(db);
client.close();
%>
<html>
@@ -41,4 +41,4 @@ org.apache.hadoop.hive.cli.*" %>
</tr>
</table>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: hadoop/hive/trunk/hwi/web/show_databases.jsp
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/hwi/web/show_databases.jsp?rev=998253&r1=998252&r2=998253&view=diff
==============================================================================
--- hadoop/hive/trunk/hwi/web/show_databases.jsp (original)
+++ hadoop/hive/trunk/hwi/web/show_databases.jsp Fri Sep 17 18:54:30 2010
@@ -11,7 +11,7 @@ org.apache.hadoop.hive.cli.*" %>
<%
HiveConf hiveConf = new HiveConf(SessionState.class);
HiveMetaStoreClient client = new HiveMetaStoreClient(hiveConf);
- List <String> dbs = client.getDatabases();
+ List <String> dbs = client.getAllDatabases();
client.close();
%>
<html>