internal/postgres: add retraction/deprecation info to GetNestedModules

For golang/go#43265

Change-Id: I297856d635eda30d09e42a860f39e0cffc452464
Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/295899
Trust: Jonathan Amsterdam <[email protected]>
Run-TryBot: Jonathan Amsterdam <[email protected]>
TryBot-Result: kokoro <[email protected]>
Reviewed-by: Julie Qiu <[email protected]>

Author: jba

internal/postgres/details.go

@@ -67,6 +67,10 @@ func (db *DB) GetNestedModules(ctx context.Context, modulePath string) (_ []*int
 		return nil, err
 	}
 
+	if err := populateRawLatestInfo(ctx, db, modules); err != nil {
+		return nil, err
+	}
+
 	return modules, nil
 }
 

internal/postgres/version.go

@@ -93,37 +93,48 @@ func getPathVersions(ctx context.Context, db *DB, path string, versionTypes ...v
 	if err := db.db.RunQuery(ctx, query, collect, path); err != nil {
 		return nil, err
 	}
+	if err := populateRawLatestInfo(ctx, db, versions); err != nil {
+		return nil, err
+	}
+	return versions, nil
+}
+
+// versionTypeExpr returns a comma-separated list of version types,
+// for use in a clause like "WHERE version_type IN (%s)"
+func versionTypeExpr(vts []version.Type) string {
+	var vs []string
+	for _, vt := range vts {
+		vs = append(vs, fmt.Sprintf("'%s'", vt.String()))
+	}
+	return strings.Join(vs, ", ")
+}
+
+func populateRawLatestInfo(ctx context.Context, db *DB, mis []*internal.ModuleInfo) (err error) {
+	defer derrors.WrapStack(&err, "populateRawLatestInfo(%d ModuleInfos)", len(mis))
+
 	if experiment.IsActive(ctx, internal.ExperimentRetractions) {
 		start := time.Now()
+		// Collect the RawLatestInfos for all modules in the list.
 		infos := map[string]*internal.RawLatestInfo{}
-		for _, mi := range versions {
+		for _, mi := range mis {
 			if _, ok := infos[mi.ModulePath]; !ok {
 				info, err := db.GetRawLatestInfo(ctx, mi.ModulePath)
 				if err != nil {
-					return nil, err
+					return err
 				}
 				infos[mi.ModulePath] = info
 			}
 		}
-		for _, mi := range versions {
+		// Use the collected RawLatestInfos to populate the ModuleInfos.
+		for _, mi := range mis {
 			info := infos[mi.ModulePath]
 			if info != nil {
 				info.PopulateModuleInfo(mi)
 			}
 		}
-		log.Debugf(ctx, "getPathVersions: raw latest info fetched and applied in %dms", time.Since(start).Milliseconds())
+		log.Debugf(ctx, "raw latest info fetched and applied in %dms", time.Since(start).Milliseconds())
 	}
-	return versions, nil
-}
-
-// versionTypeExpr returns a comma-separated list of version types,
-// for use in a clause like "WHERE version_type IN (%s)"
-func versionTypeExpr(vts []version.Type) string {
-	var vs []string
-	for _, vt := range vts {
-		vs = append(vs, fmt.Sprintf("'%s'", vt.String()))
-	}
-	return strings.Join(vs, ", ")
+	return nil
 }
 
 // GetLatestInfo returns the latest information about the unit in the module.

internal/postgres/version_test.go

@@ -250,16 +250,6 @@ func TestGetVersions(t *testing.T) {
 	}
 }
 
-func addRawLatest(ctx context.Context, t *testing.T, db *DB, modulePath, version, modFile string) {
-	info, err := internal.NewRawLatestInfo(modulePath, version, []byte(modFile))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := db.UpdateRawLatestInfo(ctx, info); err != nil {
-		t.Fatal(err)
-	}
-}
-
 func TestGetLatestInfo(t *testing.T) {
 	t.Parallel()
 	testDB, release := acquire(t)
@@ -423,3 +413,13 @@ func TestShouldUpdateRawLatest(t *testing.T) {
 		}
 	}
 }
+
+func addRawLatest(ctx context.Context, t *testing.T, db *DB, modulePath, version, modFile string) {
+	info, err := internal.NewRawLatestInfo(modulePath, version, []byte(modFile))
+	if err != nil {
+		t.Fatal(err)
+	}
+	if err := db.UpdateRawLatestInfo(ctx, info); err != nil {
+		t.Fatal(err)
+	}
+}