mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-11-25 17:12:03 +00:00
Merge f158c0346c
into 334b28f6db
This commit is contained in:
commit
2f5a66f4c0
@ -371,9 +371,13 @@ struct PositionImpl
|
||||
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_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);
|
||||
|
||||
if (start > haystack_size + 1)
|
||||
if (start > haystack_chars_size + 1)
|
||||
{
|
||||
res[i] = 0;
|
||||
}
|
||||
@ -429,13 +433,15 @@ struct PositionImpl
|
||||
/// NOTE You could use haystack indexing. But this is a rare case.
|
||||
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)
|
||||
{
|
||||
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);
|
||||
|
||||
if (start > haystack.size() + 1)
|
||||
if (start > haystack_size + 1)
|
||||
{
|
||||
res[i] = 0;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user