Skip to content

Revert "Remove aggregation's postCollect phase#68615

Merged
imotov merged 9 commits intoelastic:masterfrom
imotov:issue-66876-sorting-on-nested
Feb 11, 2021
Merged

Revert "Remove aggregation's postCollect phase#68615
imotov merged 9 commits intoelastic:masterfrom
imotov:issue-66876-sorting-on-nested

Conversation

@imotov
Copy link
Copy Markdown
Contributor

@imotov imotov commented Feb 5, 2021

This partially reverts #64016 and and adds #67839 and adds
additional tests that would have caught issues with the changes
in #64016. It's mostly Nik's code, I am just cleaning things up
a bit. This commit only fixes nested aggs. Fixing the children aggs
is more difficult issue.

Relates to #66876

Co-authored-by: Nik Everett nik9000@gmail.com

This partially reverts elastic#64016 and  and adds elastic#67839 and adds
additional tests that would have caught issues with the changes
in elastic#64016. It's mostly Nik's code, I am just cleaning things up
a bit.

Co-authored-by: Nik Everett <nik9000@gmail.com>
@imotov
Copy link
Copy Markdown
Contributor Author

imotov commented Feb 9, 2021

@elasticmachine update branch

@imotov imotov changed the title WIP: Revert "Remove aggregation's postCollect phase (#64016)" Revert "Remove aggregation's postCollect phase Feb 10, 2021
@imotov imotov requested a review from nik9000 February 10, 2021 14:36
@imotov imotov marked this pull request as ready for review February 10, 2021 14:36
@elasticmachine elasticmachine added the Team:Analytics Meta label for analytical engine team (ESQL/Aggs/Geo) label Feb 10, 2021
@elasticmachine
Copy link
Copy Markdown
Collaborator

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

Copy link
Copy Markdown
Member

@nik9000 nik9000 left a comment

Choose a reason for hiding this comment

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

LGTM. Good luck with the trickier bit!

I still don't like postCollect because we have to delay it sometimes so it feels wrong. But this fixes the issue and we'll come up with something better later.

@imotov imotov merged commit 0bbc6ad into elastic:master Feb 11, 2021
@imotov
Copy link
Copy Markdown
Contributor Author

imotov commented Feb 11, 2021

I don't like this either, but it looks like we need to find a better solution.

@nik9000 nik9000 removed the v7.11.2 label Mar 11, 2021
@nik9000
Copy link
Copy Markdown
Member

nik9000 commented Mar 11, 2021

It looks like something went wrong with the backport to 7.11 and this doesn't solve the issue on the branch. I've removed the 7.11.2 label because, while the code is in that release, its not doing what we thought it did.

@imotov
Copy link
Copy Markdown
Contributor Author

imotov commented Mar 15, 2021

Interesting, it's definitely in v7.11.2:

› git log v7.11.2 --oneline | grep 'Revert "Remove aggregation'
27e59ab83d0 [7.11] Revert "Remove aggregation's postCollect phase (#68942) (#69066)

And changes are there

@nik9000
Copy link
Copy Markdown
Member

nik9000 commented Mar 17, 2021

When I dropped the label I had incorrectly thought that we intended this PR to fix a particular bug who's test had suddenly started failing. It wasn't. We were just adding the test to make sure we had it for when we do fix the bug. So it's correct to say that this is in 7.11.2.

@imotov imotov deleted the issue-66876-sorting-on-nested branch March 27, 2021 00:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

:Analytics/Aggregations Aggregations >bug Team:Analytics Meta label for analytical engine team (ESQL/Aggs/Geo) v7.11.2 v7.12.0 v8.0.0-alpha1

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants