Skip to content

Commit

Permalink
[BUG] fix some extra memory in bitmap operate (apache#5857)
Browse files Browse the repository at this point in the history
  • Loading branch information
@stdpain
stdpain authored May 22, 2021
1 parent 591d391 commit 659d634
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
18 changes: 9 additions & 9 deletions be/src/util/bitmap_value.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ class Roaring64Map {
}
return std::accumulate(
roarings.cbegin(), roarings.cend(), (uint64_t)0,
[](uint64_t previous, const std::pair<uint32_t, Roaring>& map_entry) {
[](uint64_t previous, const std::pair<const uint32_t, Roaring>& map_entry) {
return previous + map_entry.second.cardinality();
});
}
Expand All @@ -326,7 +326,7 @@ class Roaring64Map {
*/
bool isEmpty() const {
return std::all_of(roarings.cbegin(), roarings.cend(),
[](const std::pair<uint32_t, Roaring>& map_entry) {
[](const std::pair<const uint32_t, Roaring>& map_entry) {
return map_entry.second.isEmpty();
});
}
Expand All @@ -341,7 +341,7 @@ class Roaring64Map {
// to avoid a clash with the Windows.h header under Windows
return roarings.size() == ((size_t)(std::numeric_limits<uint32_t>::max)()) + 1
? std::all_of(roarings.cbegin(), roarings.cend(),
[](const std::pair<uint32_t, Roaring>& roaring_map_entry) {
[](const std::pair<const uint32_t, Roaring>& roaring_map_entry) {
// roarings within map are saturated if cardinality
// is uint32_t max + 1
return roaring_map_entry.second.cardinality() ==
Expand Down Expand Up @@ -384,7 +384,7 @@ class Roaring64Map {
// Annoyingly, VS 2017 marks std::accumulate() as [[nodiscard]]
(void)std::accumulate(
roarings.cbegin(), roarings.cend(), ans,
[](uint64_t* previous, const std::pair<uint32_t, Roaring>& map_entry) {
[](uint64_t* previous, const std::pair<const uint32_t, Roaring>& map_entry) {
for (uint32_t low_bits : map_entry.second)
*previous++ = uniteBytes(map_entry.first, low_bits);
return previous;
Expand Down Expand Up @@ -527,7 +527,7 @@ class Roaring64Map {
*/
void iterate(roaring_iterator64 iterator, void* ptr) const {
std::for_each(roarings.begin(), roarings.cend(),
[=](const std::pair<uint32_t, Roaring>& map_entry) {
[=](const std::pair<const uint32_t, Roaring>& map_entry) {
roaring_iterate64(&map_entry.second.roaring, iterator,
uint64_t(map_entry.first) << 32, ptr);
});
Expand Down Expand Up @@ -595,7 +595,7 @@ class Roaring64Map {
// push map size
buf = (char*)encode_varint64((uint8_t*)buf, roarings.size());
std::for_each(roarings.cbegin(), roarings.cend(),
[&buf](const std::pair<uint32_t, Roaring>& map_entry) {
[&buf](const std::pair<const uint32_t, Roaring>& map_entry) {
// push map key
encode_fixed32_le((uint8_t*)buf, map_entry.first);
buf += sizeof(uint32_t);
Expand Down Expand Up @@ -657,7 +657,7 @@ class Roaring64Map {
// start with type code, map size and size of keys for each map entry
size_t init = 1 + varint_length(roarings.size()) + roarings.size() * sizeof(uint32_t);
return std::accumulate(roarings.cbegin(), roarings.cend(), init,
[=](size_t previous, const std::pair<uint32_t, Roaring>& map_entry) {
[=](size_t previous, const std::pair<const uint32_t, Roaring>& map_entry) {
// add in bytes used by each Roaring
return previous + map_entry.second.getSizeInBytes();
});
Expand Down Expand Up @@ -731,7 +731,7 @@ class Roaring64Map {
},
(void*)&outer_iter_data);
std::for_each(
++map_iter, roarings.cend(), [](const std::pair<uint32_t, Roaring>& map_entry) {
++map_iter, roarings.cend(), [](const std::pair<const uint32_t, Roaring>& map_entry) {
map_entry.second.iterate(
[](uint32_t low_bits, void* high_bits) -> bool {
std::printf(",%llu", (long long unsigned)uniteBytes(
Expand Down Expand Up @@ -770,7 +770,7 @@ class Roaring64Map {
(void*)&outer_iter_data);
std::for_each(
++map_iter, roarings.cend(),
[&outer_iter_data](const std::pair<uint32_t, Roaring>& map_entry) {
[&outer_iter_data](const std::pair<const uint32_t, Roaring>& map_entry) {
outer_iter_data.high_bits = map_entry.first;
map_entry.second.iterate(
[](uint32_t low_bits, void* inner_iter_data) -> bool {
Expand Down
18 changes: 9 additions & 9 deletions contrib/udf/src/udaf_orthogonal_bitmap/bitmap_value.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ class Roaring64Map {
}
return std::accumulate(
roarings.cbegin(), roarings.cend(), (uint64_t)0,
[](uint64_t previous, const std::pair<uint32_t, Roaring>& map_entry) {
[](uint64_t previous, const std::pair<const uint32_t, Roaring>& map_entry) {
return previous + map_entry.second.cardinality();
});
}
Expand All @@ -400,7 +400,7 @@ class Roaring64Map {
*/
bool isEmpty() const {
return std::all_of(roarings.cbegin(), roarings.cend(),
[](const std::pair<uint32_t, Roaring>& map_entry) {
[](const std::pair<const uint32_t, Roaring>& map_entry) {
return map_entry.second.isEmpty();
});
}
Expand All @@ -415,7 +415,7 @@ class Roaring64Map {
// to avoid a clash with the Windows.h header under Windows
return roarings.size() == ((size_t)(std::numeric_limits<uint32_t>::max)()) + 1
? std::all_of(roarings.cbegin(), roarings.cend(),
[](const std::pair<uint32_t, Roaring>& roaring_map_entry) {
[](const std::pair<const uint32_t, Roaring>& roaring_map_entry) {
// roarings within map are saturated if cardinality
// is uint32_t max + 1
return roaring_map_entry.second.cardinality() ==
Expand Down Expand Up @@ -458,7 +458,7 @@ class Roaring64Map {
// Annoyingly, VS 2017 marks std::accumulate() as [[nodiscard]]
(void)std::accumulate(
roarings.cbegin(), roarings.cend(), ans,
[](uint64_t* previous, const std::pair<uint32_t, Roaring>& map_entry) {
[](uint64_t* previous, const std::pair<const uint32_t, Roaring>& map_entry) {
for (uint32_t low_bits : map_entry.second)
*previous++ = uniteBytes(map_entry.first, low_bits);
return previous;
Expand Down Expand Up @@ -601,7 +601,7 @@ class Roaring64Map {
*/
void iterate(roaring_iterator64 iterator, void* ptr) const {
std::for_each(roarings.begin(), roarings.cend(),
[=](const std::pair<uint32_t, Roaring>& map_entry) {
[=](const std::pair<const uint32_t, Roaring>& map_entry) {
roaring_iterate64(&map_entry.second.roaring, iterator,
uint64_t(map_entry.first) << 32, ptr);
});
Expand Down Expand Up @@ -669,7 +669,7 @@ class Roaring64Map {
// push map size
buf = (char*)encode_varint64((uint8_t*)buf, roarings.size());
std::for_each(roarings.cbegin(), roarings.cend(),
[&buf](const std::pair<uint32_t, Roaring>& map_entry) {
[&buf](const std::pair<const uint32_t, Roaring>& map_entry) {
// push map key
encode_fixed32_le((uint8_t*)buf, map_entry.first);
buf += sizeof(uint32_t);
Expand Down Expand Up @@ -731,7 +731,7 @@ class Roaring64Map {
// start with type code, map size and size of keys for each map entry
size_t init = 1 + varint_length(roarings.size()) + roarings.size() * sizeof(uint32_t);
return std::accumulate(roarings.cbegin(), roarings.cend(), init,
[=](size_t previous, const std::pair<uint32_t, Roaring>& map_entry) {
[=](size_t previous, const std::pair<const uint32_t, Roaring>& map_entry) {
// add in bytes used by each Roaring
return previous + map_entry.second.getSizeInBytes();
});
Expand Down Expand Up @@ -805,7 +805,7 @@ class Roaring64Map {
},
(void*)&outer_iter_data);
std::for_each(
++map_iter, roarings.cend(), [](const std::pair<uint32_t, Roaring>& map_entry) {
++map_iter, roarings.cend(), [](const std::pair<const uint32_t, Roaring>& map_entry) {
map_entry.second.iterate(
[](uint32_t low_bits, void* high_bits) -> bool {
std::printf(",%llu", (long long unsigned)uniteBytes(
Expand Down Expand Up @@ -844,7 +844,7 @@ class Roaring64Map {
(void*)&outer_iter_data);
std::for_each(
++map_iter, roarings.cend(),
[&outer_iter_data](const std::pair<uint32_t, Roaring>& map_entry) {
[&outer_iter_data](const std::pair<const uint32_t, Roaring>& map_entry) {
outer_iter_data.high_bits = map_entry.first;
map_entry.second.iterate(
[](uint32_t low_bits, void* inner_iter_data) -> bool {
Expand Down

0 comments on commit 659d634

Please sign in to comment.