Skip to content

[fix](intersect) fix wrong result of intersect node #24044

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
yiguolei merged 1 commit into from
Sep 8, 2023
Merged

[fix](intersect) fix wrong result of intersect node #24044

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
56 changes: 25 additions & 31 deletions be/src/vec/exec/vset_operation_node.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -682,47 +682,41 @@ void VSetOperationNode<is_intersect>::refresh_hash_table() {
HashTableCtxType tmp_hash_table;
bool is_need_shrink =
arg.hash_table.should_be_shrink(_valid_element_in_hash_tbl);
if (is_need_shrink) {
if (is_intersect || is_need_shrink) {
tmp_hash_table.hash_table.init_buf_size(
_valid_element_in_hash_tbl / arg.hash_table.get_factor() + 1);
}

arg.init_once();
auto& iter = arg.iter;
auto iter_end = arg.hash_table.end();
while (iter != iter_end) {
auto& mapped = iter->get_second();
auto it = mapped.begin();

if constexpr (is_intersect) { //intersected
if (it->visited) {
it->visited = false;
if (is_need_shrink) {
tmp_hash_table.hash_table.insert(iter->get_value());
std::visit(
[&](auto is_need_shrink_const) {
while (iter != iter_end) {
auto& mapped = iter->get_second();
auto it = mapped.begin();

if constexpr (is_intersect) { //intersected
if (it->visited) {
it->visited = false;
Copy link
Contributor

@HappenLee HappenLee Sep 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no need to the work

Copy link
Contributor Author

@jacktengg jacktengg Sep 7, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You mean reset the visited flag? For intersect, clear the visited flag is necessary, since the new inserted iter->get_value() will have the value of it->visited.

tmp_hash_table.hash_table.insert(iter->get_value());
}
++iter;
} else { //except
if constexpr (is_need_shrink_const) {
if (!it->visited) {
tmp_hash_table.hash_table.insert(
iter->get_value());
}
}
++iter;
}
}
++iter;
} else {
if (!is_need_shrink) {
arg.hash_table.delete_zero_key(iter->get_first());
// the ++iter would check if the current key is zero. if it does, the iterator will be moved to the container's head.
// so we do ++iter before set_zero to make the iterator move to next valid key correctly.
auto iter_prev = iter;
++iter;
iter_prev->set_zero();
} else {
++iter;
}
}
} else { //except
if (!it->visited && is_need_shrink) {
tmp_hash_table.hash_table.insert(iter->get_value());
}
++iter;
}
}
},
make_bool_variant(is_need_shrink));

arg.inited = false;
if (is_need_shrink) {
if (is_intersect || is_need_shrink) {
arg.hash_table = std::move(tmp_hash_table.hash_table);
}
} else {
Expand Down
Loading