Просмотр исходного кода

HUE-1460 [beeswax] Support non acii char in the editor

Romain Rigaux 12 лет назад
Родитель
Сommit
393edec2b1

+ 2 - 2
apps/beeswax/src/beeswax/server/hive_server2_lib.py

@@ -428,14 +428,14 @@ class HiveServerClient:
 
 
   def execute_statement(self, statement, max_rows=100, configuration={}):
-    req = TExecuteStatementReq(statement=statement, confOverlay=configuration)
+    req = TExecuteStatementReq(statement=statement.encode('utf-8'), confOverlay=configuration)
     res = self.call(self._client.ExecuteStatement, req)
 
     return self.fetch_result(res.operationHandle, max_rows=max_rows)
 
 
   def execute_async_statement(self, statement, confOverlay):
-    req = TExecuteStatementReq(statement=statement, confOverlay=confOverlay)
+    req = TExecuteStatementReq(statement=statement.encode('utf-8'), confOverlay=confOverlay)
     res = self.call(self._client.ExecuteStatement, req)
 
     return HiveServerQueryHandle(secret=res.operationHandle.operationId.secret,

+ 2 - 1
apps/beeswax/src/beeswax/templates/watch_results.mako

@@ -16,6 +16,7 @@
 <%!
 from desktop.lib.i18n import smart_unicode
 from desktop.views import commonheader, commonfooter
+from django.utils.encoding import force_unicode
 from django.utils.translation import ugettext as _
 %>
 
@@ -188,7 +189,7 @@ ${layout.menubar(section='query')}
         </div>
 
         <div class="tab-pane" id="log">
-          <pre>${ log }</pre>
+          <pre>${ force_unicode(log) }</pre>
         </div>
 
         % if not error:

+ 2 - 1
apps/beeswax/src/beeswax/templates/watch_wait.mako

@@ -15,6 +15,7 @@
 ## limitations under the License.
 <%!
 from desktop.views import commonheader, commonfooter
+from django.utils.encoding import force_unicode
 from django.utils.translation import ugettext as _
 %>
 
@@ -70,7 +71,7 @@ ${layout.menubar(section='query')}
 
                <div class="tab-content">
                 <div class="active tab-pane" id="log">
-                    <pre>${ log }</pre>
+                    <pre>${ force_unicode(log) }</pre>
                 </div>
                 <div class="tab-pane" id="query">
                     <pre>${ query.get_current_statement() }</pre>