Hello, I prepared some fixes for CALCITE-4560 [1] and CALCITE-4574 [2]. I plan to merge them in the following days so if somebody wants to have a look before, please comment in the JIRA/PR.
Best, Stamatis [1] https://github.com/apache/calcite/pull/2406 [2] https://github.com/apache/calcite/pull/2393
