Skip to content

[fix] fix ltrim result may incorrect in some case #7963

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.

Sign up for GitHub

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

Merged
morningman merged 1 commit into from
Feb 9, 2022
Merged

[fix] fix ltrim result may incorrect in some case #7963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion be/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,6 @@ else()
${DORIS_DEPENDENCIES}
${WL_START_GROUP}
${X86_DEPENDENCIES}
${WL_END_GROUP}
)
endif()

Expand All @@ -690,6 +689,8 @@ if (WITH_MYSQL)
)
endif()

set(DORIS_DEPENDENCIES ${DORIS_DEPENDENCIES} ${WL_END_GROUP})

message(STATUS "DORIS_DEPENDENCIES is ${DORIS_DEPENDENCIES}")

# Add all external dependencies. They should come after the palo libs.
Expand Down
219 changes: 0 additions & 219 deletions be/src/exprs/v_string_functions.h
View file
Open in desktop

This file was deleted.

17 changes: 8 additions & 9 deletions be/src/vec/functions/function_string.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
#include <cstdlib>
#include <string_view>

#include "exprs/v_string_functions.h"
#include "runtime/string_search.hpp"
#include "util/encryption_util.h"
#include "util/simd/vstring_function.h"
#include "util/url_coding.h"
#include "vec/common/pod_array_fwd.h"
#include "vec/functions/function_string_to_string.h"
Expand Down Expand Up @@ -258,8 +258,8 @@ struct ReverseImpl {
auto src_str = reinterpret_cast<const char*>(&data[offsets[i - 1]]);
int64_t src_len = offsets[i] - offsets[i - 1] - 1;
char dst[src_len];
VStringFunctions::reverse(StringVal((uint8_t*)src_str, src_len),
StringVal((uint8_t*)dst, src_len));
simd::VStringFunctions::reverse(StringVal((uint8_t*)src_str, src_len),
StringVal((uint8_t*)dst, src_len));
StringOP::push_value_string(std::string_view(dst, src_len), i, res_data, res_offsets);
}
return Status::OK();
Expand All @@ -271,9 +271,7 @@ struct HexStringName {
};

struct HexStringImpl {
static DataTypes get_variadic_argument_types() {
return {std::make_shared<DataTypeString>()};
}
static DataTypes get_variadic_argument_types() { return {std::make_shared<DataTypeString>()}; }

static Status vector(const ColumnString::Chars& data, const ColumnString::Offsets& offsets,
ColumnString::Chars& dst_data, ColumnString::Offsets& dst_offsets) {
Expand All @@ -293,7 +291,8 @@ struct HexStringImpl {
dst_data_ptr++;
offset++;
} else {
VStringFunctions::hex_encode(source, srclen, reinterpret_cast<char*>(dst_data_ptr));
simd::VStringFunctions::hex_encode(source, srclen,
reinterpret_cast<char*>(dst_data_ptr));
dst_data_ptr[srclen * 2] = '\0';
dst_data_ptr += (srclen * 2 + 1);
offset += (srclen * 2 + 1);
Expand Down Expand Up @@ -355,10 +354,10 @@ struct TrimImpl {
const char* raw_str = reinterpret_cast<const char*>(&data[offsets[i - 1]]);
StringVal str(raw_str);
if constexpr (is_ltrim) {
str = VStringFunctions::ltrim(str);
str = simd::VStringFunctions::ltrim(str);
}
if constexpr (is_rtrim) {
str = VStringFunctions::rtrim(str);
str = simd::VStringFunctions::rtrim(str);
}
StringOP::push_value_string(std::string_view((char*)str.ptr, str.len), i, res_data,
res_offsets);
Expand Down
Loading