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 59c8dce69b [fix](nereids) avoid throw analysis ex for unsupported type
to make ext table goes nereids (#24099)
59c8dce69b is described below
commit 59c8dce69ba46a9c317f856ebf183850eb690b9b
Author: xzj7019 <131111794+xzj7...@users.noreply.github.com>
AuthorDate: Fri Sep 8 16:13:50 2023 +0800
[fix](nereids) avoid throw analysis ex for unsupported type to make ext
table goes nereids (#24099)
cherry-pick from master
PR: #24089
commit-id: d8bdd6c137c18facd063c7cc1a63e164815f7e34
avoid throw analysis ex for unsupported type to make ext table goes nereids.
this will improve the nereids' availability for external table if
unsupported type is in the basic table schema but not referenced in the real
sql.
Consider the following case:
select pu.pk_ct_pu as id
from fms_rd_nc65_zb.NC65P.CT_PU pu
left join fms_rd_nc65_zb.NC65P.PUB_WF_INSTANCE pwi
on pu.pk_ct_pu = pwi.billid
and pu.vtrantypecode=pwi.billtype
left join fms_rd_nc65_zb.NC65P.SM_USER su
on pu.creator = su.cuserid
where pu.pk_ct_pu='1001A110000000K8XPVN';
PUB_WF_INSTANCE table has a BLOB type column and currently it will throw
analysis exception and fallback to old optimizer, although this column is not
referenced in the real sql. The old optimizer doesn't have the outer join ->
inner join rule and the "pu.pk_ct_pu='1001A110000000K8XPVN'; " is not pushed
down and the performance will drop down. After the pr, we add the unsupported
type instead of throw exception directly, it will decide the unused case and
can continue goes nereids and [...]
---
.../nereids/rules/rewrite/CheckDataTypes.java | 3 +-
.../org/apache/doris/nereids/types/DataType.java | 3 +-
.../doris/nereids/types/UnsupportedType.java | 61 ++++++++++++++++++++++
3 files changed, 65 insertions(+), 2 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/CheckDataTypes.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/CheckDataTypes.java
index 7713cfb906..e61b8a3414 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/CheckDataTypes.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/CheckDataTypes.java
@@ -30,6 +30,7 @@ import org.apache.doris.nereids.types.DataType;
import org.apache.doris.nereids.types.JsonType;
import org.apache.doris.nereids.types.MapType;
import org.apache.doris.nereids.types.StructType;
+import org.apache.doris.nereids.types.UnsupportedType;
import com.google.common.collect.ImmutableSet;
@@ -41,7 +42,7 @@ import java.util.Set;
public class CheckDataTypes implements CustomRewriter {
private static final Set<Class<? extends DataType>> UNSUPPORTED_TYPE =
ImmutableSet.of(
- MapType.class, StructType.class, JsonType.class, ArrayType.class);
+ MapType.class, StructType.class, JsonType.class, ArrayType.class,
UnsupportedType.class);
@Override
public Plan rewriteRoot(Plan rootPlan, JobContext jobContext) {
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/types/DataType.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/types/DataType.java
index f608292f9b..db64ece1ce 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/nereids/types/DataType.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/types/DataType.java
@@ -333,8 +333,9 @@ public abstract class DataType implements AbstractDataType {
List<DataType> types = catalogType.getSubTypes().stream().map(t ->
fromCatalogType(t))
.collect(Collectors.toList());
return new AggStateType(catalogType.getFunctionName(), types,
catalogType.getSubTypeNullables());
+ } else {
+ return UnsupportedType.INSTANCE;
}
- throw new AnalysisException("Nereids do not support type: " + type);
}
public abstract String toSql();
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/types/UnsupportedType.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/types/UnsupportedType.java
new file mode 100644
index 0000000000..4e57453f20
--- /dev/null
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/types/UnsupportedType.java
@@ -0,0 +1,61 @@
+// 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.nereids.types;
+
+import org.apache.doris.catalog.Type;
+import org.apache.doris.nereids.annotation.Developing;
+import org.apache.doris.nereids.types.coercion.AbstractDataType;
+
+/**
+ * Unsupported type in Nereids.
+ */
+@Developing
+public class UnsupportedType extends DataType {
+
+ public static final int WIDTH = -1;
+
+ public static final UnsupportedType INSTANCE = new UnsupportedType();
+
+ private UnsupportedType() {
+ }
+
+ @Override
+ public Type toCatalogDataType() {
+ return Type.UNSUPPORTED;
+ }
+
+ @Override
+ public boolean acceptsType(AbstractDataType other) {
+ return other instanceof UnsupportedType;
+ }
+
+ @Override
+ public String simpleString() {
+ return "unsupported";
+ }
+
+ @Override
+ public int width() {
+ return WIDTH;
+ }
+
+ @Override
+ public String toSql() {
+ return "UNSUPPORTED";
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
