[Collections] Use persistent cache for GitHub package metadata #3441
Conversation
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
yim-lee
requested review from
abertelrud,
friedbunny,
neonichu and
tomerd
as code owners
|
@swift-ci please smoke test |
yim-lee
commented
Apr 24, 2021
| import TSCUtility | ||
|
|
||
| /// SQLite backed persistent cache. | ||
| public final class SQLiteBackedCache<Value: Codable>: Closable { |
There was a problem hiding this comment.
This is formerly SQLiteManifestCache
| } | ||
| } | ||
|
|
||
| public func put(key: Key, value: Value, replace: Bool = false) throws { |
There was a problem hiding this comment.
Add option to replace or ignore
| if let cache = self.cache { | ||
| cache[reference] = (model, DispatchTime.now()) | ||
|
|
||
| if cache.count > self.configuration.cacheSize { |
There was a problem hiding this comment.
With the max size feature in SQLite cache, we don't need to manually delete cache entries.
| @@ -585,23 +584,23 @@ public final class ManifestLoader: ManifestLoaderProtocol { | |||
| } | |||
|
|
|||
| fileprivate func parseAndCacheManifest(key: ManifestCacheKey, diagnostics: DiagnosticsEngine?) -> ManifestParseResult { | |||
| let cache = self.databaseCacheDir.map { cacheDir -> SQLiteManifestCache in | |||
| let cache = self.databaseCacheDir.map { cacheDir -> SQLiteBackedCache<ManifestParseResult> in | |||
There was a problem hiding this comment.
This is the main change in this file. The rest is formatting / refactoring.
| import TSCUtility | ||
| import XCTest | ||
|
|
||
| final class SQLiteBackedCacheTests: XCTestCase { |
There was a problem hiding this comment.
Copied from manifest cache tests.
|
@swift-ci please smoke test |
1 similar comment
|
@swift-ci please smoke test |
tomerd
reviewed
Apr 26, 2021
| throw error | ||
| } | ||
| self.diagnosticsEngine?.emit(.warning("truncating \(self.name) cache database since it reached max size of \(self.configuration.maxSizeInBytes ?? 0) bytes")) | ||
| try self.executeStatement("DELETE FROM \(self.name);") { statement -> Void in |
There was a problem hiding this comment.
as future idea, we can evolve configuration.truncateWhenFull to determine more fine grained rules
tomerd
approved these changes
Apr 26, 2021
Motivation: Currently we use transient in-memory cache for storing GitHub package metadata. Modifications: - Add generic `SQLiteBackedCache` in Basics - Change `ManifestLoader` to use `SQLiteBackedCache` - Change `GitHubPackageMetadataProvider` to use `SQLiteBackedCache` - Adjust tests
|
@swift-ci please smoke test |
|
@swift-ci please smoke test macOS |
|
@swift-ci please smoke test macOS |
|
https://ci.swift.org/job/swift-package-manager-PR-macos-smoke-test/3140/console |
|
@swift-ci please smoke test macOS |
yim-lee
added a commit
to yim-lee/swift-package-manager
that referenced
this pull request
Apr 28, 2021
…lang#3441) * [Collections] Use persistent cache for GitHub package metadata Motivation: Currently we use transient in-memory cache for storing GitHub package metadata. Modifications: - Add generic `SQLiteBackedCache` in Basics - Change `ManifestLoader` to use `SQLiteBackedCache` - Change `GitHubPackageMetadataProvider` to use `SQLiteBackedCache` - Adjust tests * Undo swiftformat changes * Fix CMake build * Rename name to tableName * Document 'tableName'
yim-lee
added a commit
that referenced
this pull request
Apr 28, 2021
#3453) * [Collections] Use persistent cache for GitHub package metadata Motivation: Currently we use transient in-memory cache for storing GitHub package metadata. Modifications: - Add generic `SQLiteBackedCache` in Basics - Change `ManifestLoader` to use `SQLiteBackedCache` - Change `GitHubPackageMetadataProvider` to use `SQLiteBackedCache` - Adjust tests * Undo swiftformat changes * Fix CMake build * Rename name to tableName * Document 'tableName'
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Motivation:
Currently we use transient in-memory cache for storing GitHub package metadata.
Modifications:
SQLiteBackedCachein BasicsManifestLoaderto useSQLiteBackedCacheGitHubPackageMetadataProviderto useSQLiteBackedCache