Andrei>Perhaps split it into two parts: That makes sense. parameterized and classrules seem to be not that trivial to migrate.
Then I would revert several changes in https://github.com/apache/calcite/pull/1621 and it would become a committable PR. Vladimir
