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.

Sign up for GitHub

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

Set ParentAggregationBuilder not to support concurrent execution #99809

Merged
merged 2 commits into from
Sep 25, 2023
Merged

Set ParentAggregationBuilder not to support concurrent execution #99809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
263cf6f
Set ParentAggregationBuilder as not supporting concurrent execution
iverase Sep 22, 2023
111f362
spotless
iverase Sep 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions ...ent-join/src/internalClusterTest/java/org/elasticsearch/join/aggregations/ChildrenIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

import org.apache.lucene.search.join.ScoreMode;
import org.elasticsearch.action.index.IndexRequestBuilder;
import org.elasticsearch.action.search.SearchRequestBuilder;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.action.update.UpdateResponse;
import org.elasticsearch.client.internal.Requests;
Expand Down Expand Up @@ -43,7 +44,18 @@

public class ChildrenIT extends AbstractParentChildTestCase {

public void testChildrenAggs() throws Exception {
public void testSimpleChildrenAgg() {
final SearchRequestBuilder searchRequest = client().prepareSearch("test")
.setQuery(matchQuery("randomized", true))
.addAggregation(children("to_comment", "comment"));
final SearchResponse searchResponse = searchRequest.get();
long count = categoryToControl.values().stream().mapToLong(control -> control.commentIds.size()).sum();
assertSearchResponse(searchResponse);
Children childrenAgg = searchResponse.getAggregations().get("to_comment");
assertThat("Request: " + searchRequest + "\nResponse: " + searchResponse + "\n", childrenAgg.getDocCount(), equalTo(count));
}

public void testChildrenAggs() {
SearchResponse searchResponse = client().prepareSearch("test")
.setQuery(matchQuery("randomized", true))
.addAggregation(
Expand Down Expand Up @@ -86,7 +98,7 @@ public void testChildrenAggs() throws Exception {
}
}

public void testParentWithMultipleBuckets() throws Exception {
public void testParentWithMultipleBuckets() {
SearchResponse searchResponse = client().prepareSearch("test")
.setQuery(matchQuery("randomized", false))
.addAggregation(
Expand Down
22 changes: 21 additions & 1 deletion ...arent-join/src/internalClusterTest/java/org/elasticsearch/join/aggregations/ParentIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,27 @@

public class ParentIT extends AbstractParentChildTestCase {

public void testSimpleParentAgg() throws Exception {
public void testSimpleParentAgg() {
final SearchRequestBuilder searchRequest = client().prepareSearch("test")
.setSize(0)
.setQuery(matchQuery("randomized", true))
.addAggregation(parent("to_article", "comment"));
SearchResponse searchResponse = searchRequest.get();

assertSearchResponse(searchResponse);
long articlesWithComment = articleToControl.values()
.stream()
.filter(parentControl -> parentControl.commentIds.isEmpty() == false)
.count();
Parent parentAgg = searchResponse.getAggregations().get("to_article");
assertThat(
"Request: " + searchRequest + "\nResponse: " + searchResponse + "\n",
parentAgg.getDocCount(),
equalTo(articlesWithComment)
);
}

public void testSimpleParentAggWithSubAgg() {
final SearchRequestBuilder searchRequest = client().prepareSearch("test")
.setSize(10000)
.setQuery(matchQuery("randomized", true))
Expand Down
5 changes: 5 additions & 0 deletions ...rent-join/src/main/java/org/elasticsearch/join/aggregations/ParentAggregationBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,11 @@ public BucketCardinality bucketCardinality() {
return BucketCardinality.ONE;
}

@Override
public boolean supportsParallelCollection() {
return false;
}

@Override
protected ValuesSourceAggregatorFactory innerBuild(
AggregationContext context,
Expand Down