tajo git commit: TAJO-1858: Aligning error message in execute query page of web UI is needed.

[jihoonson]

Repository: tajo
Updated Branches:
  refs/heads/master 34508a76d -> e8ee7f2bf


TAJO-1858: Aligning error message in execute query page of web UI is needed.

Closes #921

Signed-off-by: Jihoon Son <jihoon...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/e8ee7f2b
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/e8ee7f2b
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/e8ee7f2b

Branch: refs/heads/master
Commit: e8ee7f2bf4d7cd3145626ab1383c9c53c566222b
Parents: 34508a7
Author: Byunghwa Yun <comb...@combineads.co.kr>
Authored: Thu Dec 24 15:26:31 2015 +0900
Committer: Jihoon Son <jihoon...@apache.org>
Committed: Thu Dec 24 15:26:31 2015 +0900

----------------------------------------------------------------------
 CHANGES                                         |  3 +++
 .../resources/webapps/admin/query_executor.jsp  | 20 ++++++++++----------
 2 files changed, 13 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tajo/blob/e8ee7f2b/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 5a8fa37..2edf9d7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,9 @@ Release 0.12.0 - unreleased
 
   IMPROVEMENT
 
+    TAJO-1858: Aligning error message in execute query page of web UI is 
needed.
+    (Byunghwa Yun via jihoon)
+
     TAJO-2007: By default, Optimizer should use the table volume in TableStat.
     (hyunsik)
 

http://git-wip-us.apache.org/repos/asf/tajo/blob/e8ee7f2b/tajo-core/src/main/resources/webapps/admin/query_executor.jsp
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/resources/webapps/admin/query_executor.jsp 
b/tajo-core/src/main/resources/webapps/admin/query_executor.jsp
index cc3efce..6b6a3db 100644
--- a/tajo-core/src/main/resources/webapps/admin/query_executor.jsp
+++ b/tajo-core/src/main/resources/webapps/admin/query_executor.jsp
@@ -147,7 +147,7 @@ function clearTimer() {
 
 function getQueryStatusHtml(status) {
   if(status.success == "false") {
-    return "<div style='color:#ff0000; margin-top: 5px'>" + 
status.errorMessage + "</div>";
+    return "<div style='color:#ff0000; margin-top: 5px'><pre>" + 
status.errorMessage + "</pre></div>";
   } else {
     var statusHtml = "<div style='margin-top: 5px'>Start: " + status.startTime 
+ "</div>";
     statusHtml += "<div style='margin-top: 5px'>Finish: " + status.finishTime 
+ "</div>";
@@ -173,11 +173,11 @@ function getResult() {
     $("#queryResult").html("");
     var resultColumns = resultJson.resultColumns;
     var resultData = resultJson.resultData;
-       
+
     storedColumns = resultColumns;
-    storedData = resultData; 
+    storedData = resultData;
     pageCount = Math.ceil((storedData.length / PRINT_LIMIT)) - 1 ;
-       
+
     var resultTable = "<table width='100%' class='border_table'><tr>";
     for(var i = 0; i < resultColumns.length; i++) {
       resultTable += "<th>" + resultColumns[i] + "</th>";
@@ -188,7 +188,7 @@ function getResult() {
       for(var j = 0; j < resultData[i].length; j++) {
         resultTable += "<td>" + resultData[i][j] + "</td>";
       }
-      resultTable += "</tr>";    
+      resultTable += "</tr>";
       if(++printedLine >= PRINT_LIMIT) break;
     }
     resultTable += "</table>";
@@ -213,7 +213,7 @@ function getCSV() {
   var colCount = storedColumns.length;
   for(var colIndex = 0; colIndex < colCount; colIndex++) {
     if(colIndex == 0) {
-      csvData += storedColumns[colIndex];  
+      csvData += storedColumns[colIndex];
     } else {
       csvData += "," + storedColumns[colIndex];
     }
@@ -226,15 +226,15 @@ function getCSV() {
       } else {
         csvData += "," + storedData[rowIndex][colIndex];
       }
-    }   
+    }
     csvData += "\n";
   }
   $("#csvData").val(csvData);
-  $("#dataForm").submit();  
+  $("#dataForm").submit();
 }
 
 function getNext() {
-       var printedLine = 0;    
+       var printedLine = 0;
        if(pageCount > pageNum) {
                pageNum++;
                document.getElementById("selectPage").options.selectedIndex = 
pageNum;
@@ -295,7 +295,7 @@ function getPage() {
   <h2>Tajo Master: <%=masterLabel%> <%=activeLabel%></h2>
   <hr/>
   <h3>Query</h3>
-  Database :  
+  Database :
   <select id="selectDatabase" name="database" width="190" style="width: 190px">
     <%
        for (String databaseName : master.getCatalog().getAllDatabaseNames()) {