[CALCITE-4057] Implement trait propagation for EnumerableBatchNestedL… #2023
Conversation
| @@ -483,7 +476,6 @@ | |||
|
|
|||
| Query.create(sql) | |||
| .removeRule(EnumerableRules.ENUMERABLE_MERGE_JOIN_RULE) | |||
| .removeRule(EnumerableRules.ENUMERABLE_BATCH_NESTED_LOOP_JOIN_RULE) | |||
There was a problem hiding this comment.
My bad. This rule is not added by default.
| @@ -693,6 +678,37 @@ | |||
| .removeRule(EnumerableRules.ENUMERABLE_JOIN_RULE) | |||
| .check(); | |||
| } | |||
|
|
|||
| // push sort to left input | |||
| @Test void testBatchNestedLoopJoinLeftOuterJoinPushDownSort() { | |||
There was a problem hiding this comment.
Not adding too many tests for EnumerableBatchNestedLoopJoin because it reuses EnumerableNestedLoopJoin's code and those code was tested.
Add two test only to verify that trait propagation in EnumerableBatchNestedLoopJoin is working.
| assert childId == 0; | ||
|
|
||
| RelCollation collation = childTraits.getCollation(); | ||
| if (collation == null || collation == RelCollations.EMPTY) { |
There was a problem hiding this comment.
Add check
|| joinType == JoinRelType.FULL
|| joinType == JoinRelType.RIGHT
| // Push sort both to left and right inputs does not help right outer join. It's because in | ||
| // implementation, EnumerableNestedLoopJoin produces (null, right_unmatched) all together, | ||
| // which does not preserve ordering from right side. | ||
| static Pair<RelTraitSet, List<RelTraitSet>> passThroughTraitsForNestedLoopJoin( |
There was a problem hiding this comment.
HashJoin and Correlate can reuse it too.
There was a problem hiding this comment.
Nice catch. Will migrate them too to this PR.
There was a problem hiding this comment.
The class name is misleading. Should be EnumerableTraitUtil, Enum is a different thing.
There was a problem hiding this comment.
Pushed a commit to make HashJoin and Correlate reuse the code. Also rename this class to EnumerableTraitUtils
amaliujia
force-pushed
the
rw-EnumerableBatchNestedLoopJoin
branch
2 times, most recently
from
87fcf30
to
a69d4a9
Compare
| @@ -148,4 +149,53 @@ private static boolean isCollationOnTrivialExpr( | |||
| return null; | |||
| } | |||
| } | |||
|
|
|||
| // This function can be reused when a Join's traits pass-down shall only | |||
There was a problem hiding this comment.
minor detail: I think it would be better to use javadoc comment here (instead of line comment). Same for deriveTraitsForJoin.
There was a problem hiding this comment.
Updated to javadoc. Thanks for you suggestion!
|
LGTM |
…oopJoin. (Rui Wang)
amaliujia
force-pushed
the
rw-EnumerableBatchNestedLoopJoin
branch
from
b014563
to
53d4a5d
Compare
…oopJoin (Rui Wang).