morningman commented on code in PR #34422:
URL: https://github.com/apache/doris/pull/34422#discussion_r1595005248
##########
fe/fe-core/src/main/java/org/apache/doris/datasource/trinoconnector/source/TrinoConnectorScanNode.java:
##########
@@ -102,11 +112,15 @@ protected void doInitialize() throws UserException {
table.getName()));
}
- source = new TrinoConnectorSource(desc, table);
-
computeColumnsFilter();
initBackendPolicy();
+ source = new TrinoConnectorSource(desc, table);
initSchemaParams();
+
+ TrinoConnectorPredicateConverter trinoConnectorPredicateConverter =
new TrinoConnectorPredicateConverter(
+ source.getTargetTable().getColumnHandleMap(),
+ source.getTargetTable().getColumnMetadataMap());
+ constraint =
trinoConnectorPredicateConverter.convertToTrinoConstraint(conjuncts);
Review Comment:
If all conjuncts are pushed down to trino, we should clear the `conjuncts`
so that the predicate won't be executed twice.
And further more, if part of conjuncts success, we should only remove part
of them
##########
fe/fe-core/src/main/java/org/apache/doris/datasource/trinoconnector/source/TrinoConnectorPredicateConverter.java:
##########
@@ -0,0 +1,325 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.doris.datasource.trinoconnector.source;
+
+import org.apache.doris.analysis.BinaryPredicate;
+import org.apache.doris.analysis.CastExpr;
+import org.apache.doris.analysis.CompoundPredicate;
+import org.apache.doris.analysis.DateLiteral;
+import org.apache.doris.analysis.DecimalLiteral;
+import org.apache.doris.analysis.Expr;
+import org.apache.doris.analysis.InPredicate;
+import org.apache.doris.analysis.IsNullPredicate;
+import org.apache.doris.analysis.LiteralExpr;
+import org.apache.doris.analysis.SlotRef;
+import org.apache.doris.common.AnalysisException;
+import org.apache.doris.common.util.TimeUtils;
+import org.apache.doris.thrift.TExprOpcode;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
+import io.airlift.slice.Slices;
+import io.trino.spi.connector.ColumnHandle;
+import io.trino.spi.connector.ColumnMetadata;
+import io.trino.spi.connector.Constraint;
+import io.trino.spi.predicate.Domain;
+import io.trino.spi.predicate.Range;
+import io.trino.spi.predicate.TupleDomain;
+import io.trino.spi.predicate.ValueSet;
+import io.trino.spi.type.Int128;
+import io.trino.spi.type.LongTimestamp;
+import io.trino.spi.type.Type;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.TimeZone;
+
+
+public class TrinoConnectorPredicateConverter {
+ private static final Logger LOG =
LogManager.getLogger(TrinoConnectorPredicateConverter.class);
+ private final Map<String, ColumnHandle> trinoConnectorColumnHandleMap;
+
+ private final Map<String, ColumnMetadata> trinoConnectorColumnMetadataMap;
+
+ public TrinoConnectorPredicateConverter(Map<String, ColumnHandle>
columnHandleMap,
+ Map<String, ColumnMetadata> columnMetadataMap) {
+ this.trinoConnectorColumnHandleMap = columnHandleMap;
+ this.trinoConnectorColumnMetadataMap = columnMetadataMap;
+ }
+
+ public Constraint convertToTrinoConstraint(List<Expr> conjuncts) {
+ if (conjuncts.isEmpty()) {
+ return Constraint.alwaysTrue();
+ }
+ TupleDomain<ColumnHandle> summary = TupleDomain.all();
+ for (int i = 0; i < conjuncts.size(); ++i) {
+ summary =
summary.intersect(convertExprToTrinoTupleDomain(conjuncts.get(i)));
+ }
+ return new Constraint(summary);
+ }
+
+ private TupleDomain<ColumnHandle> convertExprToTrinoTupleDomain(Expr
predicate) {
+ try {
+ if (predicate instanceof CompoundPredicate) {
+ return compoundPredicateConverter((CompoundPredicate)
predicate);
+ } else if (predicate instanceof InPredicate) {
+ return inPredicateConverter((InPredicate) predicate);
+ } else if (predicate instanceof BinaryPredicate) {
+ return binaryPredicateConverter((BinaryPredicate) predicate);
+ } else if (predicate instanceof IsNullPredicate) {
+ return isNullPredicateConverter((IsNullPredicate) predicate);
+ } else {
+ return TupleDomain.all();
+ }
+ } catch (AnalysisException e) {
+ LOG.warn("Can not convert Expr to trino tuple domain, exception:
{}", e.getMessage());
+ return TupleDomain.all();
Review Comment:
This is not right.
For example: `expr1 or expr2`.
If `expr1` convert ok but `expr2` fail, the result will be `expr1 or true`,
which is wrong
##########
fe/fe-core/src/main/java/org/apache/doris/datasource/trinoconnector/source/TrinoConnectorPredicateConverter.java:
##########
@@ -0,0 +1,325 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.doris.datasource.trinoconnector.source;
+
+import org.apache.doris.analysis.BinaryPredicate;
+import org.apache.doris.analysis.CastExpr;
+import org.apache.doris.analysis.CompoundPredicate;
+import org.apache.doris.analysis.DateLiteral;
+import org.apache.doris.analysis.DecimalLiteral;
+import org.apache.doris.analysis.Expr;
+import org.apache.doris.analysis.InPredicate;
+import org.apache.doris.analysis.IsNullPredicate;
+import org.apache.doris.analysis.LiteralExpr;
+import org.apache.doris.analysis.SlotRef;
+import org.apache.doris.common.AnalysisException;
+import org.apache.doris.common.util.TimeUtils;
+import org.apache.doris.thrift.TExprOpcode;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
+import io.airlift.slice.Slices;
+import io.trino.spi.connector.ColumnHandle;
+import io.trino.spi.connector.ColumnMetadata;
+import io.trino.spi.connector.Constraint;
+import io.trino.spi.predicate.Domain;
+import io.trino.spi.predicate.Range;
+import io.trino.spi.predicate.TupleDomain;
+import io.trino.spi.predicate.ValueSet;
+import io.trino.spi.type.Int128;
+import io.trino.spi.type.LongTimestamp;
+import io.trino.spi.type.Type;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.TimeZone;
+
+
+public class TrinoConnectorPredicateConverter {
+ private static final Logger LOG =
LogManager.getLogger(TrinoConnectorPredicateConverter.class);
+ private final Map<String, ColumnHandle> trinoConnectorColumnHandleMap;
+
+ private final Map<String, ColumnMetadata> trinoConnectorColumnMetadataMap;
+
+ public TrinoConnectorPredicateConverter(Map<String, ColumnHandle>
columnHandleMap,
+ Map<String, ColumnMetadata> columnMetadataMap) {
+ this.trinoConnectorColumnHandleMap = columnHandleMap;
+ this.trinoConnectorColumnMetadataMap = columnMetadataMap;
+ }
+
+ public Constraint convertToTrinoConstraint(List<Expr> conjuncts) {
+ if (conjuncts.isEmpty()) {
+ return Constraint.alwaysTrue();
+ }
+ TupleDomain<ColumnHandle> summary = TupleDomain.all();
+ for (int i = 0; i < conjuncts.size(); ++i) {
+ summary =
summary.intersect(convertExprToTrinoTupleDomain(conjuncts.get(i)));
+ }
+ return new Constraint(summary);
+ }
+
+ private TupleDomain<ColumnHandle> convertExprToTrinoTupleDomain(Expr
predicate) {
+ try {
+ if (predicate instanceof CompoundPredicate) {
+ return compoundPredicateConverter((CompoundPredicate)
predicate);
+ } else if (predicate instanceof InPredicate) {
+ return inPredicateConverter((InPredicate) predicate);
+ } else if (predicate instanceof BinaryPredicate) {
+ return binaryPredicateConverter((BinaryPredicate) predicate);
+ } else if (predicate instanceof IsNullPredicate) {
+ return isNullPredicateConverter((IsNullPredicate) predicate);
+ } else {
+ return TupleDomain.all();
+ }
+ } catch (AnalysisException e) {
+ LOG.warn("Can not convert Expr to trino tuple domain, exception:
{}", e.getMessage());
Review Comment:
```suggestion
if (LOG.isDefaultEnable()) {
LOG.debug("Can not convert Expr to trino tuple domain,
exception: {}", e.getMessage());
}
```
##########
fe/be-java-extensions/trino-connector-scanner/src/main/java/org/apache/doris/trinoconnector/TrinoConnectorJniScanner.java:
##########
@@ -134,6 +137,14 @@ public TrinoConnectorJniScanner(int batchSize, Map<String,
String> params) {
connectorColumnMetadataString =
params.get("trino_connector_column_metadata");
connectorPredicateString = params.get("trino_connector_predicate");
connectorTrascationHandleString =
params.get("trino_connector_trascation_handle");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("TrinoConnectorJniScanner connectorSplitString = " +
connectorSplitString);
Review Comment:
Use one line log
##########
fe/fe-core/src/main/java/org/apache/doris/datasource/trinoconnector/source/TrinoConnectorScanNode.java:
##########
@@ -137,17 +151,65 @@ public List<Split> getSplits() throws UserException {
return splits;
}
+ private void applyPushDown(ConnectorSession connectorSession) {
+ // push down predicate/filter
+ Optional<ConstraintApplicationResult<ConnectorTableHandle>>
filterResult
+ = connectorMetadata.applyFilter(connectorSession,
source.getTrinoConnectorTableHandle(), constraint);
+ if (filterResult.isPresent()) {
+
source.setTrinoConnectorTableHandle(filterResult.get().getHandle());
+ }
+
+ // push down limit
+ if (hasLimit()) {
+ long limit = getLimit();
+ Optional<LimitApplicationResult<ConnectorTableHandle>> limitResult
+ = connectorMetadata.applyLimit(connectorSession,
source.getTrinoConnectorTableHandle(), limit);
+ if (limitResult.isPresent()) {
+
source.setTrinoConnectorTableHandle(limitResult.get().getHandle());
Review Comment:
Is this line overwrite the the result in L159?
--
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: commits-unsubscr...@doris.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
