Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

backport bug-fix (#9255)

This commit is contained in:
Andrey Abramov 2019-06-12 16:20:35 +03:00 committed by GitHub
parent 677ffdc692
commit 1982a55f54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
3rdParty/iresearch/core/search/sort.cpp vendored
View File

@ -133,11 +133,11 @@ order::prepared order::prepare() const {
const auto score_size = prepared->score_size(); const auto score_size = prepared->score_size();
assert(score_size.second <= ALIGNOF(MAX_ALIGN_T)); assert(score_size.second <= ALIGNOF(MAX_ALIGN_T));
assert(score_size.second && math::is_power2(score_size.second)); assert(math::is_power2(score_size.second)); // math::is_power2(0) returns true
const auto stats_size = prepared->stats_size(); const auto stats_size = prepared->stats_size();
assert(stats_size.second <= ALIGNOF(MAX_ALIGN_T)); assert(stats_size.second <= ALIGNOF(MAX_ALIGN_T));
assert(stats_size.second && math::is_power2(stats_size.second)); assert(math::is_power2(stats_size.second)); // math::is_power2(0) returns true
stats_align = std::max(stats_align, stats_size.second); stats_align = std::max(stats_align, stats_size.second);
score_align = std::max(score_align, score_size.second); score_align = std::max(score_align, score_size.second);
@ -346,7 +346,7 @@ void order::prepared::prepare_score(byte_type* score) const {
void order::prepared::prepare_stats(byte_type* stats) const { void order::prepared::prepare_stats(byte_type* stats) const {
for (auto& sort : order_) { for (auto& sort : order_) {
assert(sort.bucket); assert(sort.bucket);
sort.bucket->prepare_score(stats + sort.stats_offset); sort.bucket->prepare_stats(stats + sort.stats_offset);
} }
} }