-
Notifications
You must be signed in to change notification settings - Fork 3.9k
[feat](array) support trim_array function #67397
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
vajaw
wants to merge
3
commits into
apache:master
Choose a base branch
from
vajaw:feature/trim-array
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| // 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 <memory> | ||
| #include <string> | ||
| #include <vector> | ||
|
|
||
| #include "core/block/block.h" | ||
| #include "core/column/column_const.h" | ||
| #include "core/data_type/data_type_array.h" | ||
| #include "core/data_type/data_type_nullable.h" | ||
| #include "core/data_type/data_type_number.h" | ||
| #include "exprs/function/function_test_util.h" | ||
| #include "exprs/function/simple_function_factory.h" | ||
|
|
||
| namespace doris { | ||
|
|
||
| static void check_array_trim_case(const DataSet& data_set, bool const_array, bool const_size) { | ||
| auto element_type = make_nullable(std::make_shared<DataTypeInt32>()); | ||
| DataTypePtr array_type = | ||
| make_nullable(std::make_shared<DataTypeArray>(std::move(element_type))); | ||
| DataTypePtr size_type = make_nullable(std::make_shared<DataTypeInt64>()); | ||
| const size_t row_size = data_set.size(); | ||
|
|
||
| MutableColumnPtr array_column = array_type->create_column(); | ||
| MutableColumnPtr size_column = size_type->create_column(); | ||
| for (size_t row = 0; row < row_size; ++row) { | ||
| if (!const_array || row == 0) { | ||
| ASSERT_TRUE(insert_cell(array_column, array_type, data_set[row].first[0])); | ||
| } | ||
| if (!const_size || row == 0) { | ||
| ASSERT_TRUE(insert_cell(size_column, size_type, data_set[row].first[1])); | ||
| } | ||
| } | ||
|
|
||
| if (const_array) { | ||
| array_column = ColumnConst::create(std::move(array_column), row_size); | ||
| } | ||
| if (const_size) { | ||
| size_column = ColumnConst::create(std::move(size_column), row_size); | ||
| } | ||
|
|
||
| Block block; | ||
| block.insert({std::move(array_column), array_type, "array"}); | ||
| block.insert({std::move(size_column), size_type, "size"}); | ||
|
|
||
| FunctionBasePtr function = SimpleFunctionFactory::instance().get_function( | ||
| "trim_array", block.get_columns_with_type_and_name(), array_type); | ||
| ASSERT_NE(function, nullptr); | ||
|
|
||
| std::vector<std::shared_ptr<ColumnPtrWrapper>> constant_columns(2); | ||
| if (const_array) { | ||
| constant_columns[0] = std::make_shared<ColumnPtrWrapper>(block.get_by_position(0).column); | ||
| } | ||
| if (const_size) { | ||
| constant_columns[1] = std::make_shared<ColumnPtrWrapper>(block.get_by_position(1).column); | ||
| } | ||
|
|
||
| FunctionUtils function_utils(array_type, {array_type, size_type}, false); | ||
| auto* function_context = function_utils.get_fn_ctx(); | ||
| function_context->set_constant_cols(constant_columns); | ||
| ASSERT_TRUE(function->open(function_context, FunctionContext::FRAGMENT_LOCAL).ok()); | ||
| ASSERT_TRUE(function->open(function_context, FunctionContext::THREAD_LOCAL).ok()); | ||
|
|
||
| block.insert({nullptr, array_type, "result"}); | ||
| const auto result = block.columns() - 1; | ||
| ASSERT_TRUE(function->execute(function_context, block, {0, 1}, result, row_size).ok()); | ||
|
|
||
| static_cast<void>(function->close(function_context, FunctionContext::THREAD_LOCAL)); | ||
| static_cast<void>(function->close(function_context, FunctionContext::FRAGMENT_LOCAL)); | ||
|
|
||
| MutableColumnPtr expected_column = array_type->create_column(); | ||
| for (const auto& row : data_set) { | ||
| ASSERT_TRUE(insert_cell(expected_column, array_type, row.second)); | ||
| } | ||
| const auto result_column = | ||
| block.get_by_position(result).column->convert_to_full_column_if_const(); | ||
| for (size_t row = 0; row < row_size; ++row) { | ||
| EXPECT_EQ(0, result_column->compare_at(row, row, *expected_column, 1)) | ||
| << "row " << row << ", result: " << array_type->to_string(*result_column, row) | ||
| << ", expected: " << array_type->to_string(*expected_column, row); | ||
| } | ||
| } | ||
|
|
||
| TEST(FunctionArrayTrimTest, all_argument_combinations) { | ||
| const TestArray empty; | ||
| const TestArray values = {Int32(1), Int32(2), Int32(3), Int32(4)}; | ||
| const TestArray short_values = {Int32(5), Int32(6)}; | ||
| const TestArray values_with_null = {Int32(1), Null(), Int32(3)}; | ||
|
|
||
| check_array_trim_case( | ||
| {{{AnyType(values), Int64(0)}, AnyType(values)}, | ||
| {{AnyType(values), Int64(2)}, AnyType(TestArray {Int32(1), Int32(2)})}, | ||
| {{AnyType(empty), Int64(0)}, AnyType(empty)}, | ||
| {{AnyType(values_with_null), Int64(1)}, AnyType(TestArray {Int32(1), Null()})}, | ||
| {{Null(), Int64(1)}, Null()}, | ||
| {{AnyType(values), Null()}, Null()}}, | ||
| false, false); | ||
|
|
||
| check_array_trim_case({{{AnyType(values), Int64(0)}, AnyType(values)}, | ||
| {{AnyType(values), Int64(2)}, AnyType(TestArray {Int32(1), Int32(2)})}, | ||
| {{AnyType(values), Int64(4)}, AnyType(empty)}}, | ||
| true, false); | ||
|
|
||
| check_array_trim_case( | ||
| {{{AnyType(values), Int64(1)}, AnyType(TestArray {Int32(1), Int32(2), Int32(3)})}, | ||
| {{AnyType(short_values), Int64(1)}, AnyType(TestArray {Int32(5)})}, | ||
| {{AnyType(values_with_null), Int64(1)}, AnyType(TestArray {Int32(1), Null()})}, | ||
| {{Null(), Int64(1)}, Null()}}, | ||
| false, true); | ||
|
|
||
| check_array_trim_case({{{AnyType(values), Int64(2)}, AnyType(TestArray {Int32(1), Int32(2)})}}, | ||
| true, true); | ||
| } | ||
|
|
||
| } // namespace doris |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
70 changes: 70 additions & 0 deletions
70
.../src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/TrimArray.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| // 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 com.google.common.base.Preconditions; | ||
| import com.google.common.collect.ImmutableList; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| /** | ||
| * Remove the specified number of elements from the end of an array. | ||
| */ | ||
| public class TrimArray extends ScalarFunction | ||
| implements BinaryExpression, ExplicitlyCastableSignature, PropagateNullable { | ||
|
|
||
| public static final List<FunctionSignature> SIGNATURES = ImmutableList.of( | ||
| FunctionSignature.retArgType(0) | ||
| .args(ArrayType.of(AnyDataType.INSTANCE_WITHOUT_INDEX), BigIntType.INSTANCE) | ||
| ); | ||
|
|
||
| public TrimArray(Expression array, Expression size) { | ||
| super("trim_array", array, size); | ||
| } | ||
|
|
||
| private TrimArray(ScalarFunctionParams functionParams) { | ||
| super(functionParams); | ||
| } | ||
|
|
||
| @Override | ||
| public TrimArray withChildren(List<Expression> children) { | ||
| Preconditions.checkArgument(children.size() == 2, | ||
| "trim_array accepts 2 arguments, but got %s (%s)", children.size(), children); | ||
| return new TrimArray(getFunctionParams(children)); | ||
| } | ||
|
|
||
| @Override | ||
| public <R, C> R accept(ExpressionVisitor<R, C> visitor, C context) { | ||
| return visitor.visitTrimArray(this, context); | ||
| } | ||
|
|
||
| @Override | ||
| public List<FunctionSignature> getSignatures() { | ||
| return SIGNATURES; | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
这里估计得重写
use_default_implementation_for_nulls外层默认的 null 处理，对于 array 列来说会替换为
[], whichcardinality == 0, 所以如果使用默认处理框架，L156应该会报错，得手动处理 null