zstan commented on code in PR #5398:
URL: https://github.com/apache/ignite-3/pull/5398#discussion_r1995107122
##########
modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItJoinOrderTest.java:
##########
@@ -175,6 +176,58 @@ void test(Query query) {
checker.check();
}
+ @ParameterizedTest
+ @MethodSource("joinTypesWithRulesToDisable")
+ @SuppressWarnings("ConcatenationWithEmptyString")
+ void joinWithProjectionOnTopReturnsValidaResults(JoinType joinType,
List<String> rulesToDisable) {
+ String queryToAcquireExpectedResults = format(""
+ + "SELECT p.*, d.* "
+ + " FROM Products p "
+ + " {} JOIN Discounts d ON p.ProductID = d.ProductID"
+ + " JOIN Reviews r ON p.ProductID = r.ProductID"
+ + " WHERE r.Rating > 2", joinType
+ );
+
+ String queryToValidate = format(""
+ + "SELECT /*+ enforce_join_order, disable_rule({}) */ p.*, d.*
"
+ + " FROM Discounts d "
+ + " {} JOIN Products p ON p.ProductID = d.ProductID"
+ + " JOIN Reviews r ON p.ProductID = r.ProductID"
+ + " WHERE r.Rating > 2",
+ '\'' + String.join("', '", rulesToDisable) + '\'',
+ joinType.swap()
+ );
+
+ List<List<Object>> expectedResult = sql(queryToAcquireExpectedResults);
+
+ Assumptions.assumeFalse(expectedResult.isEmpty());
+
+ QueryChecker checker = assertQuery(queryToValidate)
+ .matches(matches(".*Project.*Join.*Join.*"));
+
+ expectedResult.forEach(row -> checker.returns(row.toArray()));
+
+ checker.check();
+ }
+
+ private static Stream<Arguments> joinTypesWithRulesToDisable() {
Review Comment:
I suppose this is second reincarnation of ItAggregatesTest#makePermutations
- if so, can we merge them ?
##########
modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItJoinOrderTest.java:
##########
@@ -175,6 +176,58 @@ void test(Query query) {
checker.check();
}
+ @ParameterizedTest
+ @MethodSource("joinTypesWithRulesToDisable")
+ @SuppressWarnings("ConcatenationWithEmptyString")
+ void joinWithProjectionOnTopReturnsValidaResults(JoinType joinType,
List<String> rulesToDisable) {
+ String queryToAcquireExpectedResults = format(""
+ + "SELECT p.*, d.* "
+ + " FROM Products p "
+ + " {} JOIN Discounts d ON p.ProductID = d.ProductID"
+ + " JOIN Reviews r ON p.ProductID = r.ProductID"
+ + " WHERE r.Rating > 2", joinType
+ );
+
+ String queryToValidate = format(""
+ + "SELECT /*+ enforce_join_order, disable_rule({}) */ p.*, d.*
"
+ + " FROM Discounts d "
+ + " {} JOIN Products p ON p.ProductID = d.ProductID"
+ + " JOIN Reviews r ON p.ProductID = r.ProductID"
+ + " WHERE r.Rating > 2",
+ '\'' + String.join("', '", rulesToDisable) + '\'',
+ joinType.swap()
+ );
+
+ List<List<Object>> expectedResult = sql(queryToAcquireExpectedResults);
+
+ Assumptions.assumeFalse(expectedResult.isEmpty());
Review Comment:
here we just skip further processing if (probably due some further errors)
expectedResult has become an empty, is it expected ?
##########
modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItJoinOrderTest.java:
##########
@@ -175,6 +176,58 @@ void test(Query query) {
checker.check();
}
+ @ParameterizedTest
+ @MethodSource("joinTypesWithRulesToDisable")
+ @SuppressWarnings("ConcatenationWithEmptyString")
+ void joinWithProjectionOnTopReturnsValidaResults(JoinType joinType,
List<String> rulesToDisable) {
Review Comment:
```suggestion
void joinWithProjectionOnTopReturnsValidResults(JoinType joinType,
List<String> rulesToDisable) {
```
--
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
