thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 23:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge f158c0346c into 44b4bd38b9

Browse Source
This commit is contained in:
思维 2024-11-20 16:24:52 -08:00 committed by GitHub
commit 1860d6bbf0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Functions/PositionImpl.h
View File

@ -370,10 +370,14 @@ struct PositionImpl
{ {
size_t needle_size = needle_offsets[i] - prev_needle_offset - 1; size_t needle_size = needle_offsets[i] - prev_needle_offset - 1;
size_t haystack_size = haystack_offsets[i] - prev_haystack_offset - 1; size_t haystack_size = haystack_offsets[i] - prev_haystack_offset - 1;
size_t haystack_chars_size = Impl::countChars(
reinterpret_cast<const char *>(&haystack_data[prev_haystack_offset]),
reinterpret_cast<const char *>(&haystack_data[haystack_offsets[i] - 1]));
auto start = start_pos != nullptr ? std::max(start_pos->getUInt(i), UInt64(1)) : UInt64(1); auto start = start_pos != nullptr ? std::max(start_pos->getUInt(i), UInt64(1)) : UInt64(1);
if (start > haystack_size + 1) if (start > haystack_chars_size + 1)
{ {
res[i] = 0; res[i] = 0;
} }
@ -429,13 +433,15 @@ struct PositionImpl
/// NOTE You could use haystack indexing. But this is a rare case. /// NOTE You could use haystack indexing. But this is a rare case.
ColumnString::Offset prev_needle_offset = 0; ColumnString::Offset prev_needle_offset = 0;
size_t haystack_size = Impl::countChars(haystack.data(), haystack.data() + haystack.size());
for (size_t i = 0; i < input_rows_count; ++i) for (size_t i = 0; i < input_rows_count; ++i)
{ {
size_t needle_size = needle_offsets[i] - prev_needle_offset - 1; size_t needle_size = needle_offsets[i] - prev_needle_offset - 1;
auto start = start_pos != nullptr ? std::max(start_pos->getUInt(i), UInt64(1)) : UInt64(1); auto start = start_pos != nullptr ? std::max(start_pos->getUInt(i), UInt64(1)) : UInt64(1);
if (start > haystack.size() + 1) if (start > haystack_size + 1)
{ {
res[i] = 0; res[i] = 0;
} }