Преглед изворни кода

HUE-9046 [jb] Use sample user to do admin queries.
Change-Id: I8b9fa0f3874071769a20b7fb543c4acd91118eb0

Jean-Francois Desjeans Gauthier пре 6 година
родитељ
комит
66cadc6837

+ 2 - 4
apps/beeswax/src/beeswax/management/commands/create_table_query_data.py

@@ -26,15 +26,13 @@ from django.utils.translation import ugettext as _
 from desktop.lib import django_mako
 from beeswax.server import dbms
 from beeswax.server.dbms import get_query_server_config
-from desktop.conf import DEFAULT_USER
 
 from beeswax.design import hql_query
 from beeswax import hive_site
-from useradmin.models import User
+from useradmin.models import install_sample_user
 
 
 LOG = logging.getLogger(__name__)
-DEFAULT_USER = DEFAULT_USER.get()
 
 
 class Command(BaseCommand):
@@ -51,7 +49,7 @@ class Command(BaseCommand):
 
 def create_table(user=None, query_server=None, table=None):
   if not user:
-    user = User.objects.get(username=DEFAULT_USER)
+    user = install_sample_user()
   if not query_server:
     query_server = get_query_server_config('beeswax')
   if not table:

+ 2 - 4
apps/beeswax/src/beeswax/query_history.py

@@ -31,14 +31,12 @@ from beeswax.server import dbms
 from beeswax.server.dbms import get_query_server_config
 from beeswax.management.commands import create_table_query_data
 
-from desktop.conf import DEFAULT_USER
 from desktop.lib.exceptions_renderable import raise_popup_exception, PopupException
 from desktop.lib import django_mako
 
-from useradmin.models import User
+from useradmin.models import install_sample_user
 
 LOG = logging.getLogger(__name__)
-DEFAULT_USER = DEFAULT_USER.get()
 
 QUERY_HISTORY_CACHE_MAX_USER_COUNT = 10
 QUERY_HISTORY_CACHE_MAX_LENGTH_PER_USER = 25
@@ -214,7 +212,7 @@ def _get_query_history_from(request_user=None, start_date=None, start_time=None,
   return data
 
 def _execute_query(proposed_query, limit):
-  user = User.objects.get(username=DEFAULT_USER)
+  user = install_sample_user()
   query_server = get_query_server_config('beeswax')
   server = dbms.get(user, query_server)
   query = hql_query(proposed_query)