diff options
| author | Julie Qiu <julie@golang.org> | 2021-07-08 20:07:30 -0400 |
|---|---|---|
| committer | Julie Qiu <julie@golang.org> | 2021-07-13 16:22:26 +0000 |
| commit | ea6abaf6b5751b7c545f2dec6fca330017bfec50 (patch) | |
| tree | 31e5f6b62b08032b76027c64f69ddbf71e2c8531 /internal/postgres/insert_module.go | |
| parent | ebfc9de34b8595b294b23ed9dad6d627ee7cd6f5 (diff) | |
| download | go-x-pkgsite-ea6abaf6b5751b7c545f2dec6fca330017bfec50.tar.xz | |
internal/postgres: do not insert symbols for commands
Symbols for commands don't appear in the documentation, so don't insert
them for search.
For golang/go#44142
Change-Id: I5178bfac19686245d5b5055aa38ad73c04ab9dce
Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/333377
Trust: Julie Qiu <julie@golang.org>
Run-TryBot: Julie Qiu <julie@golang.org>
TryBot-Result: kokoro <noreply+kokoro@google.com>
Reviewed-by: Jonathan Amsterdam <jba@google.com>
Diffstat (limited to 'internal/postgres/insert_module.go')
| -rw-r--r-- | internal/postgres/insert_module.go | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/internal/postgres/insert_module.go b/internal/postgres/insert_module.go index 1754c406..f050fa08 100644 --- a/internal/postgres/insert_module.go +++ b/internal/postgres/insert_module.go @@ -341,7 +341,7 @@ func insertImportsUnique(ctx context.Context, tx *database.DB, m *internal.Modul // more units in the module. func (pdb *DB) insertUnits(ctx context.Context, tx *database.DB, m *internal.Module, moduleID int, pathToID map[string]int) ( - pathToUnitID map[string]int, pathToDocs map[string][]*internal.Documentation, err error) { + pathToUnitID map[string]int, pathToPkgDocs map[string][]*internal.Documentation, err error) { defer derrors.WrapStack(&err, "insertUnits(ctx, tx, %q, %q)", m.ModulePath, m.Version) ctx, span := trace.StartSpan(ctx, "insertUnits") defer span.End() @@ -361,8 +361,9 @@ func (pdb *DB) insertUnits(ctx context.Context, tx *database.DB, pathToReadme = map[string]*internal.Readme{} pathToImports = map[string][]string{} pathIDToPath = map[int]string{} + pathToAllDocs = map[string][]*internal.Documentation{} ) - pathToDocs = map[string][]*internal.Documentation{} + pathToPkgDocs = map[string][]*internal.Documentation{} for _, u := range m.Units { var licenseTypes, licensePaths []string for _, l := range u.Licenses { @@ -403,7 +404,12 @@ func (pdb *DB) insertUnits(ctx context.Context, tx *database.DB, return nil, nil, fmt.Errorf("insertUnits: unit %q missing source files for %q, %q", u.Path, d.GOOS, d.GOARCH) } } - pathToDocs[u.Path] = u.Documentation + pathToAllDocs[u.Path] = u.Documentation + if !u.IsCommand() { + // We don't care about symbols for commands, since they won't + // appear in the documentation. + pathToPkgDocs[u.Path] = u.Documentation + } if len(u.Imports) > 0 { pathToImports[u.Path] = u.Imports } @@ -420,13 +426,13 @@ func (pdb *DB) insertUnits(ctx context.Context, tx *database.DB, if err := insertReadmes(ctx, tx, paths, pathToUnitID, pathToReadme); err != nil { return nil, nil, err } - if err := insertDocs(ctx, tx, paths, pathToUnitID, pathToDocs); err != nil { + if err := insertDocs(ctx, tx, paths, pathToUnitID, pathToAllDocs); err != nil { return nil, nil, err } if err := insertImports(ctx, tx, paths, pathToUnitID, pathToImports); err != nil { return nil, nil, err } - return pathToUnitID, pathToDocs, nil + return pathToUnitID, pathToPkgDocs, nil } // insertPaths inserts all paths in m that aren't already there, and returns a map from each path to its |
