This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.1 by this push:
new 322bbe86436 branch-4.1: [fix](function) Handle case-insensitive auto
partition arguments #67121 (#67191)
322bbe86436 is described below
commit 322bbe8643626eba9fed1bf8e2e9b8acd2dcba3b
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Aug 28 01:31:13 2026 +0800
branch-4.1: [fix](function) Handle case-insensitive auto partition
arguments #67121 (#67191)
Cherry-picked from #67121
Co-authored-by: Mryange <[email protected]>
---
be/src/exprs/function/function_string_misc.cpp | 23 ++++++++++++---------
be/test/exprs/function/function_string_test.cpp | 27 +++++++++++++++++++++++++
2 files changed, 41 insertions(+), 9 deletions(-)
diff --git a/be/src/exprs/function/function_string_misc.cpp
b/be/src/exprs/function/function_string_misc.cpp
index 7078ac21f30..663fa0fe018 100644
--- a/be/src/exprs/function/function_string_misc.cpp
+++ b/be/src/exprs/function/function_string_misc.cpp
@@ -25,6 +25,7 @@
#include <algorithm>
#include <bit>
#include <boost/locale.hpp>
+#include <cctype>
#include <climits>
#include <cstddef>
#include <cstdint>
@@ -141,9 +142,11 @@ public:
auto& res_offset = res->get_offsets();
res_offset.resize(input_rows_count);
- const char* partition_type = chars_list[0]->raw_data();
+ std::string partition_type(chars_list[0]->raw_data(),
(*offsets_list[0])[0]);
+ std::transform(partition_type.begin(), partition_type.end(),
partition_type.begin(),
+ [](unsigned char c) { return
static_cast<char>(std::tolower(c)); });
// partition type is list|range
- if (std::strncmp(partition_type, "list", 4) == 0) {
+ if (partition_type == "list") {
return _auto_partition_type_of_list(chars_list, offsets_list,
is_const_args, null_list,
res_data, res_offset,
input_rows_count,
argument_size, block, result,
res);
@@ -256,7 +259,9 @@ private:
auto& res_offset, size_t
input_rows_count,
size_t argument_size, Block& block,
uint32_t result,
auto& res) const {
- const char* range_type = chars_list[1]->raw_data();
+ std::string range_type(chars_list[1]->raw_data(),
(*offsets_list[1])[0]);
+ std::transform(range_type.begin(), range_type.end(),
range_type.begin(),
+ [](unsigned char c) { return
static_cast<char>(std::tolower(c)); });
res_data.resize(15 * input_rows_count);
for (int i = 0; i < input_rows_count; i++) {
@@ -292,21 +297,21 @@ private:
// minute => 2022 12 11 30 00
// second => 2022 12 12 12 30 20
- if (!strncmp(range_type, "year", 4)) {
+ if (range_type == "year") {
curr_len += _copy_date_str_of_len_to_res_data(res_data,
res_offset, date_str, i, 1);
memcpy(&res_data[res_offset[i - 1]] + curr_len, "0101", 4);
curr_len += 4;
- } else if (!strncmp(range_type, "month", 5)) {
+ } else if (range_type == "month") {
curr_len += _copy_date_str_of_len_to_res_data(res_data,
res_offset, date_str, i, 2);
memcpy(&res_data[res_offset[i - 1]] + curr_len, "01", 2);
curr_len += 2;
- } else if (!strncmp(range_type, "day", 3)) {
+ } else if (range_type == "day") {
curr_len += _copy_date_str_of_len_to_res_data(res_data,
res_offset, date_str, i, 3);
- } else if (!strncmp(range_type, "hour", 4)) {
+ } else if (range_type == "hour") {
curr_len += _copy_date_str_of_len_to_res_data(res_data,
res_offset, date_str, i, 4);
- } else if (!strncmp(range_type, "minute", 6)) {
+ } else if (range_type == "minute") {
curr_len += _copy_date_str_of_len_to_res_data(res_data,
res_offset, date_str, i, 5);
- } else if (!strncmp(range_type, "second", 6)) {
+ } else if (range_type == "second") {
curr_len += _copy_date_str_of_len_to_res_data(res_data,
res_offset, date_str, i, 6);
}
diff --git a/be/test/exprs/function/function_string_test.cpp
b/be/test/exprs/function/function_string_test.cpp
index 8926a3e4aab..c6ae4f0b34f 100644
--- a/be/test/exprs/function/function_string_test.cpp
+++ b/be/test/exprs/function/function_string_test.cpp
@@ -81,6 +81,33 @@ DataSet make_md5_varbinary_dataset(const
std::vector<std::string>& inputs) {
} // namespace
+TEST(function_string_test, function_auto_partition_name_case_insensitive_test)
{
+ const InputTypeSet list_input_types = {Consted
{PrimitiveType::TYPE_VARCHAR},
+ Consted
{PrimitiveType::TYPE_VARCHAR}};
+ const DataSet list_data_set = {
+ {{std::string("LIST"), std::string("edc_server2")},
std::string("pedc5fserver211")},
+ {{std::string("LiSt"), std::string("edc_server2")},
std::string("pedc5fserver211")},
+ };
+ for (const auto& data : list_data_set) {
+ ASSERT_TRUE(check_function<DataTypeString>("auto_partition_name",
list_input_types, {data})
+ .ok());
+ }
+
+ const InputTypeSet range_input_types = {Consted
{PrimitiveType::TYPE_VARCHAR},
+ Consted
{PrimitiveType::TYPE_VARCHAR},
+ Consted
{PrimitiveType::TYPE_VARCHAR}};
+ const DataSet range_data_set = {
+ {{std::string("RANGE"), std::string("MONTH"),
std::string("2022-12-12 19:20:30")},
+ std::string("p20221201000000")},
+ {{std::string("rAnGe"), std::string("dAy"),
std::string("2022-12-12 19:20:30")},
+ std::string("p20221212000000")},
+ };
+ for (const auto& data : range_data_set) {
+ ASSERT_TRUE(check_function<DataTypeString>("auto_partition_name",
range_input_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]
