You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by am...@apache.org on 2024/04/01 08:05:44 UTC
(ignite-3) 02/10: fix tests
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a commit to branch ignite-21580
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit c0f8daa13c99084eff950782e2b4255cd4595586
Author: amashenkov <an...@gmail.com>
AuthorDate: Wed Mar 27 17:13:55 2024 +0300
fix tests
---
.../sql/engine/planner/AggregatePlannerTest.java | 18 +++++++-----------
.../planner/ColocatedHashAggregatePlannerTest.java | 18 +++++++-----------
2 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/AggregatePlannerTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/AggregatePlannerTest.java
index 32363f8cb2..ae8bec9b37 100644
--- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/AggregatePlannerTest.java
+++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/AggregatePlannerTest.java
@@ -618,11 +618,9 @@ public class AggregatePlannerTest extends AbstractAggregatePlannerTest {
assertPlan(testCase,
isInstanceOf(IgniteColocatedHashAggregate.class)
.and(hasAggregate())
- .and(not(hasDistinctAggregate()))
- .and(input(isInstanceOf(IgniteColocatedHashAggregate.class)
- .and(hasGroups())
- .and(input(isTableScan("TEST")))
- ))
+ .and(hasDistinctAggregate())
+ .and(hasGroups())
+ .and(input(isTableScan("TEST")))
);
}
@@ -630,12 +628,10 @@ public class AggregatePlannerTest extends AbstractAggregatePlannerTest {
assertPlan(testCase,
isInstanceOf(IgniteColocatedHashAggregate.class)
.and(hasAggregate())
- .and(not(hasDistinctAggregate()))
- .and(input(isInstanceOf(IgniteColocatedHashAggregate.class)
- .and(hasGroups())
- .and(input(isInstanceOf(IgniteExchange.class)
- .and(input(isTableScan("TEST")))
- ))
+ .and(hasDistinctAggregate())
+ .and(hasGroups())
+ .and(input(isInstanceOf(IgniteExchange.class)
+ .and(input(isTableScan("TEST")))
))
);
}
diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/ColocatedHashAggregatePlannerTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/ColocatedHashAggregatePlannerTest.java
index eba053ffab..c00abb7397 100644
--- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/ColocatedHashAggregatePlannerTest.java
+++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/ColocatedHashAggregatePlannerTest.java
@@ -568,11 +568,9 @@ public class ColocatedHashAggregatePlannerTest extends AbstractAggregatePlannerT
assertPlan(testCase,
isInstanceOf(IgniteColocatedHashAggregate.class)
.and(hasAggregate())
- .and(not(hasDistinctAggregate()))
- .and(input(isInstanceOf(IgniteColocatedHashAggregate.class)
- .and(hasGroups())
- .and(input(isTableScan("TEST")))
- )),
+ .and(hasDistinctAggregate())
+ .and(hasGroups())
+ .and(input(isTableScan("TEST"))),
disableRules
);
}
@@ -581,12 +579,10 @@ public class ColocatedHashAggregatePlannerTest extends AbstractAggregatePlannerT
assertPlan(testCase,
isInstanceOf(IgniteColocatedHashAggregate.class)
.and(hasAggregate())
- .and(not(hasDistinctAggregate()))
- .and(input(isInstanceOf(IgniteColocatedHashAggregate.class)
- .and(hasGroups())
- .and(input(isInstanceOf(IgniteExchange.class)
- .and(input(isTableScan("TEST")))
- ))
+ .and(hasDistinctAggregate())
+ .and(hasGroups())
+ .and(input(isInstanceOf(IgniteExchange.class)
+ .and(input(isTableScan("TEST")))
)),
disableRules
);