This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new c6b35ba9b8e [cherry-pick](paimon) pick part of refactor code from
#34496 (#42221)
c6b35ba9b8e is described below
commit c6b35ba9b8eb5a88908a20d1aed4a47e97edc071
Author: Rayner Chen <[email protected]>
AuthorDate: Tue Oct 22 09:44:41 2024 +0800
[cherry-pick](paimon) pick part of refactor code from #34496 (#42221)
#34496
Co-authored-by: Tiewei Fang <[email protected]>
---
.../doris/datasource/paimon/source/PaimonScanNode.java | 16 +++-------------
.../doris/datasource/paimon/source/PaimonSource.java | 9 +++------
2 files changed, 6 insertions(+), 19 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/datasource/paimon/source/PaimonScanNode.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/paimon/source/PaimonScanNode.java
index d25fa2b94be..e0d0f9a3ea2 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/datasource/paimon/source/PaimonScanNode.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/datasource/paimon/source/PaimonScanNode.java
@@ -19,13 +19,11 @@ package org.apache.doris.datasource.paimon.source;
import org.apache.doris.analysis.TupleDescriptor;
import org.apache.doris.catalog.TableIf;
-import org.apache.doris.common.AnalysisException;
import org.apache.doris.common.DdlException;
import org.apache.doris.common.MetaNotFoundException;
import org.apache.doris.common.UserException;
import org.apache.doris.common.util.FileFormatUtils;
import org.apache.doris.common.util.LocationPath;
-import org.apache.doris.datasource.ExternalTable;
import org.apache.doris.datasource.FileQueryScanNode;
import org.apache.doris.datasource.paimon.PaimonExternalCatalog;
import org.apache.doris.datasource.paimon.PaimonExternalTable;
@@ -110,17 +108,9 @@ public class PaimonScanNode extends FileQueryScanNode {
@Override
protected void doInitialize() throws UserException {
- ExternalTable table = (ExternalTable) desc.getTable();
- if (table.isView()) {
- throw new AnalysisException(
- String.format("Querying external view '%s.%s' is not
supported", table.getDbName(),
- table.getName()));
- }
- computeColumnsFilter();
- initBackendPolicy();
- source = new PaimonSource((PaimonExternalTable) table, desc,
columnNameToRange);
+ super.doInitialize();
+ source = new PaimonSource(desc);
Preconditions.checkNotNull(source);
- initSchemaParams();
PaimonPredicateConverter paimonPredicateConverter = new
PaimonPredicateConverter(
source.getPaimonTable().rowType());
predicates = paimonPredicateConverter.convertToPaimonExpr(conjuncts);
@@ -304,7 +294,7 @@ public class PaimonScanNode extends FileQueryScanNode {
@Override
public TableIf getTargetTable() {
- return source.getTargetTable();
+ return desc.getTable();
}
@Override
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/datasource/paimon/source/PaimonSource.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/paimon/source/PaimonSource.java
index eee9e6bad08..885eba06ed9 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/datasource/paimon/source/PaimonSource.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/datasource/paimon/source/PaimonSource.java
@@ -23,23 +23,20 @@ import org.apache.doris.common.UserException;
import org.apache.doris.datasource.ExternalCatalog;
import org.apache.doris.datasource.paimon.PaimonExternalTable;
import org.apache.doris.datasource.property.constants.PaimonProperties;
-import org.apache.doris.planner.ColumnRange;
import org.apache.doris.thrift.TFileAttributes;
import org.apache.paimon.table.Table;
-import java.util.Map;
public class PaimonSource {
private final PaimonExternalTable paimonExtTable;
private final Table originTable;
private final TupleDescriptor desc;
- public PaimonSource(PaimonExternalTable table, TupleDescriptor desc,
- Map<String, ColumnRange> columnNameToRange) {
- this.paimonExtTable = table;
- this.originTable = paimonExtTable.getPaimonTable();
+ public PaimonSource(TupleDescriptor desc) {
this.desc = desc;
+ this.paimonExtTable = (PaimonExternalTable) desc.getTable();
+ this.originTable = paimonExtTable.getPaimonTable();
}
public TupleDescriptor getDesc() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
