|
36 | 36 | from beeswax.data_export import DataAdapter
|
37 | 37 | from desktop.auth.backend import rewrite_user
|
38 | 38 | from desktop.celery import app
|
39 |
| -from desktop.conf import ENABLE_HUE_5, TASK_SERVER_V2 |
| 39 | +from desktop.conf import ENABLE_HUE_5, TASK_SERVER |
40 | 40 | from desktop.lib import export_csvxls, fsmanager
|
41 | 41 | from desktop.models import Document2
|
42 | 42 | from desktop.settings import CACHES_CELERY_KEY, CACHES_CELERY_QUERY_RESULT_KEY
|
|
68 | 68 | states.REJECTED: 'rejected',
|
69 | 69 | states.IGNORED: 'ignored'
|
70 | 70 | }
|
71 |
| -storage_info = json.loads(TASK_SERVER_V2.RESULT_STORAGE.get()) |
| 71 | +storage_info = json.loads(TASK_SERVER.RESULT_STORAGE.get()) |
72 | 72 | storage = get_storage_class(storage_info.get('backend'))(**storage_info.get('properties', {}))
|
73 | 73 |
|
74 | 74 |
|
@@ -130,7 +130,7 @@ def download_to_file(notebook, snippet, file_format='csv', max_rows=-1, **kwargs
|
130 | 130 | for chunk in response:
|
131 | 131 | f.write(chunk.encode('utf-8'))
|
132 | 132 |
|
133 |
| - if TASK_SERVER_V2.RESULT_CACHE.get(): |
| 133 | + if TASK_SERVER.RESULT_CACHE.get(): |
134 | 134 | with storage.open(result_key, 'rb') as store:
|
135 | 135 | with codecs.getreader('utf-8')(store) as text_file:
|
136 | 136 | delimiter = ',' if sys.version_info[0] > 2 else ','.encode('utf-8')
|
@@ -234,7 +234,7 @@ def _patch_status(notebook):
|
234 | 234 | def execute(*args, **kwargs):
|
235 | 235 | notebook = args[0]
|
236 | 236 | snippet = args[1]
|
237 |
| - kwargs['max_rows'] = TASK_SERVER_V2.FETCH_RESULT_LIMIT.get() |
| 237 | + kwargs['max_rows'] = TASK_SERVER.FETCH_RESULT_LIMIT.get() |
238 | 238 | _patch_status(notebook)
|
239 | 239 |
|
240 | 240 | task = download_to_file.apply_async(args=args, kwargs=kwargs, task_id=notebook['uuid'])
|
@@ -283,7 +283,7 @@ def get_log(notebook, snippet, startFrom=None, size=None, postdict=None, user_id
|
283 | 283 | elif state in states.EXCEPTION_STATES:
|
284 | 284 | return ''
|
285 | 285 |
|
286 |
| - if TASK_SERVER_V2.RESULT_CACHE.get(): |
| 286 | + if TASK_SERVER.RESULT_CACHE.get(): |
287 | 287 | return ''
|
288 | 288 | else:
|
289 | 289 | if not startFrom:
|
@@ -395,7 +395,7 @@ def fetch_result(notebook, snippet, rows, start_over, **kwargs):
|
395 | 395 | def _get_data(task_id):
|
396 | 396 | result_key = _result_key(task_id)
|
397 | 397 |
|
398 |
| - if TASK_SERVER_V2.RESULT_CACHE.get(): |
| 398 | + if TASK_SERVER.RESULT_CACHE.get(): |
399 | 399 | csv_reader = caches[CACHES_CELERY_QUERY_RESULT_KEY].get(result_key) # TODO check if expired
|
400 | 400 | if csv_reader is None:
|
401 | 401 | raise QueryError('Cached results %s not found.' % result_key)
|
|
0 commit comments