Github user HanumathRao commented on the issue: https://github.com/apache/drill/pull/1110 @amansinha100 @vrozov Thank you for the review. I have addressed all the review comments. Please let me know if any changes are required. The commits are organized such that one commit is for refactoring the existing code and the second one is specific to the changes required for this JIRA. This is done for ease of reviewing the code.