瀏覽代碼

HUE-3287 [core] Django 1.11 upgrade
- Upgrading Enum34 module

Prakash Ranade 7 年之前
父節點
當前提交
0b71bbea45

+ 3 - 3
apps/beeswax/src/beeswax/management/commands/close_queries.py

@@ -45,7 +45,7 @@ class Command(BaseCommand):
 
     self.stdout.write('Closing (all=%s) HiveServer2 queries older than %s days...\n' % (close_all, days))
 
-    queries = QueryHistory.objects.filter(last_state__in=[QueryHistory.STATE.expired.index, QueryHistory.STATE.failed.index, QueryHistory.STATE.available.index])
+    queries = QueryHistory.objects.filter(last_state__in=[QueryHistory.STATE.expired.value, QueryHistory.STATE.failed.value, QueryHistory.STATE.available.value])
 
     if close_all:
       queries = QueryHistory.objects.all()
@@ -79,12 +79,12 @@ class Command(BaseCommand):
         else:
           already_closed_queries += 1
 
-        query.last_state = QueryHistory.STATE.expired.index
+        query.last_state = QueryHistory.STATE.expired.value
         query.save()
       except Exception, e:
         if 'None' in str(e) or 'Invalid OperationHandle' in str(e):
           already_closed_queries += 1
-          query.last_state = QueryHistory.STATE.expired.index
+          query.last_state = QueryHistory.STATE.expired.value
           query.save()
         else:
           self.stdout.write('Info: %s\n' % e)

+ 17 - 10
apps/beeswax/src/beeswax/models.py

@@ -53,7 +53,14 @@ class QueryHistory(models.Model):
   """
   Holds metadata about all queries that have been executed.
   """
-  STATE = Enum('submitted', 'running', 'available', 'failed', 'expired')
+  #STATE = Enum('submitted', 'running', 'available', 'failed', 'expired')
+  class STATE(Enum):
+    submitted = 0
+    running = 1
+    available = 2
+    failed = 3
+    expired = 4
+
   SERVER_TYPE = ((BEESWAX, 'Beeswax'), (HIVE_SERVER2, 'Hive Server 2'),
                  (librdbms_dbms.MYSQL, 'MySQL'), (librdbms_dbms.POSTGRESQL, 'PostgreSQL'),
                  (librdbms_dbms.SQLITE, 'sqlite'), (librdbms_dbms.ORACLE, 'oracle'))
@@ -148,28 +155,28 @@ class QueryHistory(models.Model):
       return is_statement_finished
 
   def is_running(self):
-    return self.last_state in (QueryHistory.STATE.running.index, QueryHistory.STATE.submitted.index)
+    return self.last_state in (QueryHistory.STATE.running.value, QueryHistory.STATE.submitted.value)
 
   def is_success(self):
-    return self.last_state in (QueryHistory.STATE.available.index,)
+    return self.last_state in (QueryHistory.STATE.available.value,)
 
   def is_failure(self):
-    return self.last_state in (QueryHistory.STATE.expired.index, QueryHistory.STATE.failed.index)
+    return self.last_state in (QueryHistory.STATE.expired.value, QueryHistory.STATE.failed.value)
 
   def is_expired(self):
-    return self.last_state in (QueryHistory.STATE.expired.index,)
+    return self.last_state in (QueryHistory.STATE.expired.value,)
 
   def set_to_running(self):
-    self.last_state = QueryHistory.STATE.running.index
+    self.last_state = QueryHistory.STATE.running.value
 
   def set_to_failed(self):
-    self.last_state = QueryHistory.STATE.failed.index
+    self.last_state = QueryHistory.STATE.failed.value
 
   def set_to_available(self):
-    self.last_state = QueryHistory.STATE.available.index
+    self.last_state = QueryHistory.STATE.available.value
 
   def set_to_expired(self):
-    self.last_state = QueryHistory.STATE.expired.index
+    self.last_state = QueryHistory.STATE.expired.value
 
   def save(self, *args, **kwargs):
     """
@@ -239,7 +246,7 @@ class HiveServerQueryHistory(QueryHistory):
                                  modified_row_count=self.modified_row_count)
 
   def save_state(self, new_state):
-    self.last_state = new_state.index
+    self.last_state = new_state.value
     self.save()
 
   @classmethod

+ 2 - 2
apps/beeswax/src/beeswax/server/dbms.py

@@ -757,7 +757,7 @@ class HiveServer2Dbms(object):
       # We need to update the query in case it was fixed
       query_history.refresh_design(hql_query)
 
-    query_history.last_state = QueryHistory.STATE.submitted.index
+    query_history.last_state = QueryHistory.STATE.submitted.value
     query_history.save()
     query = query_history.design.get_design()
 
@@ -782,7 +782,7 @@ class HiveServer2Dbms(object):
           server_port='%(server_port)d' % self.client.query_server,
           server_name='%(server_name)s' % self.client.query_server,
           server_type=self.server_type,
-          last_state=QueryHistory.STATE.submitted.index,
+          last_state=QueryHistory.STATE.submitted.value,
           design=design,
           notify=query.query.get('email_notify', False),
           query_type=query.query['type'],

+ 1 - 1
apps/beeswax/src/beeswax/templates/list_history.mako

@@ -135,7 +135,7 @@ ${ layout.menubar(section='history') }
                   <td>${query.owner}</td>
                   <td>${models.QueryHistory.STATE[query.last_state]}</td>
                   <td>
-                    % if query.last_state not in (models.QueryHistory.STATE.expired.index, models.QueryHistory.STATE.failed.index):
+                    % if query.last_state not in (models.QueryHistory.STATE.expired.value, models.QueryHistory.STATE.failed.value):
                       <a href="${ url(app_name + ':watch_query_history', query_history_id=query.id) }" data-row-selector="true">${_('Results')}</a>
                     % else:
                       ~

+ 1 - 1
apps/beeswax/src/beeswax/templates/my_queries.mako

@@ -135,7 +135,7 @@ ${layout.menubar(section='my queries')}
             <td width="1%" data-row-selector-exclude="true">
               <div class="hue-checkbox runCheck fa"
                 data-edit-url="${ url(app_name + ':execute_design', design_id=query.design.id) }"
-                % if qcontext and query.last_state != models.QueryHistory.STATE.expired.index:
+                % if qcontext and query.last_state != models.QueryHistory.STATE.expired.value:
                   data-view-url="${ url(app_name + ':watch_query_history', query_history_id=query.id) }?context=${qcontext|u}"
                 % endif
                 data-row-selector-exclude="true"></div>

+ 2 - 2
apps/beeswax/src/beeswax/tests.py

@@ -2849,7 +2849,7 @@ class TestWithMockedServer(object):
         server_port=1,
         server_name='server_name',
         server_type=HIVE_SERVER2,
-        last_state=QueryHistory.STATE.submitted.index,
+        last_state=QueryHistory.STATE.submitted.value,
         design=design,
         notify=False,
         query_type=HQL,
@@ -2946,7 +2946,7 @@ class TestWithMockedServer(object):
         server_port=1,
         server_name='server_name',
         server_type=HIVE_SERVER2,
-        last_state=QueryHistory.STATE.submitted.index,
+        last_state=QueryHistory.STATE.submitted.value,
         design=design,
         notify=False,
         query_type=HQL,

+ 1 - 1
apps/beeswax/src/beeswax/views.py

@@ -1064,7 +1064,7 @@ def _update_query_state(query_history):
   Note that there is a transition from available/failed to expired. That occurs lazily
   when the user attempts to view results that have expired.
   """
-  if query_history.last_state <= models.QueryHistory.STATE.running.index:
+  if query_history.last_state <= models.QueryHistory.STATE.running.value:
     try:
       state_enum = dbms.get(query_history.owner, query_history.get_query_server_config()).get_state(query_history.get_handle())
       if state_enum is None:

+ 1 - 1
apps/impala/src/impala/tests.py

@@ -93,7 +93,7 @@ class TestMockedImpala:
       assert_equal(len(response.context[0]['page'].object_list), 1)
 
       # Test my query page
-      QueryHistory.objects.create(owner=user, design=impala_query, query='', last_state=QueryHistory.STATE.available.index)
+      QueryHistory.objects.create(owner=user, design=impala_query, query='', last_state=QueryHistory.STATE.available.value)
 
       resp = self.client.get('/impala/my_queries')
       assert_equal(len(resp.context[0]['q_page'].object_list), 1)

+ 1 - 1
apps/rdbms/src/rdbms/api.py

@@ -152,7 +152,7 @@ def execute_query(request, design_id=None):
       query_server = dbms.get_query_server_config(request.POST.get('server'))
       db = dbms.get(request.user, query_server)
       query_history = db.execute_query(query, design)
-      query_history.last_state = beeswax_models.QueryHistory.STATE.expired.index
+      query_history.last_state = beeswax_models.QueryHistory.STATE.expired.value
       query_history.save()
 
       try:

+ 1 - 1
apps/useradmin/src/useradmin/models.py

@@ -94,7 +94,7 @@ class UserProfile(models.Model):
 
   user = models.OneToOneField(auth_models.User, unique=True)
   home_directory = models.CharField(editable=True, max_length=1024, null=True)
-  creation_method = models.CharField(editable=True, null=False, max_length=64, default=str(CreationMethod.HUE))
+  creation_method = models.CharField(editable=True, null=False, max_length=64, default=CreationMethod.HUE.name)
   first_login = models.BooleanField(default=True, verbose_name=_t('First Login'),
                                    help_text=_t('If this is users first login.'))
   last_activity = models.DateTimeField(auto_now=True, db_index=True)

+ 1 - 1
desktop/libs/librdbms/src/librdbms/server/dbms.py

@@ -114,7 +114,7 @@ class Rdbms(object):
       server_port='%(server_port)d' % self.client.query_server,
       server_name='%(server_name)s' % self.client.query_server,
       server_type=self.server_type,
-      last_state=QueryHistory.STATE.available.index,
+      last_state=QueryHistory.STATE.available.value,
       design=design,
       notify=False,
       query_type=query.query['type'],

+ 2 - 2
desktop/libs/notebook/src/notebook/connectors/hiveserver2.py

@@ -269,7 +269,7 @@ class HS2Api(Api):
     operation = db.get_operation_status(handle)
     status = HiveServerQueryHistory.STATE_MAP[operation.operationState]
 
-    if status.index in (QueryHistory.STATE.failed.index, QueryHistory.STATE.expired.index):
+    if status.value in (QueryHistory.STATE.failed.value, QueryHistory.STATE.expired.value):
       if operation.errorMessage and 'transition from CANCELED to ERROR' in operation.errorMessage: # Hive case on canceled query
         raise QueryExpired()
       elif  operation.errorMessage and re.search('Cannot validate serde: org.apache.hive.hcatalog.data.JsonSerDe', str(operation.errorMessage)):
@@ -277,7 +277,7 @@ class HS2Api(Api):
       else:
         raise QueryError(operation.errorMessage)
 
-    response['status'] = 'running' if status.index in (QueryHistory.STATE.running.index, QueryHistory.STATE.submitted.index) else 'available'
+    response['status'] = 'running' if status.value in (QueryHistory.STATE.running.value, QueryHistory.STATE.submitted.value) else 'available'
 
     return response