fix: make main compile against the forked OpenSearch package - #3442
Merged
Merged
Conversation
#3439 left two things behind. `SearchEngineClient.pitSegments` overrides a `Client` method that the fork does not have. The package rename was applied to every `org.opensearch.*` reference without checking that each type survived: `PitSegmentsRequest` did not, so the import resolves to nothing and the method is an `@Override` of nothing. Removed, with the two imports it needed. `AbstractDocumentSearcherTest` arrived from #3440 after the migration branch was cut, so its six `org.opensearch.*` imports were never rewritten. They are now. Nothing else in the tree still names `org.opensearch`.
Contributor
Author
|
The CI failure here is not this change — it is a dependency that had not been That run started at 14:31. codelibs/fess-crawler#209 merged at 14:34 and its What still has to land first
So a re-run now gets past codelibs/fess-suggest#98 has to be merged and published before this can go green. Verified locally, with all three dependencies at the right versions
|
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
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.
maindoes not compile since #3439.Two things the migration missed
SearchEngineClient.pitSegmentsoverrides nothing. #3439 rewrote everyorg.opensearch.*reference toorg.codelibs.fesen.opensearch.*. The rename wasapplied uniformly, but not every type survived the fork —
PitSegmentsRequestdidnot, and fesen-httpclient's
Clientno longer declarespitSegments:The method and its two imports are removed. Every other
org.codelibs.fesen.opensearch.*name in the tree was checked against the 2,491classes the fork ships; this was the only one missing.
AbstractDocumentSearcherTestwas never migrated. It arrived with #3440, afterthe migration branch was cut, so its six
org.opensearch.*imports stayed as theywere. They are rewritten now.
grep -rn 'org\.opensearch\.' src/returns nothing.#3439's CI could not have caught either one. It was red for its whole life because
the forked fesen-httpclient was unpublished, so
fessnever reached javac there.This needs codelibs/fesen-httpclient#46 published first
That test builds a
SearchResponseby hand and calls four members the fork hadpruned —
SearchHits.empty(boolean),ShardSearchFailure(Exception), and oneconstructor each on
InternalSearchResponseandSearchResponse. #46 puts themback. Until it is published, CI here will fail on those four symbols and nothing
else.
Verification
With #46 installed locally:
mvn test-compile— BUILD SUCCESS, from acompilation failure on
main.