This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.2
in repository https://gitbox.apache.org/repos/asf/doris.git
commit 5ff72ef62ab2daf53885a096b0dd73fa42144d93
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Thu Sep 24 09:39:35 2026 +0800
branch-4.1: [fix](function) Fix MAKE_SET constant NULL handling #68274
(#68411)
Cherry-picked from #68274
Co-authored-by: Mryange <[email protected]>
---
be/src/exprs/function/function_string_misc.cpp | 3 ++-
be/test/exprs/function/function_string_test.cpp | 27 +++++++++++++++++++++++++
2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/be/src/exprs/function/function_string_misc.cpp
b/be/src/exprs/function/function_string_misc.cpp
index 663fa0fe018..86918be9556 100644
--- a/be/src/exprs/function/function_string_misc.cpp
+++ b/be/src/exprs/function/function_string_misc.cpp
@@ -1274,7 +1274,8 @@ public:
static bool execute_const_null(ColumnString::MutablePtr& res_col,
PaddedPODArray<UInt8>& res_null_map_data,
size_t input_rows_count, size_t null_index)
{
- if (null_index == 1) {
+ // Only a NULL bits argument makes the result NULL; NULL strings are
skipped.
+ if (null_index == 0) {
res_col->insert_many_defaults(input_rows_count);
res_null_map_data.assign(input_rows_count, (UInt8)1);
return true;
diff --git a/be/test/exprs/function/function_string_test.cpp
b/be/test/exprs/function/function_string_test.cpp
index 7ced122134d..afb9bbbaabf 100644
--- a/be/test/exprs/function/function_string_test.cpp
+++ b/be/test/exprs/function/function_string_test.cpp
@@ -132,6 +132,33 @@ TEST(function_string_test,
function_auto_partition_name_case_insensitive_test) {
}
}
+TEST(function_string_test, function_make_set_const_null_string_test) {
+ const InputTypeSet not_null_bits_types = {Notnull
{PrimitiveType::TYPE_BIGINT},
+ Consted
{PrimitiveType::TYPE_STRING},
+ PrimitiveType::TYPE_STRING};
+ const DataSet not_null_bits_data = {
+ {{BIGINT(2), Null(), std::string("B")}, std::string("B")},
+ {{BIGINT(3), Null(), std::string("C")}, std::string("C")},
+ {{BIGINT(0), Null(), std::string("D")}, std::string("")},
+ };
+ for (const auto& data : not_null_bits_data) {
+ ASSERT_TRUE(check_function<DataTypeString>("make_set",
not_null_bits_types, {data}).ok());
+ }
+
+ const InputTypeSet nullable_bits_types = {Nullable
{PrimitiveType::TYPE_BIGINT},
+ Consted
{PrimitiveType::TYPE_STRING},
+ PrimitiveType::TYPE_STRING};
+ const DataSet nullable_bits_data = {
+ {{BIGINT(2), Null(), std::string("B")}, std::string("B")},
+ {{Null(), Null(), std::string("C")}, Null()},
+ {{BIGINT(0), Null(), std::string("D")}, std::string("")},
+ };
+ for (const auto& data : nullable_bits_data) {
+ ASSERT_TRUE((check_function<DataTypeString, true>("make_set",
nullable_bits_types, {data})
+ .ok()));
+ }
+}
+
TEST(function_string_test, function_string_substr_test) {
std::string func_name = "substr";
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
