Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deguice SearchService and friends #20423

Merged
merged 3 commits into from
Sep 12, 2016
Merged

Conversation

s1monw
Copy link
Contributor

@s1monw s1monw commented Sep 12, 2016

This change removes the guice dependency handling for SearchService and
several related classes like SearchTransportController and SearchPhaseController.
The latter two now have pkg private constructors and dependencies like FetchPhase
are now created by calling their ctors explicitly. This also cleans up several users
of the DefaultSearchContext and centralized it's creation inside SearchService.

This change removes the guice dependency handling for SearchService and
several releated classes liek SearchTransportController and SearchPhaseController.
The latter two now have pkg private constructors and dependencies like FetchPhase
are now created by calling their ctors explicitly. This also cleans up several users
of the DefaultSearchContext and centralized it's creation inside SearchService.
@@ -61,7 +61,6 @@

private VersionType versionType = VersionType.INTERNAL;
private long version = Versions.MATCH_ANY;
private boolean ignoreErrorsOnGeneratedFields;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note to any other reviewers: this is no longer supported. I haven't dug too deep but my guess is that it was removed when we removed GET from the translog.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

correct

@nik9000
Copy link
Member

nik9000 commented Sep 12, 2016

LGTM

@@ -795,8 +789,10 @@ BigArrays createBigArrays(Settings settings, CircuitBreakerService circuitBreake
/**
* Select the search service implementation. Overrided by tests.
*/
protected Class<? extends SearchService> pickSearchServiceImplementation() {
return SearchService.class;
protected SearchService newSearchService(ClusterService clusterService, IndicesService indicesService,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is exactly what I had envisioned. Thank you!

@rjernst
Copy link
Member

rjernst commented Sep 12, 2016

Great! LGTM too.

@s1monw s1monw merged commit 686994a into elastic:master Sep 12, 2016
s1monw added a commit that referenced this pull request Sep 12, 2016
This change removes the guice dependency handling for SearchService and
several related classes like SearchTransportController and SearchPhaseController.
The latter two now have package private constructors and dependencies like FetchPhase
are now created by calling their constructors explicitly. This also cleans up several users
of the DefaultSearchContext and centralized it's creation inside SearchService.
s1monw added a commit that referenced this pull request Sep 12, 2016
This change removes the guice dependency handling for SearchService and
several related classes like SearchTransportController and SearchPhaseController.
The latter two now have package private constructors and dependencies like FetchPhase
are now created by calling their constructors explicitly. This also cleans up several users
of the DefaultSearchContext and centralized it's creation inside SearchService.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants