PR for review

[段雄]

Hey guys, here is my PR needed one more review:
https://github.com/apache/calcite/pull/2402 I would appreciate if anyone
can review it.