diff options
| author | Volodymyr Vysotskyi <vvovyk@gmail.com> | 2017-12-13 14:53:47 +0200 |
|---|---|---|
| committer | Volodymyr Vysotskyi <vvovyk@gmail.com> | 2018-01-16 12:10:13 +0200 |
| commit | 688e043b4546884d82422b266b419817d645acfc (patch) | |
| tree | a662ec009c394daaf2f93514ef1b8bcea38d227e /contrib/storage-jdbc/src | |
| parent | d59f0cda481d98a15d11ecbfb1463db53c954dfb (diff) | |
DRILL-3993: Move Drill-specific commits 'CALCITE-628' and 'Drill-specific change: Add back AbstractConverter in RelSet.java' from Calcite into DRILL
Diffstat (limited to 'contrib/storage-jdbc/src')
2 files changed, 3 insertions, 3 deletions
diff --git a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/DrillJdbcRuleBase.java b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/DrillJdbcRuleBase.java index 963e80a9f..9d29a228a 100644 --- a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/DrillJdbcRuleBase.java +++ b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/DrillJdbcRuleBase.java @@ -65,7 +65,7 @@ abstract class DrillJdbcRuleBase extends ConverterRule { public RelNode convert(RelNode rel) { LogicalProject project = (LogicalProject) rel; return new JdbcRules.JdbcProject(rel.getCluster(), rel.getTraitSet().replace(this.out), convert( - project.getInput(), project.getInput().getTraitSet().replace(this.out)), project.getProjects(), + project.getInput(), project.getInput().getTraitSet().replace(this.out).simplify()), project.getProjects(), project.getRowType()); } @@ -97,7 +97,7 @@ abstract class DrillJdbcRuleBase extends ConverterRule { LogicalFilter filter = (LogicalFilter) rel; return new JdbcRules.JdbcFilter(rel.getCluster(), rel.getTraitSet().replace(this.out), convert(filter.getInput(), - filter.getInput().getTraitSet().replace(this.out)), filter.getCondition()); + filter.getInput().getTraitSet().replace(this.out).simplify()), filter.getCondition()); } @Override diff --git a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcStoragePlugin.java b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcStoragePlugin.java index 4b41696fd..47f0f21ce 100755 --- a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcStoragePlugin.java +++ b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcStoragePlugin.java @@ -230,7 +230,7 @@ public class JdbcStoragePlugin extends AbstractStoragePlugin { @Override public RelNode convert(RelNode in) { return new JdbcDrel(in.getCluster(), in.getTraitSet().replace(DrillRel.DRILL_LOGICAL), - convert(in, in.getTraitSet().replace(this.getInTrait()))); + convert(in, in.getTraitSet().replace(this.getInTrait()).simplify())); } } |