Fix compilation error; Fix a regression due to Calcite materialization changes
3 files changed