You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by am...@apache.org on 2018/01/18 23:17:38 UTC
[14/18] drill git commit: DRILL-3993: Resolve conflicts
DRILL-3993: Resolve conflicts
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/3f0e517f
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/3f0e517f
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/3f0e517f
Branch: refs/heads/master
Commit: 3f0e517fb62a1ebad92fb473e787d343152920d6
Parents: 90b5e63
Author: Volodymyr Vysotskyi <vv...@gmail.com>
Authored: Tue Jan 9 12:44:12 2018 +0200
Committer: Volodymyr Vysotskyi <vv...@gmail.com>
Committed: Tue Jan 16 12:10:13 2018 +0200
----------------------------------------------------------------------
.../org/apache/drill/exec/planner/physical/SubsetTransformer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/3f0e517f/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/SubsetTransformer.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/SubsetTransformer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/SubsetTransformer.java
index 3562d5c..a871c3a 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/SubsetTransformer.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/SubsetTransformer.java
@@ -70,7 +70,7 @@ public abstract class SubsetTransformer<T extends RelNode, E extends Exception>
//2, convert the candidateSet to targeted taitSets
for (RelTraitSet traitSet: traitSets) {
- RelNode newRel = RelOptRule.convert(candidateSet, traitSet);
+ RelNode newRel = RelOptRule.convert(candidateSet, traitSet.simplify());
if(transformedRels.contains(newRel)) {
continue;
}