Skip to content
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

minmax: fix copy index data in a wrong way (#8302) #8305

Merged
merged 1 commit into from
Nov 3, 2023
Merged

minmax: fix copy index data in a wrong way (#8302) #8305

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
29 changes: 21 additions & 8 deletions dbms/src/Storages/DeltaMerge/Index/MinMaxIndex.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ MinMaxIndexPtr MinMaxIndex::read(const IDataType & type, ReadBuffer & buf, size_
+ " vs. actual: " + std::to_string(bytes_read),
Errors::DeltaTree::Internal);
}
// NOLINTNEXTLINE (modernize-make-shared), std::make_shared does not support private constructor
return MinMaxIndexPtr(new MinMaxIndex(has_null_marks, has_value_marks, std::move(minmaxes)));
}

Expand Down Expand Up @@ -249,10 +250,13 @@ RSResult MinMaxIndex::checkNullableEqual(size_t pack_index, const Field & value,
size_t pos = pack_index * 2;
size_t prev_offset = pos == 0 ? 0 : offsets[pos - 1];
// todo use StringRef instead of String
auto min = String(chars[prev_offset], offsets[pos] - prev_offset - 1);
// When using String, we should use reinterpret_cast<const char *>(&chars[prev_offset]) instead of chars[prev_offset]
// so that it will call constructor `constexpr basic_string( const CharT* s, const Allocator& alloc = Allocator())`
// rather than `constexpr basic_string( size_type count, CharT ch, const Allocator& alloc = Allocator() );`
auto min = String(reinterpret_cast<const char *>(&chars[prev_offset]), offsets[pos] - prev_offset - 1);
pos = pack_index * 2 + 1;
prev_offset = offsets[pos - 1];
auto max = String(chars[prev_offset], offsets[pos] - prev_offset - 1);
auto max = String(reinterpret_cast<const char *>(&chars[prev_offset]), offsets[pos] - prev_offset - 1);
return RoughCheck::checkEqual<String>(value, type, min, max);
}
return RSResult::Some;
Expand Down Expand Up @@ -312,10 +316,13 @@ RSResult MinMaxIndex::checkEqual(size_t pack_index, const Field & value, const D
size_t pos = pack_index * 2;
size_t prev_offset = pos == 0 ? 0 : offsets[pos - 1];
// todo use StringRef instead of String
auto min = String(chars[prev_offset], offsets[pos] - prev_offset - 1);
// When using String, we should use reinterpret_cast<const char *>(&chars[prev_offset]) instead of chars[prev_offset]
// so that it will call constructor `constexpr basic_string( const CharT* s, const Allocator& alloc = Allocator())`
// rather than `constexpr basic_string( size_type count, CharT ch, const Allocator& alloc = Allocator() );`
auto min = String(reinterpret_cast<const char *>(&chars[prev_offset]), offsets[pos] - prev_offset - 1);
pos = pack_index * 2 + 1;
prev_offset = offsets[pos - 1];
auto max = String(chars[prev_offset], offsets[pos] - prev_offset - 1);
auto max = String(reinterpret_cast<const char *>(&chars[prev_offset]), offsets[pos] - prev_offset - 1);
return RoughCheck::checkEqual<String>(value, type, min, max);
}
return RSResult::Some;
Expand Down Expand Up @@ -378,10 +385,13 @@ RSResult MinMaxIndex::checkNullableGreater(size_t pack_index, const Field & valu
size_t pos = pack_index * 2;
size_t prev_offset = pos == 0 ? 0 : offsets[pos - 1];
// todo use StringRef instead of String
auto min = String(chars[prev_offset], offsets[pos] - prev_offset - 1);
// When using String, we should use reinterpret_cast<const char *>(&chars[prev_offset]) instead of chars[prev_offset]
// so that it will call constructor `constexpr basic_string( const CharT* s, const Allocator& alloc = Allocator())`
// rather than `constexpr basic_string( size_type count, CharT ch, const Allocator& alloc = Allocator() );`
auto min = String(reinterpret_cast<const char *>(&chars[prev_offset]), offsets[pos] - prev_offset - 1);
pos = pack_index * 2 + 1;
prev_offset = offsets[pos - 1];
auto max = String(chars[prev_offset], offsets[pos] - prev_offset - 1);
auto max = String(reinterpret_cast<const char *>(&chars[prev_offset]), offsets[pos] - prev_offset - 1);
return RoughCheck::checkGreater<String>(value, type, min, max);
}
return RSResult::Some;
Expand Down Expand Up @@ -441,10 +451,13 @@ RSResult MinMaxIndex::checkGreater(size_t pack_index, const Field & value, const
size_t pos = pack_index * 2;
size_t prev_offset = pos == 0 ? 0 : offsets[pos - 1];
// todo use StringRef instead of String
auto min = String(chars[prev_offset], offsets[pos] - prev_offset - 1);
// When using String, we should use reinterpret_cast<const char *>(&chars[prev_offset]) instead of chars[prev_offset]
// so that it will call constructor `constexpr basic_string( const CharT* s, const Allocator& alloc = Allocator())`
// rather than `constexpr basic_string( size_type count, CharT ch, const Allocator& alloc = Allocator() );`
auto min = String(reinterpret_cast<const char *>(&chars[prev_offset]), offsets[pos] - prev_offset - 1);
pos = pack_index * 2 + 1;
prev_offset = offsets[pos - 1];
auto max = String(chars[prev_offset], offsets[pos] - prev_offset - 1);
auto max = String(reinterpret_cast<const char *>(&chars[prev_offset]), offsets[pos] - prev_offset - 1);
return RoughCheck::checkGreater<String>(value, type, min, max);
}
return RSResult::Some;
Expand Down