Requesting a Review about PR----[CALCITE-4486]

[xiong duan]

Hi Follower, Please help review this PR, So that I can make some
improvements. Thank you very much.
The ISSUE address: https://issues.apache.org/jira/browse/CALCITE-4486
The PR address: https://github.com/apache/calcite/pull/2495