Remove BigArrays from SearchContext #65981
Merged
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
elasticmachine
added
the
Team:Analytics
|
Pinging @elastic/es-analytics-geo (Team:Analytics) |
We've been trying to shrink the big, mutable `SearchContext`. I'm doing my part by removing `BigArrays` from it. Doing that required reworking how we test `Aggregator`s to not need `SearchContext`. So I did that too. Mostly. `top_hits` still needs a `SubSearchContext` which we can still build, but it is now quite contained.
nik9000
commented
Dec 7, 2020
| searchContext = new DefaultSearchContext(reader, request, shardTarget, clusterService, | ||
| bigArrays, threadPool::relativeTimeInMillis, timeout, fetchPhase, lowLevelCancellation); | ||
| searchContext = new DefaultSearchContext(reader, request, shardTarget, | ||
| threadPool::relativeTimeInMillis, timeout, fetchPhase, lowLevelCancellation); | ||
| // we clone the query shard context here just for rewriting otherwise we |
There was a problem hiding this comment.
clusterService was unused so I removed it while I was clearing bigArrays.
| @Override | ||
| protected AggregationBuilder doRewrite(QueryRewriteContext queryShardContext) throws IOException { | ||
| return super.doRewrite(queryShardContext); | ||
| } |
There was a problem hiding this comment.
This didn't do anything....
| * Is this request cacheable? Requests that have | ||
| * non-deterministic queries or scripts aren't cachable. | ||
| */ | ||
| public abstract boolean isCacheable(); |
There was a problem hiding this comment.
These are required by tests. I could avoid adding it with some terrible casting stuff in tests but I think it is better to be up front about it.
| @@ -277,6 +284,7 @@ public ProductionAggregationContext( | |||
| Supplier<Boolean> isCancelled | |||
| ) { | |||
| this.context = context; | |||
| this.bigArrays = context.bigArrays().withCircuitBreaking(); // We can break in searches. | |||
There was a problem hiding this comment.
Had to move with withCircuitBreaking from SearchContext.
| randomInt(), | ||
| () -> 0L, | ||
| () -> false | ||
| ); |
There was a problem hiding this comment.
I'd love to use a specialized testing subclass but this change is large enough as it is without me changing it.
| IndexShard indexShard = mock(IndexShard.class); | ||
| when(indexShard.shardId()).thenReturn(new ShardId("test", "test", 0)); | ||
| when(ctx.indexShard()).thenReturn(indexShard); | ||
| return new SubSearchContext(ctx); |
There was a problem hiding this comment.
Now all of this is contained to only be called for top_hits.
Thanks for reviewing! |
nik9000
added a commit
to nik9000/elasticsearch
that referenced
this pull request
Dec 8, 2020
We've been trying to shrink the big, mutable `SearchContext`. I'm doing my part by removing `BigArrays` from it. Doing that required reworking how we test `Aggregator`s to not need `SearchContext`. So I did that too. Mostly. `top_hits` still needs a `SubSearchContext` which we can still build, but it is now quite contained.
nik9000
added a commit
that referenced
this pull request
Dec 8, 2020
We've been trying to shrink the big, mutable `SearchContext`. I'm doing my part by removing `BigArrays` from it. Doing that required reworking how we test `Aggregator`s to not need `SearchContext`. So I did that too. Mostly. `top_hits` still needs a `SubSearchContext` which we can still build, but it is now quite contained.
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.
We've been trying to shrink the big, mutable
SearchContext. I'm doingmy part by removing
BigArraysfrom it. Doing that required reworkinghow we test
Aggregators to not needSearchContext. So I did thattoo. Mostly.
top_hitsstill needs aSubSearchContextwhich we canstill build, but it is now quite contained.