[CALCITE-4275] EnumerableMergeJoin#create does not set EnumerableConv…

…ention in the trait set
QAQ-Jun · Sep 24, 2020 · 8ca4d86 · 8ca4d86
1 parent a8be094
commit 8ca4d86
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableMergeJoin.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableMergeJoin.java
@@ -72,6 +72,7 @@ protected EnumerableMergeJoin(
       Set<CorrelationId> variablesSet,
       JoinRelType joinType) {
     super(cluster, traits, ImmutableList.of(), left, right, condition, variablesSet, joinType);
+    assert getConvention() instanceof EnumerableConvention;
     final List<RelCollation> leftCollations =
         left.getTraitSet().getTraits(RelCollationTraitDef.INSTANCE);
     final List<RelCollation> rightCollations =
@@ -362,7 +363,7 @@ public static EnumerableMergeJoin create(RelNode left, RelNode right,
       RexNode condition, ImmutableIntList leftKeys,
       ImmutableIntList rightKeys, JoinRelType joinType) {
     final RelOptCluster cluster = right.getCluster();
-    RelTraitSet traitSet = cluster.traitSet();
+    RelTraitSet traitSet = cluster.traitSetOf(EnumerableConvention.INSTANCE);
     if (traitSet.isEnabled(RelCollationTraitDef.INSTANCE)) {
       final RelMetadataQuery mq = cluster.getMetadataQuery();
       final List<RelCollation> collations =