Review request

[Dmitry Sysolyatin]

Hi!
Can you someone review those PRs:
https://github.com/apache/calcite/pull/2789
https://github.com/apache/calcite/pull/2804

Thanks