1 files changed, 10 insertions, 0 deletions
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/DrillRelBuilder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/DrillRelBuilder.java
index 1ec300daf..22597dc51 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/DrillRelBuilder.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/DrillRelBuilder.java
@@ -67,4 +67,14 @@ public class DrillRelBuilder extends RelBuilder {
   public static RelBuilderFactory proto(Object... factories) {
     return proto(Contexts.of(factories));
   }
+
+  /**
+   * Disables combining of consecutive {@link org.apache.calcite.rel.core.Project} nodes.
+   * See comments under CALCITE-2470 for details.
+   * @return false
+   */
+  @Override
+  protected boolean shouldMergeProject() {
+    return false;
+  }
 }