This is an automated email from the ASF dual-hosted git repository.
gvvinblade pushed a commit to branch ignite-12248
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/ignite-12248 by this push:
new c33076c pending
c33076c is described below
commit c33076cef111f72582152c29cb4a1b80e5c42b32
Author: Igor Seliverstov <[email protected]>
AuthorDate: Fri Nov 8 12:25:25 2019 +0300
pending
---
.../query/calcite/prepare/DistributedExecution.java | 2 +-
.../processors/query/calcite/rel/IgniteFilter.java | 2 +-
.../processors/query/calcite/rel/IgniteProject.java | 2 +-
.../processors/query/calcite/rel/IgniteRel.java | 5 +++--
.../query/calcite/rule/IgniteFilterRule.java | 2 +-
.../query/calcite/rule/IgniteHashJoinRule.java | 6 +++---
.../query/calcite/rule/IgniteProjectRule.java | 2 +-
.../processors/query/calcite/schema/IgniteTable.java | 2 +-
.../query/calcite/trait/DistributionTraitDef.java | 2 +-
.../query/calcite/CalciteQueryProcessorTest.java | 20 ++++++++++----------
10 files changed, 23 insertions(+), 22 deletions(-)
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/DistributedExecution.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/DistributedExecution.java
index 54ac726..fdaee5a 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/DistributedExecution.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/DistributedExecution.java
@@ -86,7 +86,7 @@ public class DistributedExecution implements QueryExecution {
RelTraitSet desired = rel.getTraitSet()
.replace(relRoot.collation)
- .replace(IgniteRel.LOGICAL_CONVENTION)
+ .replace(IgniteRel.IGNITE_CONVENTION)
.replace(RelDistributions.ANY)
.simplify();
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rel/IgniteFilter.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rel/IgniteFilter.java
index ed8b52f..c1991e8 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rel/IgniteFilter.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rel/IgniteFilter.java
@@ -54,7 +54,7 @@ public final class IgniteFilter extends Filter implements
IgniteRel {
public static IgniteFilter create(Filter filter, RelNode input) {
RelTraitSet traits = filter.getTraitSet()
- .replace(IgniteRel.LOGICAL_CONVENTION)
+ .replace(IgniteRel.IGNITE_CONVENTION)
.replaceIf(DistributionTraitDef.INSTANCE, () ->
IgniteMdDistribution.filter(RelMetadataQueryEx.instance(), input,
filter.getCondition()));
return new IgniteFilter(filter.getCluster(), traits, input,
filter.getCondition(), filter.getVariablesSet());
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rel/IgniteProject.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rel/IgniteProject.java
index 79408cd..1f3eaf2 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rel/IgniteProject.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rel/IgniteProject.java
@@ -44,7 +44,7 @@ public final class IgniteProject extends Project implements
IgniteRel {
public static IgniteProject create(Project project, RelNode input) {
RelTraitSet traits = project.getTraitSet()
- .replace(IgniteRel.LOGICAL_CONVENTION)
+ .replace(IgniteRel.IGNITE_CONVENTION)
.replaceIf(DistributionTraitDef.INSTANCE, () ->
IgniteMdDistribution.project(RelMetadataQueryEx.instance(), input,
project.getProjects()));
return new IgniteProject(project.getCluster(), traits, input,
project.getProjects(), project.getRowType());
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rel/IgniteRel.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rel/IgniteRel.java
index 9a761ad..d444f4b 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rel/IgniteRel.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rel/IgniteRel.java
@@ -25,10 +25,11 @@ import org.apache.calcite.rel.RelNode;
*
*/
public interface IgniteRel extends RelNode {
- Convention LOGICAL_CONVENTION = new Convention.Impl("IGNITE_LOGICAL",
IgniteRel.class) {
+ Convention IGNITE_CONVENTION = new Convention.Impl("IGNITE_LOGICAL",
IgniteRel.class) {
/** */
@Override public boolean
useAbstractConvertersForConversion(RelTraitSet fromTraits, RelTraitSet
toTraits) {
- return true; // Enables trait definition conversion
+ return fromTraits.containsIfApplicable(IGNITE_CONVENTION)
+ && toTraits.containsIfApplicable(IGNITE_CONVENTION); //
Enables trait definition conversion
}
};
}
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rule/IgniteFilterRule.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rule/IgniteFilterRule.java
index 6f8357e..9a7606c 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rule/IgniteFilterRule.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rule/IgniteFilterRule.java
@@ -42,7 +42,7 @@ public class IgniteFilterRule extends RelOptRule {
LogicalFilter filter = call.rel(0);
RelNode input = filter.getInput();
- final RelTraitSet traitSet =
input.getTraitSet().replace(IgniteRel.LOGICAL_CONVENTION);
+ final RelTraitSet traitSet =
input.getTraitSet().replace(IgniteRel.IGNITE_CONVENTION);
RelNode converted = convert(input, traitSet);
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rule/IgniteHashJoinRule.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rule/IgniteHashJoinRule.java
index 6f041f0..cc17c24 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rule/IgniteHashJoinRule.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rule/IgniteHashJoinRule.java
@@ -45,11 +45,11 @@ public class IgniteHashJoinRule extends RelOptRule {
LogicalJoin join = call.rel(0);
RelTraitSet leftTraits = join.getLeft().getTraitSet()
- .replace(IgniteRel.LOGICAL_CONVENTION)
+ .replace(IgniteRel.IGNITE_CONVENTION)
.replace(IgniteDistributions.hash(join.analyzeCondition().leftKeys,
IgniteDistributions.noOpFunction()));
RelTraitSet rightTraits = join.getRight().getTraitSet()
- .replace(IgniteRel.LOGICAL_CONVENTION)
+ .replace(IgniteRel.IGNITE_CONVENTION)
.replace(IgniteDistributions.hash(join.analyzeCondition().rightKeys,
IgniteDistributions.noOpFunction()));
RelNode left = convert(join.getLeft(), leftTraits);
@@ -58,7 +58,7 @@ public class IgniteHashJoinRule extends RelOptRule {
RelMetadataQuery mq = call.getMetadataQuery();
RelTraitSet traitSet = join.getTraitSet()
- .replace(IgniteRel.LOGICAL_CONVENTION)
+ .replace(IgniteRel.IGNITE_CONVENTION)
.replaceIf(DistributionTraitDef.INSTANCE, () ->
IgniteMdDistribution.join(mq, left, right, join.getCondition()));
call.transformTo(new IgniteHashJoin(join.getCluster(), traitSet, left,
right,
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rule/IgniteProjectRule.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rule/IgniteProjectRule.java
index 8e38268..0ea3a40 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rule/IgniteProjectRule.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rule/IgniteProjectRule.java
@@ -42,7 +42,7 @@ public class IgniteProjectRule extends RelOptRule {
LogicalProject project = call.rel(0);
RelNode input = project.getInput();
- final RelTraitSet traitSet =
input.getTraitSet().replace(IgniteRel.LOGICAL_CONVENTION);
+ final RelTraitSet traitSet =
input.getTraitSet().replace(IgniteRel.IGNITE_CONVENTION);
RelNode converted = convert(input, traitSet);
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/schema/IgniteTable.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/schema/IgniteTable.java
index b5940b0..f0d1a2a 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/schema/IgniteTable.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/schema/IgniteTable.java
@@ -71,7 +71,7 @@ public class IgniteTable extends AbstractTable implements
TranslatableTable {
/** {@inheritDoc} */
@Override public RelNode toRel(RelOptTable.ToRelContext context,
RelOptTable relOptTable) {
RelOptCluster cluster = context.getCluster();
- RelTraitSet traitSet =
cluster.traitSet().replace(IgniteRel.LOGICAL_CONVENTION)
+ RelTraitSet traitSet =
cluster.traitSet().replace(IgniteRel.IGNITE_CONVENTION)
.replaceIf(DistributionTraitDef.INSTANCE, () ->
distributionTrait(cluster.getPlanner().getContext()));
return new IgniteTableScan(cluster, traitSet, relOptTable);
}
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/trait/DistributionTraitDef.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/trait/DistributionTraitDef.java
index 76ff0fa..22e8815 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/trait/DistributionTraitDef.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/trait/DistributionTraitDef.java
@@ -44,7 +44,7 @@ public class DistributionTraitDef extends
RelTraitDef<DistributionTrait> {
if (srcDist.equals(targetDist))
return rel;
- if (rel.getConvention() != IgniteRel.LOGICAL_CONVENTION)
+ if (rel.getConvention() != IgniteRel.IGNITE_CONVENTION)
return null;
switch(targetDist.type()){
diff --git
a/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/CalciteQueryProcessorTest.java
b/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/CalciteQueryProcessorTest.java
index 3138c6c..e6dc5c7 100644
---
a/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/CalciteQueryProcessorTest.java
+++
b/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/CalciteQueryProcessorTest.java
@@ -250,7 +250,7 @@ public class CalciteQueryProcessorTest extends
GridCommonAbstractTest {
// Transformation chain
RelTraitSet desired = rel.getCluster().traitSet()
- .replace(IgniteRel.LOGICAL_CONVENTION)
+ .replace(IgniteRel.IGNITE_CONVENTION)
.replace(IgniteDistributions.single())
.simplify();
@@ -302,7 +302,7 @@ public class CalciteQueryProcessorTest extends
GridCommonAbstractTest {
// Transformation chain
RelTraitSet desired = rel.getCluster().traitSet()
- .replace(IgniteRel.LOGICAL_CONVENTION)
+ .replace(IgniteRel.IGNITE_CONVENTION)
.replace(IgniteDistributions.single())
.simplify();
@@ -355,7 +355,7 @@ public class CalciteQueryProcessorTest extends
GridCommonAbstractTest {
rel = planner.transform(PlannerType.HEP,
PlannerPhase.SUBQUERY_REWRITE, rel, rel.getTraitSet());
RelTraitSet desired = rel.getCluster().traitSet()
- .replace(IgniteRel.LOGICAL_CONVENTION)
+ .replace(IgniteRel.IGNITE_CONVENTION)
.replace(IgniteDistributions.single())
.simplify();
@@ -417,7 +417,7 @@ public class CalciteQueryProcessorTest extends
GridCommonAbstractTest {
rel = planner.transform(PlannerType.HEP,
PlannerPhase.SUBQUERY_REWRITE, rel, rel.getTraitSet());
RelTraitSet desired = rel.getCluster().traitSet()
- .replace(IgniteRel.LOGICAL_CONVENTION)
+ .replace(IgniteRel.IGNITE_CONVENTION)
.replace(IgniteDistributions.single())
.simplify();
@@ -498,7 +498,7 @@ public class CalciteQueryProcessorTest extends
GridCommonAbstractTest {
rel = planner.transform(PlannerType.HEP,
PlannerPhase.SUBQUERY_REWRITE, rel, rel.getTraitSet());
RelTraitSet desired = rel.getCluster().traitSet()
- .replace(IgniteRel.LOGICAL_CONVENTION)
+ .replace(IgniteRel.IGNITE_CONVENTION)
.replace(IgniteDistributions.single())
.simplify();
@@ -587,7 +587,7 @@ public class CalciteQueryProcessorTest extends
GridCommonAbstractTest {
rel = planner.transform(PlannerType.HEP,
PlannerPhase.SUBQUERY_REWRITE, rel, rel.getTraitSet());
RelTraitSet desired = rel.getCluster().traitSet()
- .replace(IgniteRel.LOGICAL_CONVENTION)
+ .replace(IgniteRel.IGNITE_CONVENTION)
.replace(IgniteDistributions.single())
.simplify();
@@ -651,7 +651,7 @@ public class CalciteQueryProcessorTest extends
GridCommonAbstractTest {
rel = planner.transform(PlannerType.HEP,
PlannerPhase.SUBQUERY_REWRITE, rel, rel.getTraitSet());
RelTraitSet desired = rel.getCluster().traitSet()
- .replace(IgniteRel.LOGICAL_CONVENTION)
+ .replace(IgniteRel.IGNITE_CONVENTION)
.replace(IgniteDistributions.single())
.simplify();
@@ -715,7 +715,7 @@ public class CalciteQueryProcessorTest extends
GridCommonAbstractTest {
rel = planner.transform(PlannerType.HEP,
PlannerPhase.SUBQUERY_REWRITE, rel, rel.getTraitSet());
RelTraitSet desired = rel.getCluster().traitSet()
- .replace(IgniteRel.LOGICAL_CONVENTION)
+ .replace(IgniteRel.IGNITE_CONVENTION)
.replace(IgniteDistributions.single())
.simplify();
@@ -805,7 +805,7 @@ public class CalciteQueryProcessorTest extends
GridCommonAbstractTest {
rel = planner.transform(PlannerType.HEP,
PlannerPhase.SUBQUERY_REWRITE, rel, rel.getTraitSet());
RelTraitSet desired = rel.getCluster().traitSet()
- .replace(IgniteRel.LOGICAL_CONVENTION)
+ .replace(IgniteRel.IGNITE_CONVENTION)
.replace(IgniteDistributions.single())
.simplify();
@@ -894,7 +894,7 @@ public class CalciteQueryProcessorTest extends
GridCommonAbstractTest {
rel = planner.transform(PlannerType.HEP,
PlannerPhase.SUBQUERY_REWRITE, rel, rel.getTraitSet());
RelTraitSet desired = rel.getCluster().traitSet()
- .replace(IgniteRel.LOGICAL_CONVENTION)
+ .replace(IgniteRel.IGNITE_CONVENTION)
.replace(IgniteDistributions.single())
.simplify();
