Improve SchemaManager logic for comparing text indexes #1829
Conversation
This file contains 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
jmikola
changed the title
jmikola
commented
Jul 18, 2018
|
|
||
| /* Avoid a strict equality check here. The numeric type returned by | ||
| * MongoDB may differ from the document index without implying that the | ||
| * indexes themselves are inequivalent. */ |
There was a problem hiding this comment.
See #1828 (comment) for additional context.
alcaeus
approved these changes
Jul 18, 2018
malarzm
reviewed
Jul 18, 2018
| foreach (['default_language', 'language_override', 'textIndexVersion'] as $option) { | ||
| /* Text indexes will always report defaults for these options, so | ||
| * only compare if we have explicit values in the document index. */ | ||
| if (isset($mongoIndex[$option]) && isset($documentIndexOptions[$option]) && |
There was a problem hiding this comment.
issets can be combined to one isset($mongoIndex[$option], $documentIndexOptions[$option])
There was a problem hiding this comment.
I had copied this from the ['bits', 'max', 'min'] loop above. Will make the change in both places.
| } | ||
|
|
||
| /* MongoDB returns the weights sorted by field name, but we'll sort both | ||
| * arrays in case that is internal behavior not be be relied upon. */ |
There was a problem hiding this comment.
Ah, I meant to write "to be". Good catch!
There was a problem hiding this comment.
Also fixed in 1.2.x: 70441ac
This will avoid rebuilding text indexes unnecessarily. Fixes doctrine#1821.
jmikola
added a commit
that referenced
this pull request
Jul 18, 2018
@malarzm caught this in #1829 (comment)
|
Please ignore the |
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.
Summary
This is a cherry-pick of #1828 for
masterand includes various CS fixes. I also added two tests for the loose equality checks for keys/weights.