Fix broken compilation due to Calcite interface change
3 files changed