Browse Source

[spark] Impala support

Romain Rigaux 11 năm trước cách đây
mục cha
commit
ac72bff73a
2 tập tin đã thay đổi với 7 bổ sung5 xóa
  1. 6 4
      apps/spark/src/spark/models.py
  2. 1 1
      apps/spark/static/js/spark.vm.js

+ 6 - 4
apps/spark/src/spark/models.py

@@ -57,9 +57,9 @@ class Notebook():
 
 
 def get_api(user, snippet):
-  if snippet['type'] == 'hive':
+  if snippet['type'] in ('hive', 'impala', 'spark-sql'):
     return HS2Api(user)
-  if snippet['type'] == 'text':
+  elif snippet['type'] == 'text':
     return TextApi(user)  
   else:
     return SparkApi(user)
@@ -130,8 +130,10 @@ class HS2Api():
     return {
         'status':
           'running' if status.index in (QueryHistory.STATE.running.index, QueryHistory.STATE.submitted.index)
-          else ('failed' if QueryHistory.STATE.failed.index
-          else 'ready')
+          else (
+             'failed' if status.index == QueryHistory.STATE.failed.index
+              else 'ready'
+          )
     }
 
   def fetch_result(self, notebook, snippet):

+ 1 - 1
apps/spark/static/js/spark.vm.js

@@ -281,7 +281,7 @@ var Notebook = function (vm, notebook) {
   self.name = ko.observable(typeof notebook.name != "undefined" && notebook.name != null ? notebook.name : 'My Notebook');
   self.snippets = ko.observableArray();
   self.selectedSnippet = ko.observable('scala');
-  self.availableSnippets = ko.observableArray(['hive', 'scala', 'sql', 'python', 'text', 'pig', 'impala']); // presto, mysql, oracle, sqlite, postgres, phoenix
+  self.availableSnippets = ko.observableArray(['impala', 'hive', 'scala', 'spark sql', 'python', 'text', 'pig']); // presto, mysql, oracle, sqlite, postgres, phoenix
   self.sessions = ko.mapping.fromJS(typeof notebook.sessions != "undefined" && notebook.sessions != null ? notebook.sessions : []); 
 
   self.getSession = function(session_type) {