alex-plekhanov commented on code in PR #11935:
URL: https://github.com/apache/ignite/pull/11935#discussion_r2016410984
##########
modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/PlannerHelper.java:
##########
@@ -490,32 +523,86 @@ private boolean modifyNodeInsertsData() {
}
/**
- * @return Found dodes of type {@code nodeType} in the tree. Empty list if
no match found. Single value list if a node
- * found and {@code stopOnFirst} is {@code true}.
+ * Finds join-related nodes in a rel tree. Estimates leaf nodes number. If
meets a {@link LogicalCorrelate},
+ * analyses only the left shoulder. For the right shoulder a new finder is
created. The maximum of current leafs count
+ * and found by the another finder is the result.
*/
- public static <T extends RelNode> List<T> findNodes(RelNode root, Class<T>
nodeType, boolean stopOnFirst) {
- List<T> rels = new ArrayList<>();
+ private static final class JoinsFinder extends RelHomogeneousShuttle {
+ /** */
+ private List<RelNode> rels;
- try {
- RelShuttle visitor = new RelHomogeneousShuttle() {
- @Override public RelNode visit(RelNode node) {
- if (nodeType.isAssignableFrom(node.getClass())) {
- rels.add((T)node);
+ /** */
+ private int srcCnt;
- if (stopOnFirst)
- throw Util.FoundOne.NULL;
- }
+ /** */
+ private int correlateRightSrcCnt;
- return super.visit(node);
+ /** */
+ private boolean findMultyJoin;
Review Comment:
findMultyJoin -> findMultiJoin
##########
modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/planner/JoinCommutePlannerTest.java:
##########
@@ -62,6 +67,19 @@ public class JoinCommutePlannerTest extends
AbstractPlannerTest {
}
);
+ publicSchema.addTable(
Review Comment:
Let's rewrite schema and tables creation to `createSchema(createTable(...))`
##########
modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rule/logical/IgniteMultiJoinOptimizeRule.java:
##########
@@ -332,13 +324,12 @@ private static Vertex createJoin(
edges.forEach(e -> conditions.add(e.condition));
- double leftSize = metadataQry.getRowCount(lhs.rel);
- double rightSize = metadataQry.getRowCount(rhs.rel);
-
Vertex majorFactor;
Vertex minorFactor;
- // Right side will probably be materialized. Let's put bigger input on
left side.
Review Comment:
Why comment was removed? We should leave a clue, why this decision was made.
##########
modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/planner/JoinCommutePlannerTest.java:
##########
@@ -76,9 +94,24 @@ public class JoinCommutePlannerTest extends
AbstractPlannerTest {
);
}
+ /** */
+ @Override protected void afterTest() throws Exception {
+ super.afterTest();
+
+ lsnrLog.clearListeners();
+
+ ((GridTestLog4jLogger)log).setLevel(Level.INFO);
+ }
+
/** */
@Test
public void testOuterCommute() throws Exception {
+ LogListener lsnr = LogListener.matches("Joins order optimization
took").times(0).build();
Review Comment:
Maybe it's better to rely on events, like in checkJoinCommutes than on
logger?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@ignite.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
