github-actions[bot] commented on code in PR #67045: URL: https://github.com/apache/doris/pull/67045#discussion_r3836689242
########## fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/MapFromEntries.java: ########## @@ -0,0 +1,88 @@ +// 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.trees.expressions.functions.scalar; + +import org.apache.doris.catalog.FunctionSignature; +import org.apache.doris.nereids.exceptions.AnalysisException; +import org.apache.doris.nereids.trees.expressions.Expression; +import org.apache.doris.nereids.trees.expressions.PreferPushDownProject; +import org.apache.doris.nereids.trees.expressions.functions.CustomSignature; +import org.apache.doris.nereids.trees.expressions.functions.PropagateNullable; +import org.apache.doris.nereids.trees.expressions.shape.UnaryExpression; +import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor; +import org.apache.doris.nereids.types.ArrayType; +import org.apache.doris.nereids.types.DataType; +import org.apache.doris.nereids.types.MapType; +import org.apache.doris.nereids.types.StructField; +import org.apache.doris.nereids.types.StructType; +import org.apache.doris.nereids.types.TinyIntType; + +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; + +import java.util.List; + +/** Construct a Map from an Array of two-field Struct entries. */ +public class MapFromEntries extends ScalarFunction + implements UnaryExpression, CustomSignature, PropagateNullable, PreferPushDownProject { + + public MapFromEntries(Expression entries) { + super("map_from_entries", entries); + } + + private MapFromEntries(ScalarFunctionParams functionParams) { + super(functionParams); + } + + @Override + public MapFromEntries withChildren(List<Expression> children) { + Preconditions.checkArgument(children.size() == 1); + return new MapFromEntries(getFunctionParams(children)); + } + + @Override + public FunctionSignature customSignature() { + DataType inputType = getArgumentType(0); + if (inputType.isNullType()) { + StructType structType = new StructType(ImmutableList.of( + new StructField("key", TinyIntType.INSTANCE, true, ""), + new StructField("value", TinyIntType.INSTANCE, true, ""))); + return FunctionSignature.ret( + MapType.of(TinyIntType.INSTANCE, TinyIntType.INSTANCE)) + .args(ArrayType.of(structType)); + } + if (!(inputType instanceof ArrayType) + || !(((ArrayType) inputType).getItemType() instanceof StructType)) { + throw new AnalysisException( + "map_from_entries requires an array of structs with exactly two fields"); + } + List<StructField> fields = ((StructType) ((ArrayType) inputType).getItemType()).getFields(); + if (fields.size() != 2) { + throw new AnalysisException( + "map_from_entries requires an array of structs with exactly two fields"); + } + MapType resultType = MapType.of(fields.get(0).getDataType(), fields.get(1).getDataType()); + resultType.validateDataType(); Review Comment: [P1] Handle every unresolved NULL shape in the custom signature The current fallback covers only a top-level `NULL`: `struct(1,NULL)` and legal complex values such as `struct(1,[NULL])` reach here with direct or nested NULL leaves and fail validation. This contradicts the NULL-field contract and breaks `map_from_entries(map_entries(map(NULL,NULL)))`. Please recursively normalize unresolved NULL leaves in both the expected STRUCT argument and return signature, while preserving rejection of a NULL STRUCT entry, then cover raw-NULL, inverse, and nested-complex cases. ########## fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/MapFromArrays.java: ########## @@ -0,0 +1,75 @@ +// 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.trees.expressions.functions.scalar; + +import org.apache.doris.catalog.FunctionSignature; +import org.apache.doris.nereids.trees.expressions.Expression; +import org.apache.doris.nereids.trees.expressions.PreferPushDownProject; +import org.apache.doris.nereids.trees.expressions.functions.ExplicitlyCastableSignature; +import org.apache.doris.nereids.trees.expressions.functions.PropagateNullable; +import org.apache.doris.nereids.trees.expressions.shape.BinaryExpression; +import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor; +import org.apache.doris.nereids.types.ArrayType; +import org.apache.doris.nereids.types.MapType; +import org.apache.doris.nereids.types.coercion.AnyDataType; +import org.apache.doris.nereids.types.coercion.FollowToAnyDataType; + +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; + +import java.util.List; + +/** Construct a Map from key and value arrays with identical per-row offsets. */ +public class MapFromArrays extends ScalarFunction + implements BinaryExpression, ExplicitlyCastableSignature, PropagateNullable, PreferPushDownProject { + + public static final List<FunctionSignature> SIGNATURES = ImmutableList.of( + FunctionSignature.ret(MapType.of(new FollowToAnyDataType(0), new FollowToAnyDataType(1))) + .args(ArrayType.of(new AnyDataType(0)), ArrayType.of(new AnyDataType(1)))); + + public MapFromArrays(Expression keys, Expression values) { + super("map_from_arrays", keys, values); + } + + private MapFromArrays(ScalarFunctionParams functionParams) { + super(functionParams); + } + + @Override + public MapFromArrays withChildren(List<Expression> children) { + Preconditions.checkArgument(children.size() == 2); + return new MapFromArrays(getFunctionParams(children)); + } + + @Override + public List<FunctionSignature> getSignatures() { + return SIGNATURES; + } + + @Override + public FunctionSignature computeSignature(FunctionSignature signature) { + FunctionSignature resolvedSignature = super.computeSignature(signature); + resolvedSignature.returnType.validateDataType(); Review Comment: [P1] Normalize unresolved NULL leaves before validating the map `AnyDataType` resolution can leave `NullType` either as the array element (`array(NULL)`, plain `NULL`, `[]`) or recursively inside a legal complex value (`map_from_arrays([1], [[NULL]])`). The return then contains a NULL leaf and `validateDataType()` rejects it, so documented NULL elements and complex values never reach the BE; this also breaks round-tripping `map_keys`/`map_values` from `map(NULL, NULL)`. Please recursively normalize unresolved NULL leaves to a concrete fallback in both the expected arguments and return signature (so FE and BE agree), and cover direct, empty, round-trip, and nested-complex cases. -- 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]
