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

Bug fix: update range end when merging overlapping subarray ranges. #5268

Merged
merged 6 commits into from
Sep 3, 2024
Merged

Bug fix: update range end when merging overlapping subarray ranges. #5268

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cebece7
Bug fix in overlapping subarray ranges.
bekadavis9 Aug 28, 2024
ca5f07a
Use end_as() instead of end_fixed().
bekadavis9 Aug 28, 2024
eb72f38
Add test case to mimic regression test.
bekadavis9 Aug 30, 2024
6440279
Merge branch 'dev' into rd/bugfix-subarray_overlapping_ranges
KiterLuc Sep 2, 2024
367e971
Remove shouldfail.
KiterLuc Sep 2, 2024
103bf70
Fix float to double conversion issue?
KiterLuc Sep 2, 2024
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
7 changes: 5 additions & 2 deletions tiledb/sm/subarray/range_subset.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*
* The MIT License
*
* @copyright Copyright (c) 2017-2023 TileDB, Inc.
* @copyright Copyright (c) 2017-2024 TileDB, Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -169,7 +169,10 @@ struct MergeStrategy<
tail->start_as<T>() <= head_end;

if (can_merge) {
head->set_end_fixed(tail->end_fixed());
// Only update the end if the merging end is greater.
if (tail->end_as<T>() > head->end_as<T>()) {
head->set_end_fixed(tail->end_fixed());
}
merged_cells++;
} else {
head++;
Expand Down
Loading