This is an automated email from the ASF dual-hosted git repository.
morrysnow pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new fcc8cd6d960 [fix](Nereids) forbid two TVF in one fragment since the
limit of coordinator (#28114) (#28569)
fcc8cd6d960 is described below
commit fcc8cd6d960a780ec722fe566b78fe808c7e0ddd
Author: morrySnow <101034200+morrys...@users.noreply.github.com>
AuthorDate: Thu Dec 21 12:24:11 2023 +0800
[fix](Nereids) forbid two TVF in one fragment since the limit of
coordinator (#28114) (#28569)
pick from master
PR #28114
commit 65fc2e043871c426f5efe60d44ed528e2b5aeff3
---
.../nereids/trees/expressions/functions/table/Numbers.java | 11 -----------
.../expressions/functions/table/TableValuedFunction.java | 2 +-
regression-test/suites/nereids_function_p0/tvf/tvf.groovy | 4 ++++
3 files changed, 5 insertions(+), 12 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/table/Numbers.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/table/Numbers.java
index c5febcf9749..9b24fcfd623 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/table/Numbers.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/table/Numbers.java
@@ -22,7 +22,6 @@ import org.apache.doris.catalog.FunctionSignature;
import org.apache.doris.catalog.Type;
import org.apache.doris.common.NereidsException;
import org.apache.doris.nereids.exceptions.AnalysisException;
-import org.apache.doris.nereids.properties.PhysicalProperties;
import org.apache.doris.nereids.trees.expressions.Expression;
import org.apache.doris.nereids.trees.expressions.Properties;
import org.apache.doris.nereids.trees.expressions.Slot;
@@ -88,16 +87,6 @@ public class Numbers extends TableValuedFunction {
return visitor.visitNumbers(this, context);
}
- @Override
- public PhysicalProperties getPhysicalProperties() {
- // TODO: use gather after coordinator support plan gather scan
- // String backendNum =
getTVFProperties().getMap().getOrDefault(NumbersTableValuedFunction.BACKEND_NUM,
"1");
- // if (backendNum.trim().equals("1")) {
- // return PhysicalProperties.GATHER;
- // }
- return PhysicalProperties.ANY;
- }
-
@Override
public Numbers withChildren(List<Expression> children) {
Preconditions.checkArgument(children().size() == 1
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/table/TableValuedFunction.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/table/TableValuedFunction.java
index 5acc73eb75a..c0969362ed6 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/table/TableValuedFunction.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/table/TableValuedFunction.java
@@ -109,7 +109,7 @@ public abstract class TableValuedFunction extends
BoundFunction implements Unary
}
public PhysicalProperties getPhysicalProperties() {
- return PhysicalProperties.ANY;
+ return PhysicalProperties.STORAGE_ANY;
}
@Override
diff --git a/regression-test/suites/nereids_function_p0/tvf/tvf.groovy
b/regression-test/suites/nereids_function_p0/tvf/tvf.groovy
index 488decd32c2..9fd4a2538ce 100644
--- a/regression-test/suites/nereids_function_p0/tvf/tvf.groovy
+++ b/regression-test/suites/nereids_function_p0/tvf/tvf.groovy
@@ -28,4 +28,8 @@ suite("nereids_tvf") {
sql """
select * from numbers("number"="10") a right join
numbers("number"="10") b on true;
"""
+
+ sql """
+ select * from numbers("number" = "1") union all select * from
numbers("number" = "1");
+ """
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
