浏览代码

HUE-8747 [editor] Fix download arguments for task.

jdesjean 6 年之前
父节点
当前提交
fb56110de3

+ 1 - 1
desktop/libs/notebook/src/notebook/connectors/base.py

@@ -434,7 +434,7 @@ class Api(object):
   def fetch_result_size(self, notebook, snippet):
     raise OperationNotSupported()
 
-  def download(self, notebook, snippet, format, user_agent=None):
+  def download(self, notebook, snippet, format, user_agent=None, max_rows=None, store_data_type_in_header=False):
     pass
 
   def get_log(self, notebook, snippet, startFrom=None, size=None):

+ 1 - 1
desktop/libs/notebook/src/notebook/connectors/jdbc.py

@@ -124,7 +124,7 @@ class JdbcApi(Api):
   def cancel(self, notebook, snippet):
     return {'status': 0}
 
-  def download(self, notebook, snippet, format, user_agent=None):
+  def download(self, notebook, snippet, format, user_agent=None, max_rows=None, store_data_type_in_header=False):
     raise PopupException('Downloading is not supported yet')
 
   def progress(self, snippet, logs):

+ 1 - 1
desktop/libs/notebook/src/notebook/connectors/rdbms.py

@@ -107,7 +107,7 @@ class RdbmsApi(Api):
 
 
   @query_error_handler
-  def download(self, notebook, snippet, format, user_agent=None):
+  def download(self, notebook, snippet, format, user_agent=None, max_rows=None, store_data_type_in_header=False):
 
     file_name = _get_snippet_name(notebook)
     results = self._execute(notebook, snippet)

+ 1 - 1
desktop/libs/notebook/src/notebook/connectors/solr.py

@@ -129,7 +129,7 @@ class SolrApi(Api):
     return 'No logs'
 
 
-  def download(self, notebook, snippet, format, user_agent=None):
+  def download(self, notebook, snippet, format, user_agent=None, max_rows=None, store_data_type_in_header=False):
     raise PopupException('Downloading is not supported yet')
 
 

+ 1 - 1
desktop/libs/notebook/src/notebook/connectors/spark_shell.py

@@ -326,7 +326,7 @@ class SparkApi(Api):
 
       raise QueryError(msg)
 
-  def download(self, notebook, snippet, format, user_agent=None):
+  def download(self, notebook, snippet, format, user_agent=None, max_rows=None, store_data_type_in_header=False):
     try:
       api = get_spark_api(self.user)
       session = _get_snippet_session(notebook, snippet)

+ 1 - 1
desktop/libs/notebook/src/notebook/connectors/sqlalchemyapi.py

@@ -207,7 +207,7 @@ class SqlAlchemyApi(Api):
 
 
   @query_error_handler
-  def download(self, notebook, snippet, format, user_agent=None):
+  def download(self, notebook, snippet, format, user_agent=None, max_rows=None, store_data_type_in_header=False):
     file_name = _get_snippet_name(notebook)
     guid = uuid.uuid4().hex
 

+ 4 - 1
desktop/libs/notebook/src/notebook/tasks.py

@@ -269,7 +269,10 @@ def fetch_result(notebook, snippet, rows, start_over, **kwargs):
     first = next(csv_reader)
     for col in first:
       split = col.split('|')
-      cols.append({'name': split[0], 'type': split[1], 'comment': None})
+      if len(split) > 1:
+        cols.append({'name': split[0], 'type': split[1], 'comment': None})
+      else:
+        cols.append({'name': split[0], 'type': 'STRING_TYPE', 'comment': None})
     count = 0
     for row in csv_reader:
       count += 1