Use the AggTestConfig object in testCase#90699
Merged
not-napoleon merged 5 commits intoelastic:mainfrom Oct 6, 2022
Merged
Conversation
Collaborator
|
Pinging @elastic/es-analytics-geo (Team:Analytics) |
martijnvg
approved these changes
Oct 6, 2022
| List.of(4L) | ||
| ); | ||
| }, fieldType); | ||
| }, new AggTestConfig(aggregationBuilder, fieldType)); |
Member
There was a problem hiding this comment.
I think withQuery(query) needs to be added here?
Member
Author
There was a problem hiding this comment.
yup, looks like I dropped that by accident.
| termsBuilder.subAggregation(nestedBuilder); | ||
|
|
||
| terms = searchAndReduce(new AggTestConfig(newSearcher(indexReader, false, true), termsBuilder, fieldType1, fieldType2)); | ||
| terms = searchAndReduce(newSearcher(indexReader, false, true), aggTestConfig); |
Member
There was a problem hiding this comment.
I think aggTestConfig = new AggTestConfig(termsBuilder, fieldType1, fieldType2); needs to be added before this line? termsBuilder is changed in the lines above here, so a new AggTestConfig instance should be created?
Member
Author
|
@elasticmachine update branch |
…sticsearch into test-case-config-object
weizijun
added a commit
to weizijun/elasticsearch
that referenced
this pull request
Oct 10, 2022
* main: (150 commits) Remove ToXContent interface from ChunkedToXContent (elastic#90409) Remove extra SearchService constructor (elastic#90733) Update min version for the diagnosis yaml test (elastic#90731) Use the AggTestConfig object in testCase (elastic#90699) [DOCS] Add links to clear trained model deployment cache API (elastic#90727) Assert wildcards are not expanded as specified by request options (elastic#90641) [TEST] Fix exit snapshot restore exit condition (elastic#90696) [TEST] Change to atomic file contents save (elastic#90695) Update forbiddenapis to 3.4 (elastic#90624) [Tests] Don't use concurrent search in scripted field type tests (elastic#90712) [ML] Move scaling is possible check for starting trained model (elastic#90706) Add new base test case for chunked xcontent types (elastic#90707) Fix testRedNoBlockedIndicesAndRedAllRoleNodes (elastic#90671) Fix nullpointer in docs test setup (elastic#90660) Don't produce build logs artifact when in a composite build Fixing a race condition in EnrichCoordinatorProxyAction that can leave an item stuck in its queue (elastic#90688) docs: update fleet/agent pipeline docs (elastic#90659) [HealthAPI] Use plural consistently in resource types (elastic#90682) [Testing] Enable bwc and fix sorting for 500_date_range (elastic#90681) Add profiling and documentation for dfs phase (elastic#90536) ... # Conflicts: # x-pack/plugin/mapper-aggregate-metric/src/test/java/org/elasticsearch/xpack/aggregatemetric/mapper/AggregateDoubleMetricFieldMapperTests.java
34 tasks
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
4 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.
This is a second attempt at #90320. I've left out the more challenging parts of that PR, notably reconciling the buildIndex callback with aggregations that want to pass in searchers directly and making the
aggTestConfigobject generic over the verify method. For the verify method, I just didn't touch it. For the buildIndex/Searcher conflict, I've taken a different approach: I factored the searcher out of the config object, and pass it directly to search and reduce. Likewise test case can just accept the builder and use it to make a searcher, which it passes to search and reduce.So what's the point of this, you may ask. The point is that now both
testCaseandsearchAndReduceuse the same config object for many of their common settings. This will make life easier converting bespoke tests to use one or the other, and thus get the memory checking benefits of routing throughsearchAndReducewithout requiring endless configuration overrides. This change should remove the need for this config function for example (/cc @romseygeek ).Once again, I apologize for the huge diff from a largely automated refactor.