internal: delete insert-directories experiment

The insert-directories experiment flag is deleted, since we have already
inserted data for all modules into the paths, package_imports,
documentation, and readmes table, and been running that code path for a
while.

Updates golang/go#39629

Change-Id: I323850a462672c41ad0c67b6ab2b173bb32bf441
Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/241320
Reviewed-by: Jonathan Amsterdam <[email protected]>

Author: julieqiu

internal/experiment.go

@@ -11,7 +11,6 @@ import (
 const (
 	ExperimentAutocomplete                = "autocomplete"
 	ExperimentFrontendFetch               = "frontend-fetch"
-	ExperimentInsertDirectories           = "insert-directories"
 	ExperimentInsertPlaygroundLinks       = "insert-playground-links"
 	ExperimentMasterVersion               = "master-version"
 	ExperimentSidenav                     = "sidenav"
@@ -27,7 +26,6 @@ const (
 var Experiments = map[string]string{
 	ExperimentAutocomplete:                "Enable autocomplete with search.",
 	ExperimentFrontendFetch:               "Enable ability to fetch a package that doesn't exist on pkg.go.dev.",
-	ExperimentInsertDirectories:           "Insert data into paths, documentation, readmes, and package_imports tables.",
 	ExperimentInsertPlaygroundLinks:       "Insert Go playground links for examples.",
 	ExperimentMasterVersion:               "Enable viewing path@master.",
 	ExperimentSidenav:                     "Display documentation index on the left sidenav.",

internal/frontend/details.go

@@ -263,8 +263,7 @@ func isSupportedVersion(ctx context.Context, fullPath, requestedVersion string)
 // isActveUseDirectories reports whether the experiment for reading from the
 // paths-based data model is active.
 func isActiveUseDirectories(ctx context.Context) bool {
-	return experiment.IsActive(ctx, internal.ExperimentInsertDirectories) &&
-		experiment.IsActive(ctx, internal.ExperimentUseDirectories)
+	return experiment.IsActive(ctx, internal.ExperimentUseDirectories)
 }
 
 // isActivePathAtMaster reports whether the experiment for viewing packages at

internal/frontend/fetch.go

@@ -472,7 +472,6 @@ func FetchAndUpdateState(ctx context.Context, modulePath, requestedVersion strin
 
 func isActiveFrontendFetch(ctx context.Context) bool {
 	return experiment.IsActive(ctx, internal.ExperimentFrontendFetch) &&
-		experiment.IsActive(ctx, internal.ExperimentInsertDirectories) &&
 		experiment.IsActive(ctx, internal.ExperimentUsePathInfo)
 }
 

internal/frontend/fetch_test.go

@@ -68,15 +68,14 @@ func TestFetch(t *testing.T) {
 		},
 	} {
 		t.Run(test.name, func(t *testing.T) {
-			s, _, teardown := newTestServer(t, testModulesForProxy, internal.ExperimentInsertDirectories)
+			s, _, teardown := newTestServer(t, testModulesForProxy)
 			defer teardown()
 
 			ctx, cancel := context.WithTimeout(context.Background(), testFetchTimeout)
 			defer cancel()
 			ctx = experiment.NewContext(ctx,
 				internal.ExperimentFrontendFetch,
 				internal.ExperimentMasterVersion,
-				internal.ExperimentInsertDirectories,
 				internal.ExperimentUsePathInfo)
 
 			status, responseText := s.fetchAndPoll(ctx, testModulePath, test.fullPath, test.version)
@@ -131,10 +130,8 @@ func TestFetchErrors(t *testing.T) {
 			ctx, cancel := context.WithTimeout(context.Background(), test.fetchTimeout)
 			defer cancel()
 
-			ctx = experiment.NewContext(ctx,
-				internal.ExperimentFrontendFetch,
-				internal.ExperimentInsertDirectories)
-			s, _, teardown := newTestServer(t, testModulesForProxy, internal.ExperimentInsertDirectories)
+			ctx = experiment.NewContext(ctx, internal.ExperimentFrontendFetch)
+			s, _, teardown := newTestServer(t, testModulesForProxy)
 			defer teardown()
 			got, _ := s.fetchAndPoll(ctx, test.modulePath, test.fullPath, test.version)
 			if got != test.want {
@@ -156,7 +153,6 @@ func TestFetchPathAlreadyExists(t *testing.T) {
 			defer cancel()
 			ctx = experiment.NewContext(ctx,
 				internal.ExperimentFrontendFetch,
-				internal.ExperimentInsertDirectories,
 			)
 			if err := testDB.InsertModule(ctx, sample.DefaultModule()); err != nil {
 				t.Fatal(err)
@@ -170,7 +166,7 @@ func TestFetchPathAlreadyExists(t *testing.T) {
 				t.Fatal(err)
 			}
 
-			s, _, teardown := newTestServer(t, testModulesForProxy, internal.ExperimentInsertDirectories)
+			s, _, teardown := newTestServer(t, testModulesForProxy)
 			defer teardown()
 			got, _ := s.fetchAndPoll(ctx, sample.ModulePath, sample.PackagePath, sample.VersionString)
 			if got != status {

internal/frontend/package_test.go

@@ -8,8 +8,6 @@ import (
 	"context"
 	"testing"
 
-	"golang.org/x/pkgsite/internal"
-	"golang.org/x/pkgsite/internal/experiment"
 	"golang.org/x/pkgsite/internal/postgres"
 	"golang.org/x/pkgsite/internal/stdlib"
 	"golang.org/x/pkgsite/internal/testing/sample"
@@ -22,7 +20,7 @@ func TestStdlibPathForShortcut(t *testing.T) {
 		"encoding/json",                  // one match for "json"
 		"text/template", "html/template", // two matches for "template"
 	)
-	ctx := experiment.NewContext(context.Background(), internal.ExperimentInsertDirectories)
+	ctx := context.Background()
 	if err := testDB.InsertModule(ctx, m); err != nil {
 		t.Fatal(err)
 	}

internal/frontend/search_test.go

@@ -184,7 +184,7 @@ func TestSearchRequestRedirectPath(t *testing.T) {
 		testSearchRequestRedirectPath(t)
 	})
 	t.Run("use-paths-table", func(t *testing.T) {
-		testSearchRequestRedirectPath(t, internal.ExperimentUseDirectories, internal.ExperimentInsertDirectories)
+		testSearchRequestRedirectPath(t, internal.ExperimentUseDirectories)
 	})
 }
 

internal/frontend/server_test.go

@@ -843,7 +843,6 @@ func TestServer(t *testing.T) {
 	t.Run("use directories", func(t *testing.T) {
 		testServer(t,
 			append(testCases, noExpUserDirTCs...),
-			internal.ExperimentInsertDirectories,
 			internal.ExperimentUseDirectories,
 			internal.ExperimentUsePathInfo,
 		)
@@ -853,7 +852,6 @@ func TestServer(t *testing.T) {
 		testServer(t,
 			append(testCases, frontendFetchTCs...),
 			internal.ExperimentFrontendFetch,
-			internal.ExperimentInsertDirectories,
 			internal.ExperimentUsePathInfo,
 		)
 	})

internal/postgres/details_test.go

@@ -224,7 +224,6 @@ func TestPostgres_GetImportsAndImportedBy(t *testing.T) {
 
 			ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
 			defer cancel()
-			ctx = experiment.NewContext(ctx, internal.ExperimentInsertDirectories)
 
 			for _, v := range testModules {
 				if err := testDB.InsertModule(ctx, v); err != nil {

internal/postgres/directory_test.go

@@ -15,7 +15,6 @@ import (
 	"github.com/google/safehtml"
 	"golang.org/x/pkgsite/internal"
 	"golang.org/x/pkgsite/internal/derrors"
-	"golang.org/x/pkgsite/internal/experiment"
 	"golang.org/x/pkgsite/internal/licenses"
 	"golang.org/x/pkgsite/internal/source"
 	"golang.org/x/pkgsite/internal/stdlib"
@@ -285,7 +284,6 @@ func TestLegacyGetDirectory(t *testing.T) {
 func TestGetDirectoryNew(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
 	defer cancel()
-	ctx = experiment.NewContext(ctx, internal.ExperimentInsertDirectories)
 
 	defer ResetTestDB(testDB, t)
 	InsertSampleDirectoryTree(ctx, t, testDB)

internal/postgres/insert_module.go

@@ -25,7 +25,6 @@ import (
 	"golang.org/x/pkgsite/internal"
 	"golang.org/x/pkgsite/internal/database"
 	"golang.org/x/pkgsite/internal/derrors"
-	"golang.org/x/pkgsite/internal/experiment"
 	"golang.org/x/pkgsite/internal/log"
 	"golang.org/x/pkgsite/internal/stdlib"
 	"golang.org/x/pkgsite/internal/version"
@@ -93,10 +92,8 @@ func (db *DB) saveModule(ctx context.Context, m *internal.Module) (err error) {
 		}
 		logMemory(ctx, "after insertPackages")
 
-		if experiment.IsActive(ctx, internal.ExperimentInsertDirectories) {
-			if err := insertDirectories(ctx, tx, m, moduleID); err != nil {
-				return err
-			}
+		if err := insertDirectories(ctx, tx, m, moduleID); err != nil {
+			return err
 		}
 		logMemory(ctx, "after insertDirectories")
 

internal/postgres/insert_module_test.go

@@ -21,7 +21,6 @@ import (
 	"golang.org/x/pkgsite/internal"
 	"golang.org/x/pkgsite/internal/database"
 	"golang.org/x/pkgsite/internal/derrors"
-	"golang.org/x/pkgsite/internal/experiment"
 	"golang.org/x/pkgsite/internal/licenses"
 	"golang.org/x/pkgsite/internal/source"
 	"golang.org/x/pkgsite/internal/testing/sample"
@@ -30,7 +29,6 @@ import (
 func TestInsertModule(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), testTimeout*2)
 	defer cancel()
-	ctx = experiment.NewContext(ctx, internal.ExperimentInsertDirectories)
 
 	for _, test := range []struct {
 		name   string
@@ -140,7 +138,6 @@ func checkModule(ctx context.Context, t *testing.T, want *internal.Module) {
 func TestUpsertModule(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
 	defer cancel()
-	ctx = experiment.NewContext(ctx, internal.ExperimentInsertDirectories)
 	m := sample.Module("upsert.org", "v1.2.3")
 	p := &internal.LegacyPackage{
 		Name:              "p",

internal/postgres/path_test.go

@@ -12,7 +12,6 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"golang.org/x/pkgsite/internal"
-	"golang.org/x/pkgsite/internal/experiment"
 	"golang.org/x/pkgsite/internal/stdlib"
 	"golang.org/x/pkgsite/internal/testing/sample"
 	"golang.org/x/pkgsite/internal/version"
@@ -21,7 +20,6 @@ import (
 func TestGetPathInfo(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
 	defer cancel()
-	ctx = experiment.NewContext(ctx, internal.ExperimentInsertDirectories)
 
 	defer ResetTestDB(testDB, t)
 
@@ -192,7 +190,6 @@ func TestGetPathInfo(t *testing.T) {
 func TestGetStdlibPaths(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
 	defer cancel()
-	ctx = experiment.NewContext(ctx, internal.ExperimentInsertDirectories)
 	defer ResetTestDB(testDB, t)
 
 	// Insert two versions of some stdlib packages.

internal/postgres/version_map_test.go

@@ -10,14 +10,12 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"golang.org/x/pkgsite/internal"
-	"golang.org/x/pkgsite/internal/experiment"
 	"golang.org/x/pkgsite/internal/testing/sample"
 )
 
 func TestReadAndWriteVersionMap(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
 	defer cancel()
-	ctx = experiment.NewContext(ctx, internal.ExperimentInsertDirectories)
 	defer ResetTestDB(testDB, t)
 
 	m := sample.Module("golang.org/x/tools", sample.VersionString, "go/packages")

internal/testing/integration/fetch_test.go

@@ -24,7 +24,6 @@ func TestFrontendFetchForMasterVersion(t *testing.T) {
 	experiments := []string{
 		internal.ExperimentFrontendFetch,
 		internal.ExperimentMasterVersion,
-		internal.ExperimentInsertDirectories,
 		internal.ExperimentUsePathInfo,
 	}
 	ctx := experiment.NewContext(context.Background(), experiments...)