Skip to content

[fix](bitmap) incorrect type of BitmapValue with fastunion (#36834) #36896

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

Merged
HappenLee merged 1 commit into from
Jun 28, 2024
Merged

[fix](bitmap) incorrect type of BitmapValue with fastunion (#36834) #36896

Show file tree
Hide file tree
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
5 changes: 3 additions & 2 deletions be/src/util/bitmap_value.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1652,7 +1652,6 @@ class BitmapValue {
case SINGLE: {
_set.insert(_sv);
_type = SET;
_convert_to_bitmap_if_need();
break;
}
case BITMAP:
Expand All @@ -1663,10 +1662,12 @@ class BitmapValue {
_type = BITMAP;
break;
case SET: {
_convert_to_bitmap_if_need();
break;
}
}
if (_type == SET) {
_convert_to_bitmap_if_need();
}
}

if (_type == EMPTY && single_values.size() == 1) {
Expand Down
23 changes: 23 additions & 0 deletions be/test/util/bitmap_value_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1026,6 +1026,29 @@ TEST(BitmapValueTest, bitmap_union) {
EXPECT_EQ(3, bitmap3.cardinality());
bitmap3.fastunion({&bitmap});
EXPECT_EQ(5, bitmap3.cardinality());

const auto old_config = config::enable_set_in_bitmap_value;
config::enable_set_in_bitmap_value = true;
BitmapValue bitmap4; // empty

BitmapValue bitmap_set1;
BitmapValue bitmap_set2;
BitmapValue bitmap_set3;

const int set_data1[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
bitmap_set1.add_many(set_data1, 15);

const int set_data2[] = {16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30};
bitmap_set2.add_many(set_data2, 15);

const int set_data3[] = {31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45};
bitmap_set3.add_many(set_data3, 15);

bitmap4.fastunion({&bitmap_set1, &bitmap_set2, &bitmap_set3});

EXPECT_EQ(bitmap4.cardinality(), 45);
EXPECT_EQ(bitmap4.get_type_code(), BitmapTypeCode::BITMAP32);
config::enable_set_in_bitmap_value = old_config;
}

TEST(BitmapValueTest, bitmap_intersect) {
Expand Down