zstan commented on code in PR #5395:
URL: https://github.com/apache/ignite-3/pull/5395#discussion_r1993277118
##########
modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/rel/HashJoinNode.java:
##########
@@ -155,6 +155,25 @@ private InnerHashJoin(
super(ctx, joinInfo, outputRowFactory, nonEquiCondition);
}
+ @Override
+ protected void pushLeft(RowT row) throws Exception {
+ // Prefent fetching left if right is empty.
Review Comment:
```suggestion
// Prevent fetching left if right is empty.
```
##########
modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/rel/HashJoinNode.java:
##########
@@ -339,15 +352,32 @@ protected void rewindInternal() {
super.rewindInternal();
}
+ @Override
+ protected void pushLeft(RowT row) throws Exception {
+ // Prefent fetching left if right is empty.
Review Comment:
```suggestion
// Prevent fetching left if right is empty.
```
##########
modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/rel/CorrelatedNestedLoopJoinExecutionTest.java:
##########
@@ -0,0 +1,315 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.sql.engine.exec.rel;
+
+import static org.apache.calcite.rel.core.JoinRelType.INNER;
+import static org.apache.calcite.rel.core.JoinRelType.LEFT;
+import static
org.apache.ignite.internal.sql.engine.util.TypeUtils.rowSchemaFromRelTypes;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.Spliterator;
+import java.util.Spliterators;
+import java.util.stream.IntStream;
+import java.util.stream.StreamSupport;
+import org.apache.calcite.plan.RelOptUtil;
+import org.apache.calcite.rel.core.CorrelationId;
+import org.apache.calcite.rel.core.JoinRelType;
+import org.apache.calcite.rel.type.RelDataType;
+import org.apache.ignite.internal.sql.engine.exec.ExecutionContext;
+import org.apache.ignite.internal.sql.engine.exec.RowHandler;
+import
org.apache.ignite.internal.sql.engine.exec.exp.func.IterableTableFunction;
+import org.apache.ignite.internal.sql.engine.exec.row.RowSchema;
+import org.apache.ignite.internal.sql.engine.framework.ArrayRowHandler;
+import org.apache.ignite.internal.sql.engine.type.IgniteTypeFactory;
+import org.apache.ignite.internal.sql.engine.util.Commons;
+import org.apache.ignite.internal.sql.engine.util.TypeUtils;
+import org.apache.ignite.internal.type.NativeTypes;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
+import org.junit.jupiter.params.provider.EnumSource.Mode;
+
+/** Correlated nested loop join execution tests. */
+public class CorrelatedNestedLoopJoinExecutionTest extends
AbstractExecutionTest<Object[]> {
+
+ @ParameterizedTest
+ @EnumSource(value = JoinRelType.class, mode = Mode.INCLUDE, names =
{"INNER", "LEFT"})
+ public void testCorrelatedNestedLoopJoin(JoinRelType joinType) {
+ ExecutionContext<Object[]> ctx = executionContext(true);
+ RowHandler<Object[]> hnd = ctx.rowHandler();
+
+ ScanNode<Object[]> left = new ScanNode<>(ctx, Arrays.asList(
+ new Object[]{0, "Igor", 1},
+ new Object[]{1, "Roman", 2},
+ new Object[]{2, "Ivan", null},
+ new Object[]{3, "Alexey", 1}
+ ));
+
+ List<Object[]> deps = Arrays.asList(
+ new Object[]{1, "Core"},
+ new Object[]{2, "SQL"},
+ new Object[]{3, "QA"}
+ );
+
+ ScanNode<Object[]> right = new ScanNode<>(ctx, deps);
+
+ IgniteTypeFactory tf = ctx.getTypeFactory();
+
+ RelDataType leftType = TypeUtils.createRowType(tf,
TypeUtils.native2relationalTypes(tf,
+ NativeTypes.INT32, NativeTypes.STRING, NativeTypes.INT32));
+ RelDataType rightType = TypeUtils.createRowType(tf,
TypeUtils.native2relationalTypes(tf, NativeTypes.INT32, NativeTypes.STRING));
+ RelDataType outType = TypeUtils.combinedRowType(tf, leftType,
rightType);
+
+ RowSchema rightRowSchema =
rowSchemaFromRelTypes(RelOptUtil.getFieldTypeList(rightType));
+ RowSchema outRowSchema =
rowSchemaFromRelTypes(RelOptUtil.getFieldTypeList(outType));
+
+
+ CorrelatedNestedLoopJoinNode<Object[]> join = new
CorrelatedNestedLoopJoinNode<>(
+ ctx,
+ (r1, r2) -> Objects.equals(hnd.get(2, r1), hnd.get(0, r2)),
+ Set.of(new CorrelationId(0)),
+ joinType,
+ hnd.factory(rightRowSchema),
+ hnd.factory(outRowSchema)
+ );
+
+ join.register(Arrays.asList(left, right));
+
+ FilterNode<Object[]> filter = new FilterNode<>(ctx, r -> true);
+ filter.register(join);
+
+ RootNode<Object[]> root = new RootNode<>(ctx);
+ root.register(filter);
+
+ Object[][] result =
StreamSupport.stream(Spliterators.spliteratorUnknownSize(root,
Spliterator.ORDERED), false)
+ .toArray(Object[][]::new);
+
+ if (joinType == INNER) {
+ Object[][] expected = {
+ {0, "Igor", 1, 1, "Core"},
+ {1, "Roman", 2, 2, "SQL"},
+ {3, "Alexey", 1, 1, "Core"}
+ };
+
+ assert2DimArrayEquals(expected, result);
+ } else if (joinType == LEFT) {
+ Object[][] expected = {
+ new Object[]{0, "Igor", 1, 1, "Core"},
+ new Object[]{1, "Roman", 2, 2, "SQL"},
+ new Object[]{2, "Ivan", null, null, null},
+ new Object[]{3, "Alexey", 1, 1, "Core"}
+ };
+
+ assert2DimArrayEquals(expected, result);
+ } else {
+ throw new IllegalStateException("Unexpected join type: " +
joinType);
+ }
+ }
+
+ private static void assert2DimArrayEquals(Object[][] expected, Object[][]
actual) {
+ assertEquals(expected.length, actual.length, "expected length: " +
expected.length + ", actual length: " + actual.length);
+
+ Arrays.sort(actual, Comparator.comparing(r -> (int) r[0]));
+
+ int length = expected.length;
+ for (int i = 0; i < length; ++i) {
+ Object[] exp = expected[i];
+ Object[] act = actual[i];
+
+ assertEquals(exp.length, act.length, "expected length: " +
exp.length + ", actual length: " + act.length);
+ assertArrayEquals(exp, act);
+ }
+ }
+
+ @ParameterizedTest
+ @EnumSource(value = JoinRelType.class, mode = Mode.INCLUDE, names =
{"INNER", "LEFT"})
+ void joinWithDifferentBufferSize(JoinRelType joinType) {
+ int buffSize = 1;
+ validateJoin(executionContext(buffSize), joinType, 0, 0);
+ validateJoin(executionContext(buffSize), joinType, 0, 1);
+ validateJoin(executionContext(buffSize), joinType, 0, 10);
+ validateJoin(executionContext(buffSize), joinType, 1, 0);
+ validateJoin(executionContext(buffSize), joinType, 1, 1);
+ validateJoin(executionContext(buffSize), joinType, 1, 10);
+ validateJoin(executionContext(buffSize), joinType, 10, 0);
+ validateJoin(executionContext(buffSize), joinType, 10, 1);
+ validateJoin(executionContext(buffSize), joinType, 10, 10);
+
+ buffSize = Commons.IN_BUFFER_SIZE;
Review Comment:
we have significant small rows than IN_BUFFER_SIZE, probably we need to test
with rows equal to IN_BUFFER_SIZE ? wdyt ?
##########
modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/rel/HashJoinNode.java:
##########
@@ -604,6 +626,25 @@ private SemiHashJoin(
super(ctx, joinInfo, outputRowFactory, nonEquiCondition);
}
+ @Override
+ protected void pushLeft(RowT row) throws Exception {
+ // Prefent fetching left if right is empty.
Review Comment:
```suggestion
// Prevent fetching left if right is empty.
```
--
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
