Merge pull request #3310 from quay/joseph.schorr/QUAY-1235/drop-logentry2

Remove all references to LogEntry2 from the code

data/database.py

@@ -1018,27 +1018,6 @@ class LogEntry(BaseModel):
     )
 
 
-class LogEntry2(BaseModel):
-  """ TEMP FOR QUAY.IO ONLY. DO NOT RELEASE INTO QUAY ENTERPRISE. """
-  kind = ForeignKeyField(LogEntryKind)
-  account = IntegerField(index=True, db_column='account_id')
-  performer = IntegerField(index=True, null=True, db_column='performer_id')
-  repository = IntegerField(index=True, null=True, db_column='repository_id')
-  datetime = DateTimeField(default=datetime.now, index=True)
-  ip = CharField(null=True)
-  metadata_json = TextField(default='{}')
-
-  class Meta:
-    database = db
-    read_slaves = (read_slave,)
-    indexes = (
-      (('account', 'datetime'), False),
-      (('performer', 'datetime'), False),
-      (('repository', 'datetime'), False),
-      (('repository', 'datetime', 'kind'), False),
-    )
-
-
 class RepositoryActionCount(BaseModel):
   repository = ForeignKeyField(Repository)
   count = IntegerField()

data/model/log.py

@@ -18,7 +18,6 @@ ACTIONS_ALLOWED_WITHOUT_AUDIT_LOGGING = ['pull_repo']
 def _logs_query(selections, start_time, end_time, performer=None, repository=None, namespace=None,
                 ignore=None, model=LogEntry):
   """ Returns a query for selecting logs from the table, with various options and filters. """
-  # TODO(LogMigrate): Remove the branch once we're back on LogEntry only.
   joined = (model.select(*selections).switch(model)
             .where(model.datetime >= start_time, model.datetime < end_time))
 
@@ -61,7 +60,6 @@ def _get_log_entry_kind(name):
 def get_aggregated_logs(start_time, end_time, performer=None, repository=None, namespace=None,
                         ignore=None, model=LogEntry):
   """ Returns the count of logs, by kind and day, for the logs matching the given filters. """
-  # TODO(LogMigrate): Remove the branch once we're back on LogEntry only.
   date = db.extract_date('day', model.datetime)
   selections = [model.kind, date.alias('day'), fn.Count(model.id).alias('count')]
   query = _logs_query(selections, start_time, end_time, performer, repository, namespace, ignore,
@@ -72,7 +70,6 @@ def get_aggregated_logs(start_time, end_time, performer=None, repository=None, n
 def get_logs_query(start_time, end_time, performer=None, repository=None, namespace=None,
                    ignore=None, model=LogEntry):
   """ Returns the logs matching the given filters. """
-  # TODO(LogMigrate): Remove the branch once we're back on LogEntry only.
   Performer = User.alias()
   Account = User.alias()
   selections = [model, Performer]
@@ -143,7 +140,6 @@ def log_action(kind_name, user_or_organization_name, performer=None, repository=
 
 def get_stale_logs_start_id(model):
   """ Gets the oldest log entry. """
-  # TODO(LogMigrate): Remove the branch once we're back on LogEntry only.
   try:
     return (model.select(model.id).order_by(model.id).limit(1).tuples())[0][0]
   except IndexError:
@@ -152,7 +148,6 @@ def get_stale_logs_start_id(model):
 
 def get_stale_logs_cutoff_id(cutoff_date, model):
   """ Gets the most recent ID created before the cutoff_date. """
-  # TODO(LogMigrate): Remove the branch once we're back on LogEntry only.
   try:
     return (model.select(fn.Max(model.id)).where(model.datetime <= cutoff_date)
             .tuples())[0][0]
@@ -162,13 +157,11 @@ def get_stale_logs_cutoff_id(cutoff_date, model):
 
 def get_stale_logs(start_id, end_id, model):
   """ Returns all the logs with IDs between start_id and end_id inclusively. """
-  # TODO(LogMigrate): Remove the branch once we're back on LogEntry only.
   return model.select().where((model.id >= start_id), (model.id <= end_id))
 
 
 def delete_stale_logs(start_id, end_id, model):
   """ Deletes all the logs with IDs between start_id and end_id. """
-  # TODO(LogMigrate): Remove the branch once we're back on LogEntry only.
   model.delete().where((model.id >= start_id), (model.id <= end_id)).execute()
 
 

data/model/repositoryactioncount.py

@@ -4,7 +4,7 @@ from collections import namedtuple
 from peewee import IntegrityError
 
 from datetime import date, timedelta, datetime
-from data.database import (Repository, LogEntry, LogEntry2, RepositoryActionCount,
+from data.database import (Repository, LogEntry, RepositoryActionCount,
                            RepositorySearchScore, db_random_func, fn)
 
 logger = logging.getLogger(__name__)
@@ -52,16 +52,12 @@ def count_repository_actions(to_count):
   today = date.today()
   yesterday = today - timedelta(days=1)
 
-  # TODO(LogMigrate): Remove the branch once we're back on LogEntry only.
-  def lookup_action_count(model):
-    return (model
+  actions = (LogEntry
             .select()
-            .where(model.repository == to_count,
-                   model.datetime >= yesterday,
-                   model.datetime < today)
+            .where(LogEntry.repository == to_count,
+                   LogEntry.datetime >= yesterday,
+                   LogEntry.datetime < today)
             .count())
-
-  actions = lookup_action_count(LogEntry) + lookup_action_count(LogEntry2)
   try:
     RepositoryActionCount.create(repository=to_count, date=yesterday, count=actions)
     return True