You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by al...@apache.org on 2021/11/26 09:54:00 UTC
[ignite] branch sql-calcite updated: IGNITE-15980 Fix flaky SetOpPlannerTest.testSetOpRandom - Fixes #9591.
This is an automated email from the ASF dual-hosted git repository.
alexpl pushed a commit to branch sql-calcite
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/sql-calcite by this push:
new bc1b3d0 IGNITE-15980 Fix flaky SetOpPlannerTest.testSetOpRandom - Fixes #9591.
bc1b3d0 is described below
commit bc1b3d0f5fe84a8fc5c1d87705eccdc891e6456e
Author: Aleksey Plekhanov <pl...@gmail.com>
AuthorDate: Fri Nov 26 12:51:15 2021 +0300
IGNITE-15980 Fix flaky SetOpPlannerTest.testSetOpRandom - Fixes #9591.
Signed-off-by: Aleksey Plekhanov <pl...@gmail.com>
---
.../query/calcite/metadata/IgniteMdRowCount.java | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/IgniteMdRowCount.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/IgniteMdRowCount.java
index 75c7ae2..dd96b7e 100644
--- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/IgniteMdRowCount.java
+++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/IgniteMdRowCount.java
@@ -17,9 +17,11 @@
package org.apache.ignite.internal.processors.query.calcite.metadata;
+import org.apache.calcite.rel.core.Intersect;
import org.apache.calcite.rel.core.Join;
import org.apache.calcite.rel.core.JoinInfo;
import org.apache.calcite.rel.core.JoinRelType;
+import org.apache.calcite.rel.core.Minus;
import org.apache.calcite.rel.metadata.ReflectiveRelMetadataProvider;
import org.apache.calcite.rel.metadata.RelMdRowCount;
import org.apache.calcite.rel.metadata.RelMdUtil;
@@ -33,7 +35,6 @@ import org.apache.calcite.util.Util;
import org.apache.ignite.internal.processors.query.calcite.rel.IgniteAggregate;
import org.apache.ignite.internal.processors.query.calcite.rel.IgniteLimit;
import org.apache.ignite.internal.processors.query.calcite.rel.IgniteSortedIndexSpool;
-import org.apache.ignite.internal.processors.query.calcite.rel.set.IgniteSetOp;
import org.apache.ignite.internal.util.typedef.F;
import org.jetbrains.annotations.Nullable;
@@ -119,10 +120,13 @@ public class IgniteMdRowCount extends RelMdRowCount {
return rel.estimateRowCount(mq);
}
- /**
- * Estimation of row count for set op (MINUS, INTERSECT).
- */
- public double getRowCount(IgniteSetOp rel, RelMetadataQuery mq) {
+ /** {@inheritDoc} */
+ @Override public Double getRowCount(Intersect rel, RelMetadataQuery mq) {
+ return rel.estimateRowCount(mq);
+ }
+
+ /** {@inheritDoc} */
+ @Override public Double getRowCount(Minus rel, RelMetadataQuery mq) {
return rel.estimateRowCount(mq);
}