CALCITE-6794

[Hugh Pearse]

Hi team,
Kindly please review PR
https://github.com/apache/calcite/pull/4159

Thank you so much.

From,
Hugh Pearse