Search: allow to search on different versions of subprojects #7634
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
stsewd
added
Needed: tests
stsewd
force-pushed
the
search-subprojects
branch
2 times, most recently
from
074a6f0 to
a5cb8ac
Compare
Mainly this was done to allow us support searching on different versions of subprojects. Currently, we assume we search the same version for all subprojects. - _get_all_projects_data and _get_all_projects were merged into just one method. And instead of returning a list of projects we return a dictionary of project slugs mapped to a VersionData object. - There is some duplication in .com. `_has_permission` and `_get_subproject_versions_queryset` are overridden in .com. - ProjectData was renamed to VersionData since it has more attributes related to a version than a project.
stsewd
force-pushed
the
refactor-search-view
branch
from
f3590d6 to
9cacb2c
Compare
Mainly this was done to allow us support searching on different versions of subprojects. Currently, we assume we search the same version for all subprojects. - _get_all_projects_data and _get_all_projects were merged into just one method. And instead of returning a list of projects we return a dictionary of project slugs mapped to a VersionData object. - There is some duplication in .com. `_has_permission` and `_get_subproject_versions_queryset` are overridden in .com. - ProjectData was renamed to VersionData since it has more attributes related to a version than a project.
stsewd
force-pushed
the
search-subprojects
branch
from
a5cb8ac to
90accc5
Compare
stsewd
force-pushed
the
search-subprojects
branch
from
90accc5 to
c908174
Compare
Mainly this was done to allow us support searching on different versions of subprojects. Currently, we assume we search the same version for all subprojects. - _get_all_projects_data and _get_all_projects were merged into just one method. And instead of returning a list of projects we return a dictionary of project slugs mapped to a VersionData object. - There is some duplication in .com. `_has_permission` and `_get_subproject_versions_queryset` are overridden in .com. - ProjectData was renamed to VersionData since it has more attributes related to a version than a project.
stsewd
force-pushed
the
refactor-search-view
branch
from
9cacb2c to
e5c0337
Compare
stsewd
removed
Needed: tests
stsewd
force-pushed
the
search-subprojects
branch
from
985793d to
628edad
Compare
ericholscher
approved these changes
Nov 19, 2020
| ) | ||
| for project, version in self.projects.items() | ||
| ] | ||
| bool_query = Bool(must=[bool_query, Bool(should=versions_query)]) |
There was a problem hiding this comment.
I"m a little worried about this as you noted, but lets see how it performs in prod.
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.
Put this under a feature flag because who knows if this is going to explode in production :D
So, with filters you can't aggregate them to say "I want results from documents that match both, this version and project", so I had to use a bool query that represents this.
For projects where subprojects that don't match the same version as the parent project this will do an extra query (this may be not bad, I hope), we could fetch both in one query with an
or, but then the logic would be a little more complex I think, but we can try that if this is slow.Also, if the search query is slow, we can try some things:
projectsmethod, and then merge the results (here I'm not sure if the score would be correct).Note: all other tests without the feature flag are also passing when I activated this feature by default, so the order of the results are the same as using the filters
Based on #7633