Github user paul-rogers commented on the issue:
Rebased onto DRILL-5318 so that this branch includes the DRILL-5318 code
that this PR depends upon, as well as the additional code required for this PR.
Fixed the merge errors that caused the compilation issue.
Please commit DRILL-5318 first. Then, commit this PR. Given that this PR is
already rebased on 5318, this PR should merge cleanly into master.
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket