[Collections] Fix useSearchIndices race #3529
Merged
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
Motivation: rdar://78872613 `SQLitePackageCollectionsStorage.useSearchIndices` is set in `createSchemaIfNecessary`, which is invoked only along with a database operation. Since search methods (e.g., `searchPackages`) check `useSearchIndices` first thing, it's possible that `createSchemaIfNecessary` hasn't been called yet and as a result `useSearchIndices` defaults to `false`, causing a different code path to get executed. Modification: Make sure `createSchemaIfNecessary` is called before reading `useSearchIndices`.
yim-lee
requested review from
abertelrud,
friedbunny,
neonichu and
tomerd
as code owners
|
@swift-ci please smoke test |
friedbunny
approved these changes
Jun 4, 2021
|
@swift-ci please smoke test macOS |
tomerd
approved these changes
Jun 4, 2021
|
CI error seems unrelated: https://ci.swift.org/job/swift-package-manager-PR-macos-smoke-test/3239/ |
|
@swift-ci please smoke test macOS |
yim-lee
added a commit
to yim-lee/swift-package-manager
that referenced
this pull request
Jun 5, 2021
Motivation: rdar://78872613 `SQLitePackageCollectionsStorage.useSearchIndices` is set in `createSchemaIfNecessary`, which is invoked only along with a database operation. Since search methods (e.g., `searchPackages`) check `useSearchIndices` first thing, it's possible that `createSchemaIfNecessary` hasn't been called yet and as a result `useSearchIndices` defaults to `false`, causing a different code path to get executed. Modification: Make sure `createSchemaIfNecessary` is called before reading `useSearchIndices`.
yim-lee
added a commit
that referenced
this pull request
Jun 7, 2021
Motivation: rdar://78872613 `SQLitePackageCollectionsStorage.useSearchIndices` is set in `createSchemaIfNecessary`, which is invoked only along with a database operation. Since search methods (e.g., `searchPackages`) check `useSearchIndices` first thing, it's possible that `createSchemaIfNecessary` hasn't been called yet and as a result `useSearchIndices` defaults to `false`, causing a different code path to get executed. Modification: Make sure `createSchemaIfNecessary` is called before reading `useSearchIndices`.
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:
rdar://78872613
SQLitePackageCollectionsStorage.useSearchIndicesis set increateSchemaIfNecessary, which is invoked only along with a database operation. Since search methods (e.g.,searchPackages) checkuseSearchIndicesfirst thing, it's possible thatcreateSchemaIfNecessaryhasn't been called yet and as a resultuseSearchIndicesdefaults tofalse, causing a different code path to get executed.Modification:
Make sure
createSchemaIfNecessaryis called before readinguseSearchIndices.