buildbot package: actually find commits for each build during ingestion

go/buildbot/db.go

 package buildbot
 
 import (
+        "database/sql"
         "encoding/json"
         "fmt"
 
         "github.com/jmoiron/sqlx"
 )
 
 // replaceIntoDB is a helper function for pushing a BuildStep into the database
 // which is used by both BuildStep.ReplaceIntoDB and Build.ReplaceIntoDB, so
 // that the latter can be done in a single transaction.
 func (b BuildStep) replaceIntoDB(tx *sqlx.Tx) error {
@@ skipping 20 matching lines @@
                 // replaceIntoDB does the rollback if needed.
                 return err
         }
         if err = tx.Commit(); err != nil {
                 tx.Rollback()
                 return fmt.Errorf("Failed to commit the transaction: %v", err)
         }
         return nil
 }
 
+// GetCommitsForBuild retrieves the list of commits first built in the given
+// build from the database.
+func GetCommitsForBuild(master, builder string, buildNumber int) ([]string, error) {
+        stmt, err := DB.Preparex(fmt.Sprintf("SELECT revision FROM %s WHERE master = ? AND builder = ? AND number = ?", TABLE_BUILD_REVISIONS))
+        if err != nil {
+                return nil, fmt.Errorf("Unable to retrieve build revisions from database - failed to prepare query: %v", err)
+        }
+        commits := []string{}
+        if err := stmt.Select(&commits, master, builder, buildNumber); err != nil {
+                return nil, fmt.Errorf("Unable to retrieve build revisions from database: %v", err)
+        }
+        return commits, nil
+}
+
+// GetBuildForCommit retrieves the build number of the build which first
+// included the given commit.
+func GetBuildForCommit(master, builder, commit string) (int, error) {
+        stmt, err := DB.Preparex(fmt.Sprintf("SELECT number FROM %s WHERE master = ? AND builder = ? AND revision = ?", TABLE_BUILD_REVISIONS))
+        if err != nil {
+                return -1, fmt.Errorf("Unable to retrieve build number from database - failed to repare query: %v", err)
+        }
+        n := -1
+        if err := stmt.Get(&n, master, builder, commit); err != nil {
+                if err == sql.ErrNoRows {
+                        // No build includes this commit.
+                        return -1, nil
+                }
+                return -1, fmt.Errorf("Unable to retrieve build number from database: %v", err)
+        }
+        return n, nil
+}
+
 // GetBuildFromDB retrieves the given build from the database as specified by
 // the given master, builder, and build number.
 func GetBuildFromDB(master, builder string, buildNumber int) (*Build, error) {
         // Get the build itself.
         stmt, err := DB.Preparex(fmt.Sprintf("SELECT * FROM %s WHERE master = ? AND builder = ? AND number = ?", TABLE_BUILDS))
         if err != nil {
                 return nil, fmt.Errorf("Unable to retrieve build from database - failed to prepare query: %v", err)
         }
         build := Build{}
         if err = stmt.Get(&build, master, builder, buildNumber); err != nil {
@@ skipping 21 matching lines @@
         if err := stepStmt.Select(&steps, master, builder, buildNumber); err != nil {
                 return nil, fmt.Errorf("Unable to retrieve build steps from database: %v", err)
         }
         for _, s := range steps {
                 s.Times = []float64{s.Started, s.Finished}
                 s.ResultsRaw = []interface{}{float64(s.Results), []interface{}{}}
         }
         build.Steps = steps
 
         // Get the commits associated with this build.
-        cmtStmt, err := DB.Preparex(fmt.Sprintf("SELECT revision FROM %s where master = ? and builder = ? and number = ?", TABLE_BUILD_REVISIONS))
+        build.Commits, err = GetCommitsForBuild(master, builder, buildNumber)
         if err != nil {
-                return nil, fmt.Errorf("Unable to retrieve build revisions from database - failed to prepare query: %v", err)
+                return nil, fmt.Errorf("Could not retrieve commits for build: %v", err)
         }
-        commits := []string{}
-        if err := cmtStmt.Select(&commits, master, builder, buildNumber); err != nil {
-                return nil, fmt.Errorf("Unable to retrieve build revisions from database: %v", err)
-        }
-        build.Commits = commits
 
         return &build, nil
 }
 
 // ReplaceIntoDB inserts or updates the Build in the database.
 func (b Build) ReplaceIntoDB() error {
         // Insert the build itself.
         tx, err := DB.Beginx()
         if err != nil {
                 return fmt.Errorf("Unable to push build into database - Could not begin transaction: %v", err)
@@ skipping 91 matching lines @@
         stmt, err := DB.Preparex(fmt.Sprintf("SELECT master, builder, number FROM %s WHERE finished = 0;", TABLE_BUILDS))
         if err != nil {
                 return nil, fmt.Errorf("Unable to retrieve unfinished builds - Could not prepare statement: %v", err)
         }
         b := []*Build{}
         if err = stmt.Select(&b); err != nil {
                 return nil, fmt.Errorf("Unable to retrieve unfinished builds: %v", err)
         }
         return b, nil
 }