Merge lp:~jpds/launchpad/stormify-distribution-bits into lp:launchpad

[Jonathan Davies]

Converted various bits of SQLBase code in Distribution over to Storm.

= Summary =

Converted various bits of SQLBase code in Distribution over to Storm.

= Pre-imp call =

I talked to Curtis about this who +1'ed the idea.

[Abel Deuring (adeuring)]

Hi Jonathan,

nice work!

review: Approve

=== modified file 'lib/lp/registry/model/distribution.py'
--- lib/lp/registry/model/distribution.py	2010-04-06 21:42:28 +0000
+++ lib/lp/registry/model/distribution.py	2010-04-09 00:42:34 +0000
@@ -242,16 +242,16 @@
     @cachedproperty
     def main_archive(self):
         """See `IDistribution`."""
-        return Archive.selectOneBy(distribution=self,
-                                   purpose=ArchivePurpose.PRIMARY)
+        return Store.of(self).find(Archive, distribution=self,
+            purpose=ArchivePurpose.PRIMARY).one()
 
     @cachedproperty
     def all_distro_archives(self):
         """See `IDistribution`."""
-        return Archive.select("""
-            Distribution = %s AND
-            Purpose IN %s""" % sqlvalues(self.id, MAIN_ARCHIVE_PURPOSES)
-            )
+        return Store.of(self).find(
+            Archive,
+            Archive.distribution == self,
+            Archive.purpose.is_in(MAIN_ARCHIVE_PURPOSES))
 
     @cachedproperty
     def all_distro_archive_ids(self):
@@ -272,35 +272,50 @@
     @property
     def archive_mirrors(self):
         """See `IDistribution`."""
-        return DistributionMirror.selectBy(
-            distribution=self, content=MirrorContent.ARCHIVE, enabled=True,
-            status=MirrorStatus.OFFICIAL, official_candidate=True)
+        return Store.of(self).find(
+            DistributionMirror,
+            distribution=self,
+            content=MirrorContent.ARCHIVE,
+            enabled=True,
+            status=MirrorStatus.OFFICIAL,
+            official_candidate=True)
 
     @property
     def cdimage_mirrors(self):
         """See `IDistribution`."""
-        return DistributionMirror.selectBy(
-            distribution=self, content=MirrorContent.RELEASE, enabled=True,
-            status=MirrorStatus.OFFICIAL, official_candidate=True)
+        return Store.of(self).find(
+            DistributionMirror,
+            distribution=self,
+            content=MirrorContent.RELEASE,
+            enabled=True,
+            status=MirrorStatus.OFFICIAL,
+            official_candidate=True)
 
     @property
     def disabled_mirrors(self):
         """See `IDistribution`."""
-        return DistributionMirror.selectBy(
-            distribution=self, status=MirrorStatus.OFFICIAL,
-            official_candidate=True, enabled=False)
+        return Store.of(self).find(
+            DistributionMirror,
+            distribution=self,
+            enabled=False,
+            status=MirrorStatus.OFFICIAL,
+            official_candidate=True)
 
     @property
     def unofficial_mirrors(self):
         """See `IDistribution`."""
-        return DistributionMirror.selectBy(
-            distribution=self, status=MirrorStatus.UNOFFICIAL)
+        return Store.of(self).find(
+            DistributionMirror,
+            distribution=self,
+            status=MirrorStatus.UNOFFICIAL)
 
     @property
     def pending_review_mirrors(self):
         """See `IDistribution`."""
-        return DistributionMirror.selectBy(
-            distribution=self, status=MirrorStatus.PENDING_REVIEW,
+        return Store.of(self).find(
+            DistributionMirror,
+            distribution=self,
+            status=MirrorStatus.PENDING_REVIEW,
             official_candidate=True)
 
     @property
@@ -337,7 +352,9 @@
     @cachedproperty('_cached_series')
     def series(self):
         """See `IDistribution`."""
-        ret = DistroSeries.selectBy(distribution=self)
+        ret = Store.of(self).find(
+            DistroSeries,
+            distribution=self)
         return sorted(ret, key=lambda a: Version(a.version), reverse=True)
 
     @property
@@ -400,18 +417,19 @@
 
     def getMirrorByName(self, name):
         """See `IDistribution`."""
-        return DistributionMirror.selectOneBy(distribution=self, name=name)
+        return Store.of(self).find(
+            DistributionMirror,
+            distribution=self,
+            name=name).one()
 
     def getCountryMirror(self, country, mirror_type):
         """See `IDistribution`."""
-        store = Store.of(self)
-        results = store.find(
+        return Store.of(self).find(
             DistributionMirror,
-            DistributionMirror.distribution == self,
-            DistributionMirror.country == country,
-            DistributionMirror.content == mirror_type,
-            DistributionMirror.country_dns_mirror == True)
-        return results.one()
+            distribution=self,
+            country=country,
+            content=mirror_type,
+            country_dns_mirror=True).one()
 
     def newMirror(self, owner, speed, country, content, displayname=None,
                   description=None, http_base_url=None,
@@ -441,7 +459,7 @@
 
         orig_name = name
         count = 1
-        while DistributionMirror.selectOneBy(name=name) is not None:
+        while self.getMirrorByName(name=name) is not None:
             count += 1
             name = '%s%s' % (orig_name, count)
 
@@ -509,7 +527,8 @@
 
     def getDevelopmentSeries(self):
         """See `IDistribution`."""
-        return DistroSeries.selectBy(
+        return Store.of(self).find(
+            DistroSeries,
             distribution=self,
             status=SeriesStatus.DEVELOPMENT)
 
@@ -1218,8 +1237,10 @@
     # already too long and complicated.
     def getAllPPAs(self):
         """See `IDistribution`"""
-        return Archive.selectBy(
-            purpose=ArchivePurpose.PPA, distribution=self, orderBy=['id'])
+        return Store.of(self).find(
+            Archive,
+            distribution=self,
+            purpose=ArchivePurpose.PPA).order_by('id')
 
     def searchPPAs(self, text=None, show_inactive=False, user=None):
         """See `IDistribution`."""