From 4ea57828385435a6a1430a0eac6a1268e52c1101 Mon Sep 17 00:00:00 2001 From: zhangstar333 <87313068+zhangstar333@users.noreply.github.com> Date: Thu, 2 Jun 2022 10:37:45 +0800 Subject: [PATCH] [fix](Function) fix to_bitmap to return always not nullable (#9859) --- be/src/vec/functions/function_bitmap.cpp | 45 ++++++++++++++++-------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/be/src/vec/functions/function_bitmap.cpp b/be/src/vec/functions/function_bitmap.cpp index 2c3b4f02dc..0d2f85ee55 100644 --- a/be/src/vec/functions/function_bitmap.cpp +++ b/be/src/vec/functions/function_bitmap.cpp @@ -39,24 +39,39 @@ struct BitmapEmpty { struct ToBitmap { static constexpr auto name = "to_bitmap"; + using ReturnType = DataTypeBitMap; + + static void vector(const ColumnString::Chars& data, const ColumnString::Offsets& offsets, + MutableColumnPtr& col_res) { + execute(data, offsets, nullptr, col_res); + } + + static void vector_nullable(const ColumnString::Chars& data, + const ColumnString::Offsets& offsets, const NullMap& nullmap, + MutableColumnPtr& col_res) { + execute(data, offsets, &nullmap, col_res); + } + template + static void execute(const ColumnString::Chars& data, const ColumnString::Offsets& offsets, + const NullMap* nullmap, MutableColumnPtr& col_res) { + auto* res_column = reinterpret_cast(col_res.get()); + auto& res_data = res_column->get_data(); + size_t size = offsets.size(); - static Status vector(const ColumnString::Chars& data, const ColumnString::Offsets& offsets, - std::vector& res, NullMap& null_map) { - auto size = offsets.size(); - res.reserve(size); for (size_t i = 0; i < size; ++i) { - res.emplace_back(); - - const char* raw_str = reinterpret_cast(&data[offsets[i - 1]]); - size_t str_size = offsets[i] - offsets[i - 1] - 1; - StringParser::ParseResult parse_result = StringParser::PARSE_SUCCESS; - uint64_t int_value = StringParser::string_to_unsigned_int(raw_str, str_size, - &parse_result); - if (LIKELY(parse_result == StringParser::PARSE_SUCCESS)) { - res.back().add(int_value); + if (arg_is_nullable && ((*nullmap)[i])) { + continue; + } else { + const char* raw_str = reinterpret_cast(&data[offsets[i - 1]]); + size_t str_size = offsets[i] - offsets[i - 1] - 1; + StringParser::ParseResult parse_result = StringParser::PARSE_SUCCESS; + uint64_t int_value = StringParser::string_to_unsigned_int( + raw_str, str_size, &parse_result); + if (LIKELY(parse_result == StringParser::PARSE_SUCCESS)) { + res_data[i].add(int_value); + } } } - return Status::OK(); } }; @@ -494,7 +509,7 @@ public: }; using FunctionBitmapEmpty = FunctionConst; -using FunctionToBitmap = FunctionBitmapAlwaysNull; +using FunctionToBitmap = FunctionAlwaysNotNullable; using FunctionBitmapFromString = FunctionBitmapAlwaysNull; using FunctionBitmapHash = FunctionAlwaysNotNullable;