Fix mapping after aggregation push down#4500

LantaoJin merged 3 commits intoopensearch-project:mainopensearch-project/sql:mainfrom

qianheng-aws:fix4413qianheng-aws/sql:fix4413Copy head branch name to clipboard