This repository was archived by the owner on Sep 30, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Usages API: implement surroundingContent #63730
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
94 changes: 94 additions & 0 deletions
94
internal/codeintel/codenav/transport/graphql/util_lines.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| package graphql | ||
|
|
||
| import ( | ||
| "context" | ||
| "io" | ||
| "sync" | ||
|
|
||
| "github.com/sourcegraph/sourcegraph/internal/api" | ||
| "github.com/sourcegraph/sourcegraph/internal/byteutils" | ||
| "github.com/sourcegraph/sourcegraph/internal/gitserver" | ||
| ) | ||
|
|
||
| type LinesGetter interface { | ||
| Get(ctx context.Context, repo api.RepoName, commit api.CommitID, path string, startLine, endLine int) ([]byte, error) | ||
| } | ||
|
|
||
| type cacheKey struct { | ||
| repo api.RepoName | ||
| revision api.CommitID | ||
| path string | ||
| } | ||
|
|
||
| type cacheValue struct { | ||
| contents []byte | ||
| index byteutils.LineIndex | ||
| } | ||
|
|
||
| type cachedLinesGetter struct { | ||
| mu sync.RWMutex | ||
| cache map[cacheKey]cacheValue | ||
| maxCachedBytes int | ||
| freeBytes int | ||
| gitserver gitserver.Client | ||
| } | ||
|
|
||
| var _ LinesGetter = (*cachedLinesGetter)(nil) | ||
|
|
||
| func newCachedLinesGetter(gitserver gitserver.Client, size int) *cachedLinesGetter { | ||
| return &cachedLinesGetter{ | ||
| cache: make(map[cacheKey]cacheValue), | ||
| maxCachedBytes: size, | ||
| freeBytes: size, | ||
| gitserver: gitserver, | ||
| } | ||
| } | ||
|
|
||
| func (c *cachedLinesGetter) Get(ctx context.Context, repo api.RepoName, commit api.CommitID, path string, startLine, endLine int) ([]byte, error) { | ||
| key := cacheKey{repo, commit, path} | ||
|
|
||
| c.mu.RLock() | ||
| if value, ok := c.cache[key]; ok { | ||
| c.mu.RUnlock() | ||
| start, end := value.index.LinesRange(startLine, endLine) | ||
| return value.contents[start:end], nil | ||
| } | ||
| c.mu.RUnlock() | ||
|
|
||
| r, err := c.gitserver.NewFileReader(ctx, repo, commit, path) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| defer r.Close() | ||
|
|
||
| contents, err := io.ReadAll(r) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| index := byteutils.NewLineIndex(contents) | ||
| start, end := index.LinesRange(startLine, endLine) | ||
| lines := contents[start:end] | ||
|
|
||
| if len(contents) > c.maxCachedBytes { | ||
| // Don't both trying to fit it in the cache | ||
| return lines, nil | ||
| } | ||
|
|
||
| c.mu.Lock() | ||
| defer c.mu.Unlock() | ||
|
|
||
| // Make room for the file in the cache. This cache doesn't need to be high | ||
| // performance -- just randomly delete things until we have room. | ||
| for k, v := range c.cache { | ||
| if c.freeBytes >= len(contents) { | ||
| break | ||
| } | ||
| delete(c.cache, k) | ||
| c.freeBytes += len(v.contents) | ||
| } | ||
|
|
||
| c.cache[key] = cacheValue{contents, index} | ||
| c.freeBytes -= len(contents) | ||
|
|
||
| return lines, nil | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unrelated, but it's most useful to me as a consumer to get a hard error if the API is disabled. Otherwise, I have no way of distinguishing "disabled" from "no results"