From f518db45156579270b9a5d45ed80adca77eeb001 Mon Sep 17 00:00:00 2001 From: BiteTheDDDDt Date: Fri, 24 Jan 2025 15:10:00 +0800 Subject: [PATCH 1/7] support function array_flatten --- .../functions/scalar/ArrayFlatten.java | 72 +++++++++++++++++++ .../visitor/ScalarFunctionVisitor.java | 5 ++ 2 files changed, 77 insertions(+) create mode 100644 fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/ArrayFlatten.java diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/ArrayFlatten.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/ArrayFlatten.java new file mode 100644 index 00000000000000..5c3f3bae0bb0af --- /dev/null +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/ArrayFlatten.java @@ -0,0 +1,72 @@ +// 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.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.BigIntType; +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; + +/** + * ScalarFunction 'array_flatten' + */ +public class ArrayFlatten extends ScalarFunction + implements ExplicitlyCastableSignature, PropagateNullable { + + public static final List SIGNATURES = ImmutableList.of( + FunctionSignature.ret(ArrayType.of(new FollowToAnyDataType(0))).args(ArrayType.of(ArrayType.of(new AnyDataType(0)))) + ); + + /** + * constructor with 1 arguments. + */ + public ArrayFlatten(Expression arg) { + super("array_flatten", arg); + } + + /** + * withChildren. + */ + @Override + public ArrayFlatten withChildren(List children) { + Preconditions.checkArgument(children.size() == 1); + return new ArrayFlatten(children.get(0)); + } + + @Override + public R accept(ExpressionVisitor visitor, C context) { + return visitor.visitArrayFlatten(this, context); + } + + @Override + public List getSignatures() { + return SIGNATURES; + } + +} diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/visitor/ScalarFunctionVisitor.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/visitor/ScalarFunctionVisitor.java index 1a41ba4f23eb97..a35b22445b1a56 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/visitor/ScalarFunctionVisitor.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/visitor/ScalarFunctionVisitor.java @@ -43,6 +43,7 @@ import org.apache.doris.nereids.trees.expressions.functions.scalar.ArrayExists; import org.apache.doris.nereids.trees.expressions.functions.scalar.ArrayFilter; import org.apache.doris.nereids.trees.expressions.functions.scalar.ArrayFirstIndex; +import org.apache.doris.nereids.trees.expressions.functions.scalar.ArrayFlatten; import org.apache.doris.nereids.trees.expressions.functions.scalar.ArrayIntersect; import org.apache.doris.nereids.trees.expressions.functions.scalar.ArrayJoin; import org.apache.doris.nereids.trees.expressions.functions.scalar.ArrayLastIndex; @@ -676,6 +677,10 @@ default R visitArrayShuffle(ArrayShuffle arrayShuffle, C context) { return visitScalarFunction(arrayShuffle, context); } + default R visitArrayFlatten(ArrayShuffle arrayFlatten, C context) { + return visitScalarFunction(arrayFlatten, context); + } + default R visitArrayMap(ArrayMap arraySort, C context) { return visitScalarFunction(arraySort, context); } From d740a262fb4a52edeb54ccfc69ffe9702e63af92 Mon Sep 17 00:00:00 2001 From: BiteTheDDDDt Date: Fri, 24 Jan 2025 15:12:58 +0800 Subject: [PATCH 2/7] fix --- .../trees/expressions/visitor/ScalarFunctionVisitor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/visitor/ScalarFunctionVisitor.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/visitor/ScalarFunctionVisitor.java index a35b22445b1a56..5fe20752d04220 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/visitor/ScalarFunctionVisitor.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/visitor/ScalarFunctionVisitor.java @@ -677,7 +677,7 @@ default R visitArrayShuffle(ArrayShuffle arrayShuffle, C context) { return visitScalarFunction(arrayShuffle, context); } - default R visitArrayFlatten(ArrayShuffle arrayFlatten, C context) { + default R visitArrayFlatten(ArrayFlatten arrayFlatten, C context) { return visitScalarFunction(arrayFlatten, context); } From 4c5ce824411cd46d2dee0d789df22b9efe8cc2b5 Mon Sep 17 00:00:00 2001 From: BiteTheDDDDt Date: Fri, 24 Jan 2025 17:54:37 +0800 Subject: [PATCH 3/7] update --- .../array/function_array_flatten.cpp | 85 +++++++++++++++++++ .../array/function_array_register.cpp | 3 +- .../doris/catalog/BuiltinScalarFunctions.java | 2 + .../functions/scalar/ArrayFlatten.java | 6 +- 4 files changed, 91 insertions(+), 5 deletions(-) create mode 100644 be/src/vec/functions/array/function_array_flatten.cpp diff --git a/be/src/vec/functions/array/function_array_flatten.cpp b/be/src/vec/functions/array/function_array_flatten.cpp new file mode 100644 index 00000000000000..51e9202802b2a6 --- /dev/null +++ b/be/src/vec/functions/array/function_array_flatten.cpp @@ -0,0 +1,85 @@ +// 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. + +#include "common/status.h" +#include "vec/aggregate_functions/aggregate_function.h" +#include "vec/columns/column.h" +#include "vec/columns/column_array.h" +#include "vec/columns/column_nullable.h" +#include "vec/common/assert_cast.h" +#include "vec/core/block.h" +#include "vec/core/column_numbers.h" +#include "vec/core/column_with_type_and_name.h" +#include "vec/core/types.h" +#include "vec/data_types/data_type.h" +#include "vec/data_types/data_type_array.h" +#include "vec/functions/function.h" +#include "vec/functions/simple_function_factory.h" + +namespace doris::vectorized { +#include "common/compile_check_begin.h" + +class FunctionArrayFlatten : public IFunction { +public: + static constexpr auto name = "array_flatten"; + static FunctionPtr create() { return std::make_shared(); } + + /// Get function name. + String get_name() const override { return name; } + + size_t get_number_of_arguments() const override { return 1; } + + DataTypePtr get_return_type_impl(const DataTypes& arguments) const override { + DataTypePtr arg_0 = arguments[0]; + DCHECK(is_array(arg_0)); + return remove_nullable(assert_cast(arg_0.get())->get_nested_type()); + } + + Status execute_impl(FunctionContext* context, Block& block, const ColumnNumbers& arguments, + uint32_t result, size_t input_rows_count) const override { + auto src_column = + block.get_by_position(arguments[0]).column->convert_to_full_column_if_const(); + const auto& src_column_array = + assert_cast(*remove_nullable(src_column)); + const auto& nested_src_column_array = + assert_cast(*remove_nullable(src_column_array.get_data_ptr())); + + DataTypePtr src_column_type = block.get_by_position(arguments[0]).type; + auto nested_type = assert_cast(*src_column_type).get_nested_type(); + + auto result_column_offsets = ColumnArray::ColumnOffsets::create(input_rows_count); + auto* offsets = result_column_offsets->get_data().data(); + + for (size_t i = 0; i < input_rows_count; ++i) { + offsets[i] = + nested_src_column_array.get_offsets()[src_column_array.get_offsets()[i] - 1]; + } + + block.replace_by_position(result, + ColumnArray::create(assert_cast( + nested_src_column_array.get_data()) + .clone(), + std::move(result_column_offsets))); + return Status::OK(); + } +}; + +void register_function_array_flatten(SimpleFunctionFactory& factory) { + factory.register_function(); +} + +} // namespace doris::vectorized \ No newline at end of file diff --git a/be/src/vec/functions/array/function_array_register.cpp b/be/src/vec/functions/array/function_array_register.cpp index 8d5428710a4019..aa92e89128fec3 100644 --- a/be/src/vec/functions/array/function_array_register.cpp +++ b/be/src/vec/functions/array/function_array_register.cpp @@ -21,7 +21,7 @@ #include "vec/functions/simple_function_factory.h" namespace doris::vectorized { - +void register_function_array_flatten(SimpleFunctionFactory&); void register_function_array_shuffle(SimpleFunctionFactory&); void register_function_array_exists(SimpleFunctionFactory&); void register_function_array_element(SimpleFunctionFactory&); @@ -59,6 +59,7 @@ void register_function_array_contains_all(SimpleFunctionFactory&); void register_function_array_match(SimpleFunctionFactory&); void register_function_array(SimpleFunctionFactory& factory) { + register_function_array_flatten(factory); register_function_array_shuffle(factory); register_function_array_exists(factory); register_function_array_element(factory); diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/BuiltinScalarFunctions.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/BuiltinScalarFunctions.java index b173383ff0c6ab..6fc692fdf90f67 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/BuiltinScalarFunctions.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/BuiltinScalarFunctions.java @@ -42,6 +42,7 @@ import org.apache.doris.nereids.trees.expressions.functions.scalar.ArrayFilter; import org.apache.doris.nereids.trees.expressions.functions.scalar.ArrayFirst; import org.apache.doris.nereids.trees.expressions.functions.scalar.ArrayFirstIndex; +import org.apache.doris.nereids.trees.expressions.functions.scalar.ArrayFlatten; import org.apache.doris.nereids.trees.expressions.functions.scalar.ArrayIntersect; import org.apache.doris.nereids.trees.expressions.functions.scalar.ArrayJoin; import org.apache.doris.nereids.trees.expressions.functions.scalar.ArrayLast; @@ -515,6 +516,7 @@ public class BuiltinScalarFunctions implements FunctionHelper { scalar(ArrayFilter.class, "array_filter"), scalar(ArrayFirst.class, "array_first"), scalar(ArrayFirstIndex.class, "array_first_index"), + scalar(ArrayFlatten.class, "array_flatten"), scalar(ArrayIntersect.class, "array_intersect"), scalar(ArrayJoin.class, "array_join"), scalar(ArrayLast.class, "array_last"), diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/ArrayFlatten.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/ArrayFlatten.java index 5c3f3bae0bb0af..c694713cee9933 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/ArrayFlatten.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/ArrayFlatten.java @@ -21,10 +21,8 @@ import org.apache.doris.nereids.trees.expressions.Expression; 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.BigIntType; import org.apache.doris.nereids.types.coercion.AnyDataType; import org.apache.doris.nereids.types.coercion.FollowToAnyDataType; @@ -40,8 +38,8 @@ public class ArrayFlatten extends ScalarFunction implements ExplicitlyCastableSignature, PropagateNullable { public static final List SIGNATURES = ImmutableList.of( - FunctionSignature.ret(ArrayType.of(new FollowToAnyDataType(0))).args(ArrayType.of(ArrayType.of(new AnyDataType(0)))) - ); + FunctionSignature.ret(ArrayType.of(new FollowToAnyDataType(0)))) + .args(ArrayType.of(ArrayType.of(new AnyDataType(0)))); /** * constructor with 1 arguments. From 34ed2e27986a4c139fc43370836f918302552fa1 Mon Sep 17 00:00:00 2001 From: BiteTheDDDDt Date: Fri, 24 Jan 2025 19:15:40 +0800 Subject: [PATCH 4/7] fix --- .../trees/expressions/functions/scalar/ArrayFlatten.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/ArrayFlatten.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/ArrayFlatten.java index c694713cee9933..69fab0704964eb 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/ArrayFlatten.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/ArrayFlatten.java @@ -38,8 +38,8 @@ public class ArrayFlatten extends ScalarFunction implements ExplicitlyCastableSignature, PropagateNullable { public static final List SIGNATURES = ImmutableList.of( - FunctionSignature.ret(ArrayType.of(new FollowToAnyDataType(0)))) - .args(ArrayType.of(ArrayType.of(new AnyDataType(0)))); + FunctionSignature.ret(ArrayType.of(new FollowToAnyDataType(0))) + .args(ArrayType.of(ArrayType.of(new AnyDataType(0))))); /** * constructor with 1 arguments. From 35aa37998c2fb7a19e056bcfc9f840bfd367f3ab Mon Sep 17 00:00:00 2001 From: BiteTheDDDDt Date: Sun, 26 Jan 2025 14:19:56 +0800 Subject: [PATCH 5/7] update --- .../array/function_array_flatten.cpp | 45 +++++++++++-------- .../functions/scalar/ArrayFlatten.java | 23 +++++----- .../scalar_function/Array.out | 30 +++++++++++++ .../scalar_function/Array.groovy | 11 +++++ 4 files changed, 79 insertions(+), 30 deletions(-) diff --git a/be/src/vec/functions/array/function_array_flatten.cpp b/be/src/vec/functions/array/function_array_flatten.cpp index 51e9202802b2a6..eacba725a378a5 100644 --- a/be/src/vec/functions/array/function_array_flatten.cpp +++ b/be/src/vec/functions/array/function_array_flatten.cpp @@ -44,36 +44,43 @@ class FunctionArrayFlatten : public IFunction { size_t get_number_of_arguments() const override { return 1; } DataTypePtr get_return_type_impl(const DataTypes& arguments) const override { - DataTypePtr arg_0 = arguments[0]; - DCHECK(is_array(arg_0)); - return remove_nullable(assert_cast(arg_0.get())->get_nested_type()); + DataTypePtr arg = arguments[0]; + while (is_array(arg)) { + arg = remove_nullable(assert_cast(arg.get())->get_nested_type()); + } + return std::make_shared(make_nullable(arg)); } Status execute_impl(FunctionContext* context, Block& block, const ColumnNumbers& arguments, uint32_t result, size_t input_rows_count) const override { auto src_column = block.get_by_position(arguments[0]).column->convert_to_full_column_if_const(); - const auto& src_column_array = - assert_cast(*remove_nullable(src_column)); - const auto& nested_src_column_array = - assert_cast(*remove_nullable(src_column_array.get_data_ptr())); + auto* src_column_array_ptr = + assert_cast(remove_nullable(src_column)->assume_mutable().get()); + ColumnArray* nested_src_column_array_ptr = src_column_array_ptr; - DataTypePtr src_column_type = block.get_by_position(arguments[0]).type; - auto nested_type = assert_cast(*src_column_type).get_nested_type(); + auto result_column_offsets = + assert_cast(src_column_array_ptr->get_offsets_column()) + .clone(); + auto* offsets = assert_cast(result_column_offsets.get()) + ->get_data() + .data(); - auto result_column_offsets = ColumnArray::ColumnOffsets::create(input_rows_count); - auto* offsets = result_column_offsets->get_data().data(); + while (src_column_array_ptr->get_data_ptr()->is_column_array()) { + nested_src_column_array_ptr = assert_cast( + remove_nullable(src_column_array_ptr->get_data_ptr())->assume_mutable().get()); - for (size_t i = 0; i < input_rows_count; ++i) { - offsets[i] = - nested_src_column_array.get_offsets()[src_column_array.get_offsets()[i] - 1]; + for (size_t i = 0; i < input_rows_count; ++i) { + offsets[i] = nested_src_column_array_ptr->get_offsets()[offsets[i] - 1]; + } + src_column_array_ptr = nested_src_column_array_ptr; } - block.replace_by_position(result, - ColumnArray::create(assert_cast( - nested_src_column_array.get_data()) - .clone(), - std::move(result_column_offsets))); + block.replace_by_position( + result, ColumnArray::create(assert_cast( + nested_src_column_array_ptr->get_data()) + .clone(), + std::move(result_column_offsets))); return Status::OK(); } }; diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/ArrayFlatten.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/ArrayFlatten.java index 69fab0704964eb..3b092fe3afab2b 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/ArrayFlatten.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/ArrayFlatten.java @@ -19,10 +19,12 @@ import org.apache.doris.catalog.FunctionSignature; import org.apache.doris.nereids.trees.expressions.Expression; +import org.apache.doris.nereids.trees.expressions.functions.CustomSignature; 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.visitor.ExpressionVisitor; import org.apache.doris.nereids.types.ArrayType; +import org.apache.doris.nereids.types.DataType; import org.apache.doris.nereids.types.coercion.AnyDataType; import org.apache.doris.nereids.types.coercion.FollowToAnyDataType; @@ -35,11 +37,7 @@ * ScalarFunction 'array_flatten' */ public class ArrayFlatten extends ScalarFunction - implements ExplicitlyCastableSignature, PropagateNullable { - - public static final List SIGNATURES = ImmutableList.of( - FunctionSignature.ret(ArrayType.of(new FollowToAnyDataType(0))) - .args(ArrayType.of(ArrayType.of(new AnyDataType(0))))); + implements CustomSignature, PropagateNullable { /** * constructor with 1 arguments. @@ -48,6 +46,15 @@ public ArrayFlatten(Expression arg) { super("array_flatten", arg); } + @Override + public FunctionSignature customSignature() { + DataType dataType = getArgument(0).getDataType(); + while (dataType instanceof ArrayType) { + dataType = ((ArrayType)dataType).getItemType(); + } + return FunctionSignature.ret(ArrayType.of(dataType)).args(getArgument(0).getDataType()); + } + /** * withChildren. */ @@ -61,10 +68,4 @@ public ArrayFlatten withChildren(List children) { public R accept(ExpressionVisitor visitor, C context) { return visitor.visitArrayFlatten(this, context); } - - @Override - public List getSignatures() { - return SIGNATURES; - } - } diff --git a/regression-test/data/nereids_function_p0/scalar_function/Array.out b/regression-test/data/nereids_function_p0/scalar_function/Array.out index b2e11fab37e47a..4c489cfb045fe9 100644 --- a/regression-test/data/nereids_function_p0/scalar_function/Array.out +++ b/regression-test/data/nereids_function_p0/scalar_function/Array.out @@ -16923,3 +16923,33 @@ false false -- !sql -- false false +-- !sql -- +[1, 2, 3, 4, 5] + +-- !sql -- +[] + +-- !sql -- +[1] + +-- !sql -- +[1, 2, 3] + +-- !sql -- +[1, 2, 3, 4, 5] + +-- !sql -- +[null, null] + +-- !sql -- +[1, 2, 3, 4, 5] + +-- !sql -- +[1, 2, 3, 4, 5] + +-- !sql -- +[1, 2, 3, 4, 5, 6, 7, 8, 9] + +-- !sql -- +[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] + diff --git a/regression-test/suites/nereids_function_p0/scalar_function/Array.groovy b/regression-test/suites/nereids_function_p0/scalar_function/Array.groovy index 7178ef4436e94b..f4d993baf5ac7a 100644 --- a/regression-test/suites/nereids_function_p0/scalar_function/Array.groovy +++ b/regression-test/suites/nereids_function_p0/scalar_function/Array.groovy @@ -1424,4 +1424,15 @@ suite("nereids_scalar_fn_Array") { // map_contains_value qt_sql """ select map_contains_value(map(1,1), 257), map_contains_value(map(1,2), 258);""" + qt_sql """select array_flatten([[1,2,3],[4,5]]);""" + qt_sql """select array_flatten([[],[]]);""" + qt_sql """select array_flatten([[1],[]]);""" + qt_sql """select array_flatten([[1,2,3],null]);""" + qt_sql """select array_flatten([[1,2,3],null,[4,5]]);""" + qt_sql """select array_flatten([null,null]);""" + qt_sql """select array_flatten([[1,2,3,4,5]]);""" + qt_sql """select array_flatten([[[1,2,3,4,5]]]);;""" + qt_sql """select array_flatten([ [[1,2,3,4,5]],[[6,7],[8,9]] ]);""" + qt_sql """select array_flatten([[[[[[1,2,3,4,5],[6,7],[8,9],[10,11],[12]]]]]]);""" + } From b11212e5be4a48149a231610b51ce94e45931929 Mon Sep 17 00:00:00 2001 From: BiteTheDDDDt Date: Sun, 26 Jan 2025 14:25:42 +0800 Subject: [PATCH 6/7] update --- .../trees/expressions/functions/scalar/ArrayFlatten.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/ArrayFlatten.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/ArrayFlatten.java index 3b092fe3afab2b..3f340ec01cd4b4 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/ArrayFlatten.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/ArrayFlatten.java @@ -20,16 +20,12 @@ import org.apache.doris.catalog.FunctionSignature; import org.apache.doris.nereids.trees.expressions.Expression; import org.apache.doris.nereids.trees.expressions.functions.CustomSignature; -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.visitor.ExpressionVisitor; import org.apache.doris.nereids.types.ArrayType; import org.apache.doris.nereids.types.DataType; -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; @@ -50,7 +46,7 @@ public ArrayFlatten(Expression arg) { public FunctionSignature customSignature() { DataType dataType = getArgument(0).getDataType(); while (dataType instanceof ArrayType) { - dataType = ((ArrayType)dataType).getItemType(); + dataType = ((ArrayType) dataType).getItemType(); } return FunctionSignature.ret(ArrayType.of(dataType)).args(getArgument(0).getDataType()); } From d8e32d3e8ef26dfbf7eda646d34755be34e151c6 Mon Sep 17 00:00:00 2001 From: BiteTheDDDDt Date: Mon, 27 Jan 2025 16:01:33 +0800 Subject: [PATCH 7/7] update case --- .../array_functions/array_flatten.out | 6 +++ .../array_functions/array_flatten.groovy | 46 +++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 regression-test/data/query_p0/sql_functions/array_functions/array_flatten.out create mode 100644 regression-test/suites/query_p0/sql_functions/array_functions/array_flatten.groovy diff --git a/regression-test/data/query_p0/sql_functions/array_functions/array_flatten.out b/regression-test/data/query_p0/sql_functions/array_functions/array_flatten.out new file mode 100644 index 00000000000000..fa71438783db9f --- /dev/null +++ b/regression-test/data/query_p0/sql_functions/array_functions/array_flatten.out @@ -0,0 +1,6 @@ +-- This file is automatically generated. You should know what you did if you want to edit this +-- !test -- +1 [1, 2, 3] [1, 2, 3] [1, 2, 3] [1, 2, 3] ["a", "b", "c"] +2 \N \N [] \N ["b", null] +3 [1, 2, null] [null] [null, 2] [null, null, 3] [null, "aaaab", "ccc"] + diff --git a/regression-test/suites/query_p0/sql_functions/array_functions/array_flatten.groovy b/regression-test/suites/query_p0/sql_functions/array_functions/array_flatten.groovy new file mode 100644 index 00000000000000..82d4a39a565204 --- /dev/null +++ b/regression-test/suites/query_p0/sql_functions/array_functions/array_flatten.groovy @@ -0,0 +1,46 @@ +// 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. + +suite("array_flatten") { + sql """DROP TABLE IF EXISTS t_array_flatten""" + sql """ + CREATE TABLE IF NOT EXISTS t_array_flatten ( + `k1` int(11) NULL COMMENT "", + `a1` array NULL COMMENT "", + `aaa1` array>> NULL COMMENT "", + `aa3` array> NOT NULL COMMENT "", + `aa5` array> NULL COMMENT "", + `aa14` array> NULL COMMENT "" + + ) ENGINE=OLAP + DUPLICATE KEY(`k1`) + DISTRIBUTED BY HASH(`k1`) BUCKETS 1 + PROPERTIES ( + "replication_allocation" = "tag.location.default: 1", + "storage_format" = "V2" + ) + """ + sql """ INSERT INTO t_array_flatten VALUES(1, [1, 2, 3],[[[1]],[[2],[3]]],[[1,2],[3]],[[1,2],[3]],[['a'],['b','c']]) """ + sql """ INSERT INTO t_array_flatten VALUES(2, null,null,[],null,[null,['b',null]]) """ + sql """ INSERT INTO t_array_flatten VALUES(3, [1, 2, null],[[[]],[[null],[]]],[[null,2],[]],[[null,null],[3]],[[null],['aaaab','ccc']]) """ + + + + qt_test """ + select k1, array_flatten(a1), array_flatten(aaa1), array_flatten(aa3), array_flatten(aa5), array_flatten(aa14) from t_array_flatten order by k1; + """ +}