morrySnow commented on code in PR #21998:
URL: https://github.com/apache/doris/pull/21998#discussion_r1270237420
##########
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/logical/LogicalJdbcScan.java:
##########
@@ -22,34 +22,42 @@
import org.apache.doris.catalog.external.ExternalTable;
import org.apache.doris.nereids.memo.GroupExpression;
import org.apache.doris.nereids.properties.LogicalProperties;
+import org.apache.doris.nereids.trees.expressions.Expression;
import org.apache.doris.nereids.trees.plans.Plan;
import org.apache.doris.nereids.trees.plans.PlanType;
import org.apache.doris.nereids.trees.plans.RelationId;
import org.apache.doris.nereids.trees.plans.visitor.PlanVisitor;
import org.apache.doris.nereids.util.Utils;
import com.google.common.base.Preconditions;
+import com.google.common.collect.Sets;
import java.util.List;
+import java.util.Objects;
import java.util.Optional;
+import java.util.Set;
/**
* Logical scan for external jdbc catalog and jdbc table.
*/
public class LogicalJdbcScan extends LogicalCatalogRelation {
+ private final Set<Expression> conjuncts;
+
/**
* Constructor for LogicalJdbcScan.
*/
public LogicalJdbcScan(RelationId id, TableIf table, List<String>
qualifier,
Optional<GroupExpression> groupExpression,
- Optional<LogicalProperties> logicalProperties) {
+ Optional<LogicalProperties> logicalProperties,
+ Set<Expression> conjuncts) {
super(id, PlanType.LOGICAL_JDBC_SCAN, table, qualifier,
groupExpression, logicalProperties);
+ this.conjuncts = conjuncts;
}
public LogicalJdbcScan(RelationId id, TableIf table, List<String>
qualifier) {
- this(id, table, qualifier, Optional.empty(), Optional.empty());
+ this(id, table, qualifier, Optional.empty(), Optional.empty(),
Sets.newHashSet());
Review Comment:
```suggestion
this(id, table, qualifier, Optional.empty(), Optional.empty(),
ImmutableSet.of());
```
##########
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/logical/LogicalJdbcScan.java:
##########
@@ -22,34 +22,42 @@
import org.apache.doris.catalog.external.ExternalTable;
import org.apache.doris.nereids.memo.GroupExpression;
import org.apache.doris.nereids.properties.LogicalProperties;
+import org.apache.doris.nereids.trees.expressions.Expression;
import org.apache.doris.nereids.trees.plans.Plan;
import org.apache.doris.nereids.trees.plans.PlanType;
import org.apache.doris.nereids.trees.plans.RelationId;
import org.apache.doris.nereids.trees.plans.visitor.PlanVisitor;
import org.apache.doris.nereids.util.Utils;
import com.google.common.base.Preconditions;
+import com.google.common.collect.Sets;
import java.util.List;
+import java.util.Objects;
import java.util.Optional;
+import java.util.Set;
/**
* Logical scan for external jdbc catalog and jdbc table.
*/
public class LogicalJdbcScan extends LogicalCatalogRelation {
+ private final Set<Expression> conjuncts;
+
/**
* Constructor for LogicalJdbcScan.
*/
public LogicalJdbcScan(RelationId id, TableIf table, List<String>
qualifier,
Optional<GroupExpression> groupExpression,
- Optional<LogicalProperties> logicalProperties) {
+ Optional<LogicalProperties> logicalProperties,
+ Set<Expression> conjuncts) {
super(id, PlanType.LOGICAL_JDBC_SCAN, table, qualifier,
groupExpression, logicalProperties);
+ this.conjuncts = conjuncts;
Review Comment:
```suggestion
this.conjuncts =
ImmutableSet.copyOf(Objects.requireNonNull(conjuncts, "conjuncts should not be
null"));
```
##########
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/physical/PhysicalJdbcScan.java:
##########
@@ -30,28 +31,34 @@
import java.util.List;
import java.util.Optional;
+import java.util.Set;
/**
* Physical jdbc scan for external catalog.
*/
public class PhysicalJdbcScan extends PhysicalCatalogRelation {
+ private final Set<Expression> conjuncts;
+
/**
* Constructor for PhysicalJdbcScan.
*/
public PhysicalJdbcScan(RelationId id, TableIf table, List<String>
qualifier,
- Optional<GroupExpression> groupExpression, LogicalProperties
logicalProperties) {
+ Optional<GroupExpression> groupExpression, LogicalProperties
logicalProperties, Set<Expression> conjuncts) {
super(id, PlanType.PHYSICAL_JDBC_SCAN, table, qualifier,
groupExpression, logicalProperties);
+ this.conjuncts = conjuncts;
Review Comment:
```suggestion
this.conjuncts =
ImmutableSet.copyOf(Objects.requireNonNull(conjuncts, "conjuncts should not be
null"));;
```
##########
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/physical/PhysicalJdbcScan.java:
##########
@@ -30,28 +31,34 @@
import java.util.List;
import java.util.Optional;
+import java.util.Set;
/**
* Physical jdbc scan for external catalog.
*/
public class PhysicalJdbcScan extends PhysicalCatalogRelation {
+ private final Set<Expression> conjuncts;
+
/**
* Constructor for PhysicalJdbcScan.
*/
public PhysicalJdbcScan(RelationId id, TableIf table, List<String>
qualifier,
- Optional<GroupExpression> groupExpression, LogicalProperties
logicalProperties) {
+ Optional<GroupExpression> groupExpression, LogicalProperties
logicalProperties, Set<Expression> conjuncts) {
super(id, PlanType.PHYSICAL_JDBC_SCAN, table, qualifier,
groupExpression, logicalProperties);
+ this.conjuncts = conjuncts;
}
/**
* Constructor for PhysicalJdbcScan.
*/
public PhysicalJdbcScan(RelationId id, TableIf table, List<String>
qualifier,
Optional<GroupExpression> groupExpression,
- LogicalProperties logicalProperties, PhysicalProperties
physicalProperties, Statistics statistics) {
+ LogicalProperties logicalProperties, PhysicalProperties
physicalProperties, Statistics statistics,
+ Set<Expression> conjuncts) {
super(id, PlanType.PHYSICAL_JDBC_SCAN, table, qualifier,
groupExpression,
logicalProperties, physicalProperties, statistics);
+ this.conjuncts = conjuncts;
Review Comment:
this.conjuncts = ImmutableSet.copyOf(Objects.requireNonNull(conjuncts,
"conjuncts should not be null"));
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
