kjuulh/dagger
Archived
1
0
Fork 0
Code Issues 1 Pull Requests 1 Projects Releases Wiki Activity

Merge pull request #279 from dagger/store-fix-duplicate-paths

Browse Source 
store: fix duplicate paths
This commit is contained in:
Andrea Luzzardi 2021-04-05 17:09:35 -07:00 committed by GitHub
commit 7cf1163a2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
dagger/store.go
View File

@ -26,12 +26,17 @@ type Store struct {
l sync.RWMutex l sync.RWMutex
// ID -> Deployment
deployments map[string]*DeploymentState deployments map[string]*DeploymentState
// Various indices for fast lookups // Name -> Deployment
deploymentsByName map[string]*DeploymentState deploymentsByName map[string]*DeploymentState
deploymentsByPath map[string][]*DeploymentState
pathsByDeploymentID map[string][]string // Path -> (ID->Deployment)
deploymentsByPath map[string]map[string]*DeploymentState
// ID -> (Path->{})
pathsByDeploymentID map[string]map[string]struct{}
} }
func NewStore(root string) (*Store, error) { func NewStore(root string) (*Store, error) {
@ -39,8 +44,8 @@ func NewStore(root string) (*Store, error) {
root: root, root: root,
deployments: make(map[string]*DeploymentState), deployments: make(map[string]*DeploymentState),
deploymentsByName: make(map[string]*DeploymentState), deploymentsByName: make(map[string]*DeploymentState),
deploymentsByPath: make(map[string][]*DeploymentState), deploymentsByPath: make(map[string]map[string]*DeploymentState),
pathsByDeploymentID: make(map[string][]string), pathsByDeploymentID: make(map[string]map[string]struct{}),
} }
return store, store.loadAll() return store, store.loadAll()
} }
@ -120,8 +125,15 @@ func (s *Store) indexDeployment(r *DeploymentState) {
if i.Type != InputTypeDir { if i.Type != InputTypeDir {
return return
} }
s.deploymentsByPath[i.Dir.Path] = append(s.deploymentsByPath[i.Dir.Path], r) if s.deploymentsByPath[i.Dir.Path] == nil {
s.pathsByDeploymentID[r.ID] = append(s.pathsByDeploymentID[r.ID], i.Dir.Path) s.deploymentsByPath[i.Dir.Path] = make(map[string]*DeploymentState)
}
s.deploymentsByPath[i.Dir.Path][r.ID] = r
if s.pathsByDeploymentID[r.ID] == nil {
s.pathsByDeploymentID[r.ID] = make(map[string]struct{})
}
s.pathsByDeploymentID[r.ID][i.Dir.Path] = struct{}{}
} }
mapPath(r.PlanSource) mapPath(r.PlanSource)
@ -138,16 +150,8 @@ func (s *Store) deindexDeployment(id string) {
delete(s.deployments, r.ID) delete(s.deployments, r.ID)
delete(s.deploymentsByName, r.Name) delete(s.deploymentsByName, r.Name)
for _, p := range s.pathsByDeploymentID[r.ID] { for p := range s.pathsByDeploymentID[r.ID] {
// Remove this deployments from the path->deployment mapping delete(s.deploymentsByPath[p], r.ID)
deployments := []*DeploymentState{}
for _, d := range s.deploymentsByPath[p] {
if d.ID == r.ID {
continue
}
deployments = append(deployments, d)
}
s.deploymentsByPath[p] = deployments
} }
delete(s.pathsByDeploymentID, r.ID) delete(s.pathsByDeploymentID, r.ID)
} }
@ -217,11 +221,18 @@ func (s *Store) LookupDeploymentByPath(ctx context.Context, path string) ([]*Dep
s.l.RLock() s.l.RLock()
defer s.l.RUnlock() defer s.l.RUnlock()
st, ok := s.deploymentsByPath[path] res := []*DeploymentState{}
deployments, ok := s.deploymentsByPath[path]
if !ok { if !ok {
return []*DeploymentState{}, nil return res, nil
} }
return st, nil
for _, d := range deployments {
res = append(res, d)
}
return res, nil
} }
func (s *Store) ListDeployments(ctx context.Context) ([]*DeploymentState, error) { func (s *Store) ListDeployments(ctx context.Context) ([]*DeploymentState, error) {