Skip to content

Commit 4976d5a

Browse files
julieqiujulieqiu
committed
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]>
1 parent b999452 commit 4976d5a

14 files changed

+9
-36
lines changed

‎internal/experiment.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
const (
1212
ExperimentAutocomplete = "autocomplete"
1313
ExperimentFrontendFetch = "frontend-fetch"
14-
ExperimentInsertDirectories = "insert-directories"
1514
ExperimentInsertPlaygroundLinks = "insert-playground-links"
1615
ExperimentMasterVersion = "master-version"
1716
ExperimentSidenav = "sidenav"
@@ -27,7 +26,6 @@ const (
2726
var Experiments = map[string]string{
2827
ExperimentAutocomplete: "Enable autocomplete with search.",
2928
ExperimentFrontendFetch: "Enable ability to fetch a package that doesn't exist on pkg.go.dev.",
30-
ExperimentInsertDirectories: "Insert data into paths, documentation, readmes, and package_imports tables.",
3129
ExperimentInsertPlaygroundLinks: "Insert Go playground links for examples.",
3230
ExperimentMasterVersion: "Enable viewing path@master.",
3331
ExperimentSidenav: "Display documentation index on the left sidenav.",

‎internal/frontend/details.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,8 +263,7 @@ func isSupportedVersion(ctx context.Context, fullPath, requestedVersion string)
263263
// isActveUseDirectories reports whether the experiment for reading from the
264264
// paths-based data model is active.
265265
func isActiveUseDirectories(ctx context.Context) bool {
266-
return experiment.IsActive(ctx, internal.ExperimentInsertDirectories) &&
267-
experiment.IsActive(ctx, internal.ExperimentUseDirectories)
266+
return experiment.IsActive(ctx, internal.ExperimentUseDirectories)
268267
}
269268

270269
// isActivePathAtMaster reports whether the experiment for viewing packages at

‎internal/frontend/fetch.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,6 @@ func FetchAndUpdateState(ctx context.Context, modulePath, requestedVersion strin
472472

473473
func isActiveFrontendFetch(ctx context.Context) bool {
474474
return experiment.IsActive(ctx, internal.ExperimentFrontendFetch) &&
475-
experiment.IsActive(ctx, internal.ExperimentInsertDirectories) &&
476475
experiment.IsActive(ctx, internal.ExperimentUsePathInfo)
477476
}
478477

‎internal/frontend/fetch_test.go

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,14 @@ func TestFetch(t *testing.T) {
6868
},
6969
} {
7070
t.Run(test.name, func(t *testing.T) {
71-
s, _, teardown := newTestServer(t, testModulesForProxy, internal.ExperimentInsertDirectories)
71+
s, _, teardown := newTestServer(t, testModulesForProxy)
7272
defer teardown()
7373

7474
ctx, cancel := context.WithTimeout(context.Background(), testFetchTimeout)
7575
defer cancel()
7676
ctx = experiment.NewContext(ctx,
7777
internal.ExperimentFrontendFetch,
7878
internal.ExperimentMasterVersion,
79-
internal.ExperimentInsertDirectories,
8079
internal.ExperimentUsePathInfo)
8180

8281
status, responseText := s.fetchAndPoll(ctx, testModulePath, test.fullPath, test.version)
@@ -131,10 +130,8 @@ func TestFetchErrors(t *testing.T) {
131130
ctx, cancel := context.WithTimeout(context.Background(), test.fetchTimeout)
132131
defer cancel()
133132

134-
ctx = experiment.NewContext(ctx,
135-
internal.ExperimentFrontendFetch,
136-
internal.ExperimentInsertDirectories)
137-
s, _, teardown := newTestServer(t, testModulesForProxy, internal.ExperimentInsertDirectories)
133+
ctx = experiment.NewContext(ctx, internal.ExperimentFrontendFetch)
134+
s, _, teardown := newTestServer(t, testModulesForProxy)
138135
defer teardown()
139136
got, _ := s.fetchAndPoll(ctx, test.modulePath, test.fullPath, test.version)
140137
if got != test.want {
@@ -156,7 +153,6 @@ func TestFetchPathAlreadyExists(t *testing.T) {
156153
defer cancel()
157154
ctx = experiment.NewContext(ctx,
158155
internal.ExperimentFrontendFetch,
159-
internal.ExperimentInsertDirectories,
160156
)
161157
if err := testDB.InsertModule(ctx, sample.DefaultModule()); err != nil {
162158
t.Fatal(err)
@@ -170,7 +166,7 @@ func TestFetchPathAlreadyExists(t *testing.T) {
170166
t.Fatal(err)
171167
}
172168

173-
s, _, teardown := newTestServer(t, testModulesForProxy, internal.ExperimentInsertDirectories)
169+
s, _, teardown := newTestServer(t, testModulesForProxy)
174170
defer teardown()
175171
got, _ := s.fetchAndPoll(ctx, sample.ModulePath, sample.PackagePath, sample.VersionString)
176172
if got != status {

‎internal/frontend/package_test.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ import (
88
"context"
99
"testing"
1010

11-
"golang.org/x/pkgsite/internal"
12-
"golang.org/x/pkgsite/internal/experiment"
1311
"golang.org/x/pkgsite/internal/postgres"
1412
"golang.org/x/pkgsite/internal/stdlib"
1513
"golang.org/x/pkgsite/internal/testing/sample"
@@ -22,7 +20,7 @@ func TestStdlibPathForShortcut(t *testing.T) {
2220
"encoding/json", // one match for "json"
2321
"text/template", "html/template", // two matches for "template"
2422
)
25-
ctx := experiment.NewContext(context.Background(), internal.ExperimentInsertDirectories)
23+
ctx := context.Background()
2624
if err := testDB.InsertModule(ctx, m); err != nil {
2725
t.Fatal(err)
2826
}

‎internal/frontend/search_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ func TestSearchRequestRedirectPath(t *testing.T) {
184184
testSearchRequestRedirectPath(t)
185185
})
186186
t.Run("use-paths-table", func(t *testing.T) {
187-
testSearchRequestRedirectPath(t, internal.ExperimentUseDirectories, internal.ExperimentInsertDirectories)
187+
testSearchRequestRedirectPath(t, internal.ExperimentUseDirectories)
188188
})
189189
}
190190

‎internal/frontend/server_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -843,7 +843,6 @@ func TestServer(t *testing.T) {
843843
t.Run("use directories", func(t *testing.T) {
844844
testServer(t,
845845
append(testCases, noExpUserDirTCs...),
846-
internal.ExperimentInsertDirectories,
847846
internal.ExperimentUseDirectories,
848847
internal.ExperimentUsePathInfo,
849848
)
@@ -853,7 +852,6 @@ func TestServer(t *testing.T) {
853852
testServer(t,
854853
append(testCases, frontendFetchTCs...),
855854
internal.ExperimentFrontendFetch,
856-
internal.ExperimentInsertDirectories,
857855
internal.ExperimentUsePathInfo,
858856
)
859857
})

‎internal/postgres/details_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,6 @@ func TestPostgres_GetImportsAndImportedBy(t *testing.T) {
224224

225225
ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
226226
defer cancel()
227-
ctx = experiment.NewContext(ctx, internal.ExperimentInsertDirectories)
228227

229228
for _, v := range testModules {
230229
if err := testDB.InsertModule(ctx, v); err != nil {

‎internal/postgres/directory_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
"github.com/google/safehtml"
1616
"golang.org/x/pkgsite/internal"
1717
"golang.org/x/pkgsite/internal/derrors"
18-
"golang.org/x/pkgsite/internal/experiment"
1918
"golang.org/x/pkgsite/internal/licenses"
2019
"golang.org/x/pkgsite/internal/source"
2120
"golang.org/x/pkgsite/internal/stdlib"
@@ -285,7 +284,6 @@ func TestLegacyGetDirectory(t *testing.T) {
285284
func TestGetDirectoryNew(t *testing.T) {
286285
ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
287286
defer cancel()
288-
ctx = experiment.NewContext(ctx, internal.ExperimentInsertDirectories)
289287

290288
defer ResetTestDB(testDB, t)
291289
InsertSampleDirectoryTree(ctx, t, testDB)

‎internal/postgres/insert_module.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525
"golang.org/x/pkgsite/internal"
2626
"golang.org/x/pkgsite/internal/database"
2727
"golang.org/x/pkgsite/internal/derrors"
28-
"golang.org/x/pkgsite/internal/experiment"
2928
"golang.org/x/pkgsite/internal/log"
3029
"golang.org/x/pkgsite/internal/stdlib"
3130
"golang.org/x/pkgsite/internal/version"
@@ -93,10 +92,8 @@ func (db *DB) saveModule(ctx context.Context, m *internal.Module) (err error) {
9392
}
9493
logMemory(ctx, "after insertPackages")
9594

96-
if experiment.IsActive(ctx, internal.ExperimentInsertDirectories) {
97-
if err := insertDirectories(ctx, tx, m, moduleID); err != nil {
98-
return err
99-
}
95+
if err := insertDirectories(ctx, tx, m, moduleID); err != nil {
96+
return err
10097
}
10198
logMemory(ctx, "after insertDirectories")
10299

‎internal/postgres/insert_module_test.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"golang.org/x/pkgsite/internal"
2222
"golang.org/x/pkgsite/internal/database"
2323
"golang.org/x/pkgsite/internal/derrors"
24-
"golang.org/x/pkgsite/internal/experiment"
2524
"golang.org/x/pkgsite/internal/licenses"
2625
"golang.org/x/pkgsite/internal/source"
2726
"golang.org/x/pkgsite/internal/testing/sample"
@@ -30,7 +29,6 @@ import (
3029
func TestInsertModule(t *testing.T) {
3130
ctx, cancel := context.WithTimeout(context.Background(), testTimeout*2)
3231
defer cancel()
33-
ctx = experiment.NewContext(ctx, internal.ExperimentInsertDirectories)
3432

3533
for _, test := range []struct {
3634
name string
@@ -140,7 +138,6 @@ func checkModule(ctx context.Context, t *testing.T, want *internal.Module) {
140138
func TestUpsertModule(t *testing.T) {
141139
ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
142140
defer cancel()
143-
ctx = experiment.NewContext(ctx, internal.ExperimentInsertDirectories)
144141
m := sample.Module("upsert.org", "v1.2.3")
145142
p := &internal.LegacyPackage{
146143
Name: "p",

‎internal/postgres/path_test.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212

1313
"github.com/google/go-cmp/cmp"
1414
"golang.org/x/pkgsite/internal"
15-
"golang.org/x/pkgsite/internal/experiment"
1615
"golang.org/x/pkgsite/internal/stdlib"
1716
"golang.org/x/pkgsite/internal/testing/sample"
1817
"golang.org/x/pkgsite/internal/version"
@@ -21,7 +20,6 @@ import (
2120
func TestGetPathInfo(t *testing.T) {
2221
ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
2322
defer cancel()
24-
ctx = experiment.NewContext(ctx, internal.ExperimentInsertDirectories)
2523

2624
defer ResetTestDB(testDB, t)
2725

@@ -192,7 +190,6 @@ func TestGetPathInfo(t *testing.T) {
192190
func TestGetStdlibPaths(t *testing.T) {
193191
ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
194192
defer cancel()
195-
ctx = experiment.NewContext(ctx, internal.ExperimentInsertDirectories)
196193
defer ResetTestDB(testDB, t)
197194

198195
// Insert two versions of some stdlib packages.

‎internal/postgres/version_map_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,12 @@ import (
1010

1111
"github.com/google/go-cmp/cmp"
1212
"golang.org/x/pkgsite/internal"
13-
"golang.org/x/pkgsite/internal/experiment"
1413
"golang.org/x/pkgsite/internal/testing/sample"
1514
)
1615

1716
func TestReadAndWriteVersionMap(t *testing.T) {
1817
ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
1918
defer cancel()
20-
ctx = experiment.NewContext(ctx, internal.ExperimentInsertDirectories)
2119
defer ResetTestDB(testDB, t)
2220

2321
m := sample.Module("golang.org/x/tools", sample.VersionString, "go/packages")

‎internal/testing/integration/fetch_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ func TestFrontendFetchForMasterVersion(t *testing.T) {
2424
experiments := []string{
2525
internal.ExperimentFrontendFetch,
2626
internal.ExperimentMasterVersion,
27-
internal.ExperimentInsertDirectories,
2827
internal.ExperimentUsePathInfo,
2928
}
3029
ctx := experiment.NewContext(context.Background(), experiments...)

0 commit comments

Comments
 (0)