OIiveirra commented on code in PR #69032: URL: https://github.com/apache/doris/pull/69032#discussion_r4470186429
########## fe/fe-core/src/main/java/org/apache/doris/datasource/connector/converter/ConnectorSpatialWriteValidator.java: ########## @@ -0,0 +1,246 @@ +// 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.connector.converter; + +import org.apache.doris.catalog.ArrayType; +import org.apache.doris.catalog.Column; +import org.apache.doris.catalog.MapType; +import org.apache.doris.catalog.ScalarType; +import org.apache.doris.catalog.StructType; +import org.apache.doris.catalog.Type; +import org.apache.doris.nereids.exceptions.AnalysisException; +import org.apache.doris.nereids.trees.expressions.Alias; +import org.apache.doris.nereids.trees.expressions.CaseWhen; +import org.apache.doris.nereids.trees.expressions.Cast; +import org.apache.doris.nereids.trees.expressions.Expression; +import org.apache.doris.nereids.trees.expressions.NamedExpression; +import org.apache.doris.nereids.trees.expressions.functions.scalar.Array; +import org.apache.doris.nereids.trees.expressions.functions.scalar.Coalesce; +import org.apache.doris.nereids.trees.expressions.functions.scalar.CreateMap; +import org.apache.doris.nereids.trees.expressions.functions.scalar.CreateNamedStruct; +import org.apache.doris.nereids.trees.expressions.functions.scalar.CreateStruct; +import org.apache.doris.nereids.trees.expressions.functions.scalar.If; +import org.apache.doris.nereids.trees.expressions.literal.ArrayLiteral; +import org.apache.doris.nereids.trees.expressions.literal.MapLiteral; +import org.apache.doris.nereids.trees.expressions.literal.StructLiteral; +import org.apache.doris.nereids.types.DataType; + +import java.util.List; +import java.util.Objects; + +/** + * Preserves the kind and parameters of spatial connector columns before sink coercion. + * A spatial value is an opaque WKB payload at execution time, so a generic cast cannot + * safely convert between CRS, edge algorithms, or Geometry and Geography. + */ +public final class ConnectorSpatialWriteValidator { + private ConnectorSpatialWriteValidator() { + } + + public static void validate(List<Column> targetColumns, + List<? extends NamedExpression> sourceColumns) { + if (targetColumns.size() != sourceColumns.size()) { + throw new AnalysisException("Spatial connector write target and source columns are not aligned"); + } + for (int i = 0; i < targetColumns.size(); i++) { + validate(targetColumns.get(i), sourceColumns.get(i)); + } + } + + public static void validate(Column targetColumn, Expression source) { + Type targetType = targetColumn.getType(); + if (targetType.typeContainsSpatialType()) { + validateRequiredArrayNulls(source, targetColumn, targetColumn.getName()); + validateExpression(source, targetType, targetColumn.getName()); + } + } + + private static void validateRequiredArrayNulls(Expression expression, Column targetColumn, + String columnName) { + if (expression instanceof Alias || expression instanceof Cast) { + validateRequiredArrayNulls(expression.child(0), targetColumn, columnName); + return; + } + if (!(targetColumn.getType() instanceof ArrayType) || targetColumn.getChildren().isEmpty() Review Comment: Fixed in c3c75caa110. Recursive validation now carries the target child Column, retaining required LIST elements inside structs/maps, folded literals and transparent wrappers. Added rejection and acceptance coverage for both spatial kinds and ordinary map keys; 74 focused FE tests pass. -- 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]
