Requesting a review on a PR----[CALCITE-4661]

[xiong duan]

Hi Follower, Please review this PR, So that I can make some improvements.
Thank you.