Browse Source

[impala] Downloading a result not cached anymore should fail more gracefully

Romain Rigaux 11 years ago
parent
commit
e82e642
1 changed files with 12 additions and 8 deletions
  1. 12 8
      apps/beeswax/src/beeswax/views.py

+ 12 - 8
apps/beeswax/src/beeswax/views.py

@@ -340,14 +340,18 @@ def massage_query_history_for_json(app_name, query_history):
   }
 
 def download(request, id, format):
-  assert format in common.DL_FORMATS
-
-  query_history = authorized_get_query_history(request, id, must_exist=True)
-  db = dbms.get(request.user, query_history.get_query_server_config())
-  LOG.debug('Download results for query %s: [ %s ]' % (query_history.server_id, query_history.query))
-
-  return data_export.download(query_history.get_handle(), format, db)
-
+  try:
+    query_history = authorized_get_query_history(request, id, must_exist=True)
+    db = dbms.get(request.user, query_history.get_query_server_config())
+    LOG.debug('Download results for query %s: [ %s ]' % (query_history.server_id, query_history.query))
+
+    return data_export.download(query_history.get_handle(), format, db)
+  except Exception, e:
+    if not hasattr(e, 'message') or not e.message:
+      message = e
+    else:
+      message = e.message
+    raise PopupException(message, detail='')
 
 """
 Queries Views