这是indexloc提供的服务，不要输入任何密码
Skip to content

nit: correct slice allocation #357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

nit: correct slice allocation #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc1c954
nit: correct slice allocation
jaredpalmer Dec 18, 2021
4ab43a8
Handle nil slices
jaredpalmer Dec 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cli/internal/cache/cache_http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ func (cache *httpCache) retrieve(key string) (bool, []string, error) {
return false, nil, err
}
defer resp.Body.Close()
files := []string{}
var files []string
if resp.StatusCode == http.StatusNotFound {
return false, files, nil // doesn't exist - not an error
} else if resp.StatusCode != http.StatusOK {
Expand Down
73 changes: 45 additions & 28 deletions cli/internal/context/context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,19 +300,23 @@ func (c *Context) ResolveWorkspaceRootDeps() (*fs.PackageJSON, error) {
pkg.SubLockfile = make(fs.YarnLockfile)
c.ResolveDepGraph(&lockfileWg, pkg.UnresolvedExternalDeps, depSet, seen, pkg)
lockfileWg.Wait()
pkg.ExternalDeps = make([]string, 0, depSet.Cardinality())
for v := range depSet.ToSlice() {
pkg.ExternalDeps = append(pkg.ExternalDeps, fmt.Sprintf("%v", v))
}
sort.Strings(pkg.ExternalDeps)
hashOfExternalDeps, err := fs.HashObject(pkg.ExternalDeps)
if err != nil {
return nil, err
externalDepCount := depSet.Cardinality()
var externalDeps []string
var externalDepsHash string
if externalDepCount > 0 {
externalDeps = make([]string, 0, externalDepCount)
for v := range depSet.ToSlice() {
externalDeps = append(externalDeps, fmt.Sprintf("%v", v))
}
sort.Strings(externalDeps)
hashOfExternalDeps, err := fs.HashObject(externalDeps)
if err != nil {
return nil, err
}
externalDepsHash = hashOfExternalDeps
}
pkg.ExternalDepsHash = hashOfExternalDeps
} else {
pkg.ExternalDeps = []string{}
pkg.ExternalDepsHash = ""
pkg.ExternalDepsHash = externalDepsHash
pkg.ExternalDeps = externalDeps
}

return pkg, nil
Expand Down Expand Up @@ -397,25 +401,38 @@ func (c *Context) populateTopologicGraphForPackageJson(pkg *fs.PackageJSON) erro
c.ResolveDepGraph(&lockfileWg, pkg.UnresolvedExternalDeps, externalDepSet, seen, pkg)
lockfileWg.Wait()

// when there are no internal dependencies, we need to still add these leafs to the graph
if internalDepsSet.Len() == 0 {
internalDepsSetCount := internalDepsSet.Len()
var internalDeps []string
if internalDepsSetCount > 0 {
internalDeps = make([]string, 0, internalDepsSet.Len())
for v := range internalDepsSet.List() {
internalDeps = append(internalDeps, fmt.Sprintf("%v", v))
}
sort.Strings(internalDeps)
} else {
// when there are no internal dependencies, we need to still add these leafs to the graph
c.TopologicalGraph.Connect(dag.BasicEdge(pkg.Name, ROOT_NODE_NAME))
}
pkg.ExternalDeps = make([]string, 0, externalDepSet.Cardinality())
for v := range externalDepSet.ToSlice() {
pkg.ExternalDeps = append(pkg.ExternalDeps, fmt.Sprintf("%v", v))
}
pkg.InternalDeps = make([]string, 0, internalDepsSet.Len())
for v := range internalDepsSet.List() {
pkg.ExternalDeps = append(pkg.InternalDeps, fmt.Sprintf("%v", v))
}
sort.Strings(pkg.InternalDeps)
sort.Strings(pkg.ExternalDeps)
hashOfExternalDeps, err := fs.HashObject(pkg.ExternalDeps)
if err != nil {
return err
pkg.InternalDeps = internalDeps

externalDepCount := externalDepSet.Cardinality()
var externalDeps []string
var externalDepsHash string
if externalDepCount > 0 {
externalDeps = make([]string, 0, externalDepCount)
for v := range externalDepSet.ToSlice() {
externalDeps = append(externalDeps, fmt.Sprintf("%v", v))
}
sort.Strings(externalDeps)
hashOfExternalDeps, err := fs.HashObject(externalDeps)
if err != nil {
return err
}
externalDepsHash = hashOfExternalDeps
}
pkg.ExternalDepsHash = hashOfExternalDeps
pkg.ExternalDeps = externalDeps
pkg.ExternalDepsHash = externalDepsHash

return nil
}

Expand Down
6 changes: 3 additions & 3 deletions cli/internal/login/link.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,11 @@ func (c *LinkCommand) Run(args []string) int {

var chosenTeam client.Team

teamOptions := make([]string, len(teamsResponse.Teams))
teamOptions := make([]string, 0, len(teamsResponse.Teams))

// Gather team options
for i, team := range teamsResponse.Teams {
teamOptions[i] = team.Name
for _, team := range teamsResponse.Teams {
teamOptions = append(teamOptions, team.Name)
}

var chosenTeamName string
Expand Down
18 changes: 10 additions & 8 deletions cli/internal/run/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,13 +286,15 @@ func (c *RunCommand) Run(args []string) int {
topoVisit = append(topoVisit, v)
pack := ctx.PackageInfos[v]

ancestralHashes := make([]string, len(pack.InternalDeps))
ancestralHashes := make([]string, 0, len(pack.InternalDeps))
if len(pack.InternalDeps) > 0 {
for i, ancestor := range pack.InternalDeps {
ancestralHashes[i] = ctx.PackageInfos[ancestor].Hash
for _, ancestor := range pack.InternalDeps {
if h, ok := ctx.PackageInfos[ancestor]; ok {
ancestralHashes = append(ancestralHashes, h.Hash)
}
}
sort.Strings(ancestralHashes)
}
sort.Strings(ancestralHashes)
var hashable = struct {
hashOfFiles string
ancestralHashes []string
Expand All @@ -315,7 +317,7 @@ func (c *RunCommand) Run(args []string) int {
vertexSet.Add(v)
}
// We remove nodes that aren't in the final filter set
for _, toRemove := range util.Set(vertexSet).Difference(filteredPkgs) {
for _, toRemove := range vertexSet.Difference(filteredPkgs) {
if toRemove != ctx.RootNode {
ctx.TopologicalGraph.Remove(toRemove)
}
Expand Down Expand Up @@ -845,13 +847,13 @@ func parseRunArgs(args []string, cwd string) (*RunOptions, error) {

// convertStringsToGlobs converts string glob patterns to an array glob.Glob instances.
func convertStringsToGlobs(patterns []string) (globss []glob.Glob, err error) {
var globs = make([]glob.Glob, len(patterns))
for i, pattern := range patterns {
var globs = make([]glob.Glob, 0, len(patterns))
for _, pattern := range patterns {
g, err := glob.Compile(pattern)
if err != nil {
return nil, err
}
globs[i] = g
globs = append(globs, g)
}

return globs, nil
Expand Down