Github user HanumathRao commented on the issue: https://github.com/apache/drill/pull/1110 @amansinha100 @vrozov Thanks for the review. I have squashed all the commits into two commits. Please merge these two commits individually into the apache master branch. First commit is for refactoring existing code. Second commit is about fixing this JIRA request.