From 9ffb41f509cd2531e7f3cdf89a66605ec0fdf7a4 Mon Sep 17 00:00:00 2001
From: Salim Achouche <sachouche2@gmail.com>
Date: Wed, 31 Jan 2018 18:59:58 -0800
Subject: [PATCH] DRILL-6129: Fixed query failure due to nested column data
 type change

---
 .../apache/drill/exec/record/RecordBatchLoader.java   | 11 +++++++++++
 1 file changed, 11 insertions(+)

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 f180b40cc4f..a2c4363df7f 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 @@ private boolean isSameSchema(Collection<MaterializedField> currentChildren,
       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.