Repository: drill Updated Branches: refs/heads/master 2637d65cd -> 7b49be6af
DRILL-6129: Fixed query failure due to nested column data type change This closes #1106 Project: http://git-wip-us.apache.org/repos/asf/drill/repo Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/26dcca0c Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/26dcca0c Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/26dcca0c Branch: refs/heads/master Commit: 26dcca0c525e5e0e2920caf6a70c74996af92fd6 Parents: 2637d65 Author: Salim Achouche <sachouc...@gmail.com> Authored: Wed Jan 31 18:59:58 2018 -0800 Committer: Parth Chandra <par...@apache.org> Committed: Fri Feb 9 14:29:34 2018 +0530 ---------------------------------------------------------------------- .../org/apache/drill/exec/record/RecordBatchLoader.java | 11 +++++++++++ 1 file changed, 11 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/drill/blob/26dcca0c/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordBatchLoader.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordBatchLoader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordBatchLoader.java index f180b40..a2c4363 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordBatchLoader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordBatchLoader.java @@ -204,6 +204,17 @@ public class RecordBatchLoader implements VectorAccessible, Iterable<VectorWrapp if (! currentChild.getType().equals(newChild.getMajorType())) { return false; } + + // Perform schema diff for child column(s) + if (currentChild.getChildren().size() != newChild.getChildCount()) { + return false; + } + + if (!currentChild.getChildren().isEmpty()) { + if (!isSameSchema(currentChild.getChildren(), newChild.getChildList())) { + return false; + } + } } // Everything matches.
