Merge lp:~lifeless/launchpad/bugjob into lp:launchpad

[Robert Collins]

[r=lifeless][bug=946164] Remove the python code for BugJob as it is no longer used.

Dead code is dead.

[Robert Collins (lifeless)]

Trivial, self-ack.

review: Approve

=== modified file 'database/schema/comments.sql'
--- database/schema/comments.sql	2012-02-24 04:29:13 +0000
+++ database/schema/comments.sql	2012-03-04 10:01:33 +0000
@@ -225,12 +225,6 @@
 COMMENT ON COLUMN BugBranch.whiteboard IS 'Additional information about the status of the bugfix in this branch.';
 COMMENT ON COLUMN BugBranch.registrant IS 'The person who linked the bug to the branch.';
 
--- BugJob
-COMMENT ON TABLE BugJob IS 'Contains references to jobs to be run against Bugs.';
-COMMENT ON COLUMN BugJob.bug IS 'The bug on which the job is to be run.';
-COMMENT ON COLUMN BugJob.job_type IS 'The type of job (enumeration value). Allows us to query the database for a given subset of BugJobs.';
-COMMENT ON COLUMN BugJob.json_data IS 'A JSON struct containing data for the job.';
-
 -- BugMute
 COMMENT ON TABLE BugMute IS 'Mutes for bug notifications.';
 COMMENT ON COLUMN BugMute.person IS 'The person that muted all notifications from this bug.';

=== removed file 'lib/lp/bugs/interfaces/bugjob.py'
--- lib/lp/bugs/interfaces/bugjob.py	2011-12-24 16:54:44 +0000
+++ lib/lp/bugs/interfaces/bugjob.py	1970-01-01 00:00:00 +0000
@@ -1,68 +0,0 @@
-# Copyright 2010 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""Interfaces for using the Jobs system for Bugs."""
-
-__metaclass__ = type
-__all__ = [
-    'BugJobType',
-    'IBugJob',
-    'IBugJobSource',
-    ]
-
-from lazr.enum import (
-    DBEnumeratedType,
-    DBItem,
-    )
-from zope.interface import (
-    Attribute,
-    Interface,
-    )
-from zope.schema import (
-    Int,
-    Object,
-    )
-
-from lp import _
-from lp.bugs.interfaces.bug import IBug
-from lp.services.job.interfaces.job import (
-    IJob,
-    IJobSource,
-    )
-
-
-class BugJobType(DBEnumeratedType):
-    """Values that IBugJob.job_type can take."""
-
-    UPDATE_HEAT = DBItem(0, """
-        Update the heat for a bug.
-
-        This job recalculates the heat for a Bug.
-        """)
-
-
-class IBugJob(Interface):
-    """A Job related to a Bug."""
-
-    id = Int(
-        title=_('DB ID'), required=True, readonly=True,
-        description=_("The tracking number for this job."))
-
-    bug = Object(
-        title=_('The Bug this job is about'),
-        schema=IBug, required=True)
-
-    job = Object(title=_('The common Job attributes'), schema=IJob,
-        required=True)
-
-    metadata = Attribute('A dict of data about the job.')
-
-    def destroySelf():
-        """Destroy this object."""
-
-
-class IBugJobSource(IJobSource):
-    """An interface for acquiring IBugJobs."""
-
-    def create(bug):
-        """Create a new IBugJob for a bug."""

=== removed file 'lib/lp/bugs/model/bugjob.py'
--- lib/lp/bugs/model/bugjob.py	2011-12-30 06:14:56 +0000
+++ lib/lp/bugs/model/bugjob.py	1970-01-01 00:00:00 +0000
@@ -1,147 +0,0 @@
-# Copyright 2010 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""Job classes related to BugJobs are in here."""
-
-__metaclass__ = type
-__all__ = [
-    'BugJob',
-    'BugJobDerived',
-    ]
-
-from lazr.delegates import delegates
-import simplejson
-from sqlobject import SQLObjectNotFound
-from storm.expr import And
-from storm.locals import (
-    Int,
-    Reference,
-    Unicode,
-    )
-from zope.component import getUtility
-from zope.interface import (
-    classProvides,
-    implements,
-    )
-
-from lp.bugs.interfaces.bugjob import (
-    BugJobType,
-    IBugJob,
-    IBugJobSource,
-    )
-from lp.bugs.model.bug import Bug
-from lp.services.database.enumcol import EnumCol
-from lp.services.database.stormbase import StormBase
-from lp.services.job.model.job import Job
-from lp.services.job.runner import BaseRunnableJob
-from lp.services.webapp.interfaces import (
-    DEFAULT_FLAVOR,
-    IStoreSelector,
-    MAIN_STORE,
-    MASTER_FLAVOR,
-    )
-
-
-class BugJob(StormBase):
-    """Base class for jobs related to Bugs."""
-
-    implements(IBugJob)
-
-    __storm_table__ = 'BugJob'
-
-    id = Int(primary=True)
-
-    job_id = Int(name='job')
-    job = Reference(job_id, Job.id)
-
-    bug_id = Int(name='bug')
-    bug = Reference(bug_id, Bug.id)
-
-    job_type = EnumCol(enum=BugJobType, notNull=True)
-
-    _json_data = Unicode('json_data')
-
-    @property
-    def metadata(self):
-        return simplejson.loads(self._json_data)
-
-    def __init__(self, bug, job_type, metadata):
-        """Constructor.
-
-        :param bug: The proposal this job relates to.
-        :param job_type: The BugJobType of this job.
-        :param metadata: The type-specific variables, as a JSON-compatible
-            dict.
-        """
-        super(BugJob, self).__init__()
-        json_data = simplejson.dumps(metadata)
-        self.job = Job()
-        self.bug = bug
-        self.job_type = job_type
-        # XXX AaronBentley 2009-01-29 bug=322819: This should be a bytestring,
-        # but the DB representation is unicode.
-        self._json_data = json_data.decode('utf-8')
-
-    @classmethod
-    def get(cls, key):
-        """Return the instance of this class whose key is supplied."""
-        store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
-        instance = store.get(cls, key)
-        if instance is None:
-            raise SQLObjectNotFound(
-                'No occurrence of %s has key %s' % (cls.__name__, key))
-        return instance
-
-
-class BugJobDerived(BaseRunnableJob):
-    """Intermediate class for deriving from BugJob."""
-    delegates(IBugJob)
-    classProvides(IBugJobSource)
-
-    def __init__(self, job):
-        self.context = job
-
-    @classmethod
-    def create(cls, bug):
-        """See `IBugJob`."""
-        # If there's already a job for the bug, don't create a new one.
-        job = BugJob(bug, cls.class_job_type, {})
-        return cls(job)
-
-    @classmethod
-    def get(cls, job_id):
-        """Get a job by id.
-
-        :return: the BugJob with the specified id, as the current
-                 BugJobDerived subclass.
-        :raises: SQLObjectNotFound if there is no job with the specified id,
-                 or its job_type does not match the desired subclass.
-        """
-        job = BugJob.get(job_id)
-        if job.job_type != cls.class_job_type:
-            raise SQLObjectNotFound(
-                'No object found with id %d and type %s' % (job_id,
-                cls.class_job_type.title))
-        return cls(job)
-
-    @classmethod
-    def iterReady(cls):
-        """Iterate through all ready BugJobs."""
-        store = getUtility(IStoreSelector).get(MAIN_STORE, MASTER_FLAVOR)
-        jobs = store.find(
-            BugJob,
-            And(BugJob.job_type == cls.class_job_type,
-                BugJob.job == Job.id,
-                Job.id.is_in(Job.ready_jobs),
-                BugJob.bug == Bug.id))
-        return (cls(job) for job in jobs)
-
-    def getOopsVars(self):
-        """See `IRunnableJob`."""
-        vars = BaseRunnableJob.getOopsVars(self)
-        vars.extend([
-            ('bug_id', self.context.bug.id),
-            ('bug_job_id', self.context.id),
-            ('bug_job_type', self.context.job_type.title),
-            ])
-        return vars

=== removed file 'lib/lp/bugs/tests/test_bugjob.py'
--- lib/lp/bugs/tests/test_bugjob.py	2012-01-01 02:58:52 +0000
+++ lib/lp/bugs/tests/test_bugjob.py	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-# Copyright 2010 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""Tests for BugJobs."""
-
-__metaclass__ = type
-
-from lp.bugs.interfaces.bugjob import BugJobType
-from lp.bugs.model.bugjob import (
-    BugJob,
-    BugJobDerived,
-    )
-from lp.testing import TestCaseWithFactory
-from lp.testing.layers import LaunchpadZopelessLayer
-
-
-class BugJobTestCase(TestCaseWithFactory):
-    """Test case for basic BugJob gubbins."""
-
-    layer = LaunchpadZopelessLayer
-
-    def test_instantiate(self):
-        # BugJob.__init__() instantiates a BugJob instance.
-        bug = self.factory.makeBug()
-
-        metadata = ('some', 'arbitrary', 'metadata')
-        bug_job = BugJob(
-            bug, BugJobType.UPDATE_HEAT, metadata)
-
-        self.assertEqual(bug, bug_job.bug)
-        self.assertEqual(BugJobType.UPDATE_HEAT, bug_job.job_type)
-
-        # When we actually access the BugJob's metadata it gets
-        # unserialized from JSON, so the representation returned by
-        # bug_heat.metadata will be different from what we originally
-        # passed in.
-        metadata_expected = [u'some', u'arbitrary', u'metadata']
-        self.assertEqual(metadata_expected, bug_job.metadata)
-
-
-class BugJobDerivedTestCase(TestCaseWithFactory):
-    """Test case for the BugJobDerived class."""
-
-    layer = LaunchpadZopelessLayer
-
-    def test_create_explodes(self):
-        # BugJobDerived.create() will blow up because it needs to be
-        # subclassed to work properly.
-        bug = self.factory.makeBug()
-        self.assertRaises(
-            AttributeError, BugJobDerived.create, bug)

=== modified file 'lib/lp/soyuz/model/archivejob.py'
--- lib/lp/soyuz/model/archivejob.py	2011-12-30 06:14:56 +0000
+++ lib/lp/soyuz/model/archivejob.py	2012-03-04 10:01:33 +0000
@@ -108,7 +108,7 @@
         """Get a job by id.
 
         :return: the ArchiveJob with the specified id, as the current
-                 BugJobDerived subclass.
+                 ArchiveJobDerived subclass.
         :raises: SQLObjectNotFound if there is no job with the specified id,
                  or its job_type does not match the desired subclass.
         """
@@ -121,7 +121,7 @@
 
     @classmethod
     def iterReady(cls):
-        """Iterate through all ready BugJobs."""
+        """Iterate through all ready ArchiveJobs."""
         store = getUtility(IStoreSelector).get(MAIN_STORE, MASTER_FLAVOR)
         jobs = store.find(
             ArchiveJob,