Rip sphinx 755923#666
Closed
willkg wants to merge 7 commits into
Closed
Conversation
This removes all the Sphinx-related stuff.
You may need to do:
git rm --cached vendors/src/oedipus vendor/src/sphinxapi
to remove the vendor git submodule stuff.
This rewrites it to use ES .search() code rather than whatever it was using before. Also, the index layout has changed, so this updates that, too.
If a search adds filters on model Foo, but not on other models, then what happens is that the Fs get combined and the resulting F requires things that are only in model Foo and thus the search results only have results from model Foo in them. This fixes that by forcing the F to specify which model they filter on. So when they get combined, we get filters like "if the model is Foo AND this AND that" OR "if the model is Bar AND this AND that" ... which alleviates the combination problem.
This ports all the Sphinx tests we didn't have implemented for ES to ES.
Contributor
|
"573 additions and 2,135 deletions. " :-) |
Contributor
There was a problem hiding this comment.
I beat you to landing a 148 migration.
Member
Author
|
I remembered that there were three tests I pulled in from test_sphinx.py that were automatically skipped. I fixed two of them. In the process of fixing the third, I found a minor bug with forum filtering. I'm finishing up those fixes now and will add them to this pull request in a jiffy. |
This fixes the migration for the elasticsearch waffle removal.
* forum has a u. oops. * if we hit ES and it's all like, "d00d! there are no things!", then we know there are no things and we don't have to ask it a second time to return an empty list.
These tests were in test_sphinx, but were automatically skipped. This fixes them for ES and fixes the test_discussion_filter_forum test which had a subtle issue.
Member
Author
|
I added three more commits. They should fix the outstanding problem plus fixes bunch of tests that were automatically skipped that I copied over from test_sphinx, but forgot to fix. Also, fixed a bug with filtering on forum ids. |
Contributor
|
20 secs off my local test suite run \o/ |
Contributor
|
r+. When is the funeral?! |
Member
Author
|
LANDED! 8405999 and friends |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
I think this:
What I did to test it was:
I'm not sure what else helps test this. I think the issues are modules not loading because specific imports aren't available anymore and other things failing because they expected Sphinx and we didn't update it for ES, but Sphinx is not around anymore.
Anyhow, r?