Skip to content

Commit

Permalink
Skip loading reflists when listing published repos
Browse files Browse the repository at this point in the history
The output doesn't actually depend on the reflists, and loading them for
every published repo starts to take substantial time and memory.

Signed-off-by: Ryan Gonzalez <ryan.gonzalez@collabora.com>
  • Loading branch information
refi64 committed Oct 24, 2023
1 parent f155ed3 commit 89dcf7b
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 12 deletions.
2 changes: 1 addition & 1 deletion api/publish.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func apiPublishList(c *gin.Context) {
result := make([]*deb.PublishedRepo, 0, collection.Len())

err := collection.ForEach(func(repo *deb.PublishedRepo) error {
err := collection.LoadComplete(repo, collectionFactory)
err := collection.LoadShallow(repo, collectionFactory)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/publish_list.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func aptlyPublishListTxt(cmd *commander.Command, _ []string) error {
published := make([]string, 0, collectionFactory.PublishedRepoCollection().Len())

err = collectionFactory.PublishedRepoCollection().ForEach(func(repo *deb.PublishedRepo) error {
e := collectionFactory.PublishedRepoCollection().LoadComplete(repo, collectionFactory)
e := collectionFactory.PublishedRepoCollection().LoadShallow(repo, collectionFactory)
if e != nil {
fmt.Fprintf(os.Stderr, "Error found on one publish (prefix:%s / distribution:%s / component:%s\n)",
repo.StoragePrefix(), repo.Distribution, repo.Components())
Expand Down
40 changes: 30 additions & 10 deletions deb/publish.go
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ func NewPublishedRepo(storage, prefix, distribution string, architectures []stri
return result, nil
}

// MarshalJSON requires object to be "loaded completely"
// MarshalJSON requires object to filled by "LoadShallow" or "LoadComplete"
func (p *PublishedRepo) MarshalJSON() ([]byte, error) {
type sourceInfo struct {
Component, Name string
Expand Down Expand Up @@ -990,8 +990,11 @@ func (collection *PublishedRepoCollection) Update(repo *PublishedRepo) error {
return batch.Write()
}

// LoadComplete loads additional information for remote repo
func (collection *PublishedRepoCollection) LoadComplete(repo *PublishedRepo, collectionFactory *CollectionFactory) (err error) {
// LoadShallow loads basic information on the repo's sources
//
// This does not *fully* load in the sources themselves and their packages.
// It's useful if you just want to use JSON serialization without loading in unnecessary things.
func (collection *PublishedRepoCollection) LoadShallow(repo *PublishedRepo, collectionFactory *CollectionFactory) (err error) {
repo.sourceItems = make(map[string]repoSourceItem)

if repo.SourceKind == SourceSnapshot {
Expand All @@ -1002,10 +1005,6 @@ func (collection *PublishedRepoCollection) LoadComplete(repo *PublishedRepo, col
if err != nil {
return
}
err = collectionFactory.SnapshotCollection().LoadComplete(item.snapshot)
if err != nil {
return
}

repo.sourceItems[component] = item
}
Expand All @@ -1017,6 +1016,30 @@ func (collection *PublishedRepoCollection) LoadComplete(repo *PublishedRepo, col
if err != nil {
return
}

item.packageRefs = &PackageRefList{}
repo.sourceItems[component] = item
}
} else {
panic("unknown SourceKind")

Check warning on line 1024 in deb/publish.go

View check run for this annotation

Codecov / codecov/patch

deb/publish.go#L1023-L1024

Added lines #L1023 - L1024 were not covered by tests
}

return
}

// LoadComplete loads complete information on the sources of the repo *and* their packages
func (collection *PublishedRepoCollection) LoadComplete(repo *PublishedRepo, collectionFactory *CollectionFactory) (err error) {
collection.LoadShallow(repo, collectionFactory)

if repo.SourceKind == SourceSnapshot {
for _, item := range repo.sourceItems {
err = collectionFactory.SnapshotCollection().LoadComplete(item.snapshot)
if err != nil {
return
}

Check warning on line 1039 in deb/publish.go

View check run for this annotation

Codecov / codecov/patch

deb/publish.go#L1038-L1039

Added lines #L1038 - L1039 were not covered by tests
}
} else if repo.SourceKind == SourceLocalRepo {
for component, item := range repo.sourceItems {
err = collectionFactory.LocalRepoCollection().LoadComplete(item.localRepo)
if err != nil {
return
Expand All @@ -1035,13 +1058,10 @@ func (collection *PublishedRepoCollection) LoadComplete(repo *PublishedRepo, col
}
}

item.packageRefs = &PackageRefList{}
err = item.packageRefs.Decode(encoded)
if err != nil {
return
}

repo.sourceItems[component] = item
}
} else {
panic("unknown SourceKind")
Expand Down

0 comments on commit 89dcf7b

Please sign in to comment.