Skip to content

Revert 74559 (Avoid global ordinals in composite)#78846

Merged
not-napoleon merged 3 commits into
elastic:7.xfrom
not-napoleon:revert-74559-in-7.x
Oct 13, 2021
Merged

Revert 74559 (Avoid global ordinals in composite)#78846
not-napoleon merged 3 commits into
elastic:7.xfrom
not-napoleon:revert-74559-in-7.x

Conversation

@not-napoleon

Copy link
Copy Markdown
Contributor

Resolve #78836
Revert #74559

This reverts the change to use segment ordinals in composite terms aggregations due to a performance degradation when the field is high cardinality.

This reverts commit 5cfcb2f.

 Conflicts:
	server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesCollectorQueue.java
	server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/OrdinalValuesSource.java
	server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/TermsValuesSourceBuilder.java
	server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/SingleDimensionValuesSourceTests.java
@elasticmachine elasticmachine added the Team:Analytics Meta label for analytical engine team (ESQL/Aggs/Geo) label Oct 7, 2021
@elasticmachine

Copy link
Copy Markdown
Collaborator

Pinging @elastic/es-analytics-geo (Team:Analytics)

@not-napoleon not-napoleon requested a review from Luegg October 7, 2021 17:34

@nik9000 nik9000 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This looks like the right way to revert and patch the missing value order stuff.

@ywelsch ywelsch self-requested a review October 11, 2021 14:02

@ywelsch ywelsch left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@not-napoleon not-napoleon merged commit 9d14963 into elastic:7.x Oct 13, 2021
@not-napoleon not-napoleon deleted the revert-74559-in-7.x branch October 13, 2021 17:50
ywelsch pushed a commit to ywelsch/elasticsearch that referenced this pull request Nov 8, 2021
This reverts the change to use segment ordinals in composite terms aggregations due to a performance degradation when the field is high cardinality.
ywelsch added a commit that referenced this pull request Nov 8, 2021
This reverts the change to use segment ordinals in composite terms aggregations due to a performance degradation when the field is high cardinality.

Co-authored-by: Mark Tozzi <mark.tozzi@elastic.co>
ywelsch added a commit to ywelsch/elasticsearch that referenced this pull request Nov 8, 2021
…astic#80498)

This reverts the change to use segment ordinals in composite terms aggregations due to a performance degradation when the field is high cardinality.

Co-authored-by: Mark Tozzi <mark.tozzi@elastic.co>
elasticsearchmachine pushed a commit that referenced this pull request Nov 8, 2021
…80502)

This reverts the change to use segment ordinals in composite terms aggregations due to a performance degradation when the field is high cardinality.

Co-authored-by: Mark Tozzi <mark.tozzi@elastic.co>

Co-authored-by: Mark Tozzi <mark.tozzi@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

>bug Team:Analytics Meta label for analytical engine team (ESQL/Aggs/Geo) v7.16.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants