Skip to content

Commit

Permalink
resolved some comments
Browse files Browse the repository at this point in the history
Signed-off-by: Xiaoxuan Wang <[email protected]>
  • Loading branch information
wangxiaoxuan273 committed Dec 11, 2023
1 parent 7d8de46 commit eecb490
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
16 changes: 8 additions & 8 deletions content/oci/oci.go
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ func (s *Store) Delete(ctx context.Context, target ocispec.Descriptor) error {
defer s.sync.Unlock()

// delete one node
danglings, err := s.deleteNode(ctx, target)
danglings, err := s.delete(ctx, target)
if err != nil {
return err
}
Expand All @@ -170,8 +170,8 @@ func (s *Store) Delete(ctx context.Context, target ocispec.Descriptor) error {
return nil
}

// deleteNode deletes one node and returns the dangling nodes created by the delete.
func (s *Store) deleteNode(ctx context.Context, target ocispec.Descriptor) ([]ocispec.Descriptor, error) {
// delete deletes one node and returns the dangling nodes created by the delete.
func (s *Store) delete(ctx context.Context, target ocispec.Descriptor) ([]ocispec.Descriptor, error) {
resolvers := s.tagResolver.Map()
untagged := false
for reference, desc := range resolvers {
Expand All @@ -196,17 +196,17 @@ func (s *Store) deleteNode(ctx context.Context, target ocispec.Descriptor) ([]oc
func (s *Store) autoGCInDelete(ctx context.Context, danglings []ocispec.Descriptor) error {
// for each item in dangling, if it exists and it is dangling, remove it and
// add new dangling nodes into dangling
i := 0
for i < len(danglings) {
node := danglings[i]

for len(danglings) > 0 {
node := danglings[0]
danglings = danglings[1:]
if s.graph.IsDanglingNode(node) {
descs, err := s.deleteNode(ctx, node)
descs, err := s.delete(ctx, node)
if err != nil {
return err
}
danglings = append(danglings, descs...)
}
i++
}
return nil
}
Expand Down
4 changes: 2 additions & 2 deletions internal/graph/memory.go
Original file line number Diff line number Diff line change
Expand Up @@ -118,13 +118,13 @@ func (m *Memory) Predecessors(_ context.Context, node ocispec.Descriptor) ([]oci
}

// Remove removes the node from its predecessors and successors, and returns the
// dangling nodes caused by the deletion.
// dangling root nodes caused by the deletion.
func (m *Memory) Remove(node ocispec.Descriptor) []ocispec.Descriptor {
m.lock.Lock()
defer m.lock.Unlock()

nodeKey := descriptor.FromOCI(node)
danglings := []ocispec.Descriptor{}
var danglings []ocispec.Descriptor
// remove the node from its successors' predecessor list
for successorKey := range m.successors[nodeKey] {
predecessorEntry := m.predecessors[successorKey]
Expand Down

0 comments on commit eecb490

Please sign in to comment.