[Backport 2.19-dev] Fix mapping after aggregation push down #4500#4524

LantaoJin merged 2 commits intoopensearch-project:2.19-devopensearch-project/sql:2.19-devfrom

qianheng-aws:backport/backport-4500-to-2.19-devqianheng-aws/sql:backport/backport-4500-to-2.19-devCopy head branch name to clipboard