Please review CALCITE-4593 [1] and its PR [2]. I would like to squash and merge in 24 hours.
Note that this change sorts several major src/test/resources/*/*.xml files, so it will not merge cleanly with other PRs. (But the whole point of this change is that such files will merge cleanly in future.) Julian [1] https://issues.apache.org/jira/browse/CALCITE-4593 [2] https://github.com/apache/calcite/pull/2409
