mirrors/dragonfly
1
0
Fork 0
mirror of https://github.com/dragonflydb/dragonfly.git synced 2025-05-10 18:05:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

fix: Bug GEQ range query bug (#4557)

Browse source 
The bug was caused by incorrect handling of corner cases,
when a path that should lead to an item was wrongfully cleared, which lead
to empty results for SortedMap::GetRange query.

This PR:
1. fixes the wrong code in bptree_set.h.
2. Adds unit tests for both bptree_set_test and sorted_map_test.

Related to https://github.com/mastodon/mastodon/issues/33805

Signed-off-by: Roman Gershman <roman@dragonflydb.io>
This commit is contained in:
Roman Gershman 2025-02-04 17:06:08 +02:00 • committed by GitHub
parent 6c68519f02
commit dc3a91e083
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 53 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/core/bptree_set.h
View file

@ -489,8 +489,14 @@ template <typename T, typename Policy>
detail::BPTreePath<T> BPTree<T, Policy>::GEQ(KeyT item) const { detail::BPTreePath<T> BPTree<T, Policy>::GEQ(KeyT item) const {
BPTreePath path; BPTreePath path;
if (!Locate(item, &path) && path.Last().second >= path.Last().first->NumItems()) bool res = Locate(item, &path);
path.Clear();
// if we did not find the item and the path does not lead to any key in the node,
// adjust the path to point to the next key in the tree.
// In case we are past all items in the tree, Next() will collapse to the empty path.
if (!res && path.Last().second >= path.Last().first->NumItems()) {
path.Next();
}
return path; return path;
} }

27
src/core/bptree_set_test.cc
View file

@ -88,12 +88,16 @@ class BPTreeSetTest : public ::testing::Test {
static void SetUpTestSuite() { static void SetUpTestSuite() {
} }
void FillTree(unsigned factor = 1) { void FillTree(unsigned start, unsigned factor) {
for (unsigned i = 0; i < kNumElems; ++i) { for (unsigned i = start; i < kNumElems; ++i) {
bptree_.Insert(i * factor); bptree_.Insert(i * factor);
} }
} }
void FillTree(unsigned factor = 1) {
FillTree(0, factor);
}
bool Validate(); bool Validate();
MiMemoryResource mi_alloc_; MiMemoryResource mi_alloc_;
@ -277,6 +281,25 @@ TEST_F(BPTreeSetTest, Ranges) {
EXPECT_TRUE(path.Empty()); EXPECT_TRUE(path.Empty());
} }
TEST_F(BPTreeSetTest, HalfRanges) {
FillTree(1, 3); // 3, 6, 9 ...
auto path = bptree_.FromRank(bptree_.Size() - 1);
uint64_t val = path.Terminal();
for (unsigned i = 0; i <= val; ++i) {
path = bptree_.GEQ(i);
ASSERT_FALSE(path.Empty()) << i;
}
path = bptree_.GEQ(val + 1);
ASSERT_TRUE(path.Empty());
for (unsigned i = 3; i <= val + 10; ++i) {
path = bptree_.LEQ(i);
ASSERT_FALSE(path.Empty()) << i;
}
path = bptree_.LEQ(2);
ASSERT_TRUE(path.Empty());
}
TEST_F(BPTreeSetTest, MemoryUsage) { TEST_F(BPTreeSetTest, MemoryUsage) {
zskiplist* zsl = zslCreate(); zskiplist* zsl = zslCreate();
std::vector<sds> sds_vec; std::vector<sds> sds_vec;

20
src/core/sorted_map_test.cc
View file

@ -246,6 +246,26 @@ TEST_F(SortedMapTest, DeleteRange) {
EXPECT_EQ(96, sm_.DeleteRangeByLex(lex_range)); EXPECT_EQ(96, sm_.DeleteRangeByLex(lex_range));
} }
TEST_F(SortedMapTest, RangeBug) {
constexpr size_t kArrLen = 80;
for (unsigned i = 0; i < kArrLen; i++) {
sds s = sdsempty();
s = sdscatfmt(s, "score%u", i);
sm_.Insert(i, s);
}
for (unsigned i = 0; i < kArrLen; i++) {
zrangespec range;
range.max = HUGE_VAL;
range.min = i;
range.minex = 0;
range.maxex = 0;
auto arr = sm_.GetRange(range, 0, 5, false);
ASSERT_GT(arr.size(), 0) << i;
}
}
// not a real test, just to see how much memory is used by zskiplist. // not a real test, just to see how much memory is used by zskiplist.
TEST_F(SortedMapTest, MemoryUsage) { TEST_F(SortedMapTest, MemoryUsage) {
zskiplist* zsl = zslCreate(); zskiplist* zsl = zslCreate();