remove get_buildrequestids_for_buildset and rewrite methods using it

master/buildbot/db/connector.py

@@ -292,16 +292,6 @@ def _check_buildset(self, t, bsid, now):
             # notify the master
             self.master.buildsetComplete(bsid, bs_results)
 
-    # used by BuildSetStatus
-    def get_buildrequestids_for_buildset(self, bsid):
-        return self.runInteractionNow(self._txn_get_buildrequestids_for_buildset,
-                                      bsid)
-    def _txn_get_buildrequestids_for_buildset(self, t, bsid):
-        t.execute(self.quoteq("SELECT buildername,id FROM buildrequests"
-                              " WHERE buildsetid=?"),
-                  (bsid,))
-        return dict(t.fetchall())
-
     def doCleanup(self):
         """
         Perform any periodic database cleanup tasks.

master/buildbot/interfaces.py

@@ -222,7 +222,9 @@ def getInterestedUsers():
         pass # not implemented
     def getBuilderNames():
         """Return a list of the names of all Builders on which this set will
-        do builds."""
+        do builds.
+        
+        @returns: list of names via Deferred"""
     def isFinished():
         pass
     def waitUntilSuccess():

master/buildbot/status/buildset.py

@@ -41,16 +41,23 @@ def isFinished(self):
         return self.bsdict['complete']
 
     def getBuilderNamesAndBuildRequests(self):
-        brs = {}
-        brids = self.master.db.get_buildrequestids_for_buildset(self.id)
-        for (buildername, brid) in brids.iteritems():
-            brs[buildername] = BuildRequestStatus(buildername, brid,
-                                                  self.status)
-        return brs
+        # returns a Deferred; undocumented method that may be removed
+        # without warning
+        d = self.master.db.buildrequests.getBuildRequests(bsid=self.id)
+        def get_objects(brdicts):
+            return dict([
+                (brd['buildername'], BuildRequestStatus(brd['buildername'],
+                                            brd['brid'], self.status))
+                for brd in brdicts ])
+        d.addCallback(get_objects)
+        return d
 
     def getBuilderNames(self):
-        brs = self.master.db.get_buildrequestids_for_buildset(self.id)
-        return sorted(brs.keys())
+        d = self.master.db.buildrequests.getBuildRequests(bsid=self.id)
+        def get_names(brdicts):
+            return sorted([ brd['buildername'] for brd in brdicts ])
+        d.addCallback(get_names)
+        return d
 
     def waitUntilFinished(self):
         return self.status._buildset_waitUntilFinished(self.id)

master/buildbot/status/client.py

@@ -50,13 +50,17 @@ def remote_getID(self):
         return self.b.getID()
 
     def remote_getBuilderNames(self):
-        return self.b.getBuilderNames()
+        return self.b.getBuilderNames() # note: passes along the Deferred
 
     def remote_getBuildRequests(self):
         """Returns a list of (builderName, BuildRequest) tuples."""
-        return [(bname, IRemote(br))
-                for (bname, br)
-                in self.b.getBuilderNamesAndBuildRequests().items()]
+        d = self.b.getBuilderNamesAndBuildRequests()
+        def add_remote(buildrequests):
+            for k,v in buildrequests.iteritems():
+                buildrequests[k] = IRemote(v)
+            return buildrequests
+        d.addCallback(add_remote)
+        return d
 
     def remote_isFinished(self):
         return self.b.isFinished()