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

Fix flapping B-Tree tests #4375

Merged
merged 2 commits into from
May 13, 2024
Merged

Fix flapping B-Tree tests #4375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8777c6c
mark util/btree_benchmark large
kunga May 7, 2024
f039ba7
decrease btree checks when sanitized
kunga May 7, 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
37 changes: 37 additions & 0 deletions ydb/core/tablet_flat/ut/ut_btree_index_iter_charge.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,10 +446,17 @@ Y_UNIT_TEST_SUITE(TChargeBTreeIndex) {
}

void CheckChargeRowId(TTestParams params, const TPartStore& part, TTagsRef tags, const TKeyCellDefaults *keyDefaults) {
#if !defined(_tsan_enabled_) && !defined(_msan_enabled_) && !defined(_asan_enabled_)
for (bool reverse : {false, true}) {
for (ui64 itemsLimit : TVector<ui64>{0, 1, 2, 5, 13, 19, part.Stat.Rows - 2, part.Stat.Rows - 1}) {
for (TRowId rowId1 : xrange<TRowId>(0, part.Stat.Rows - 1)) {
for (TRowId rowId2 : xrange<TRowId>(rowId1, part.Stat.Rows - 1)) {
#else
for (bool reverse : {false, true}) {
for (ui64 itemsLimit : TVector<ui64>{0, 5, part.Stat.Rows - 1}) {
for (TRowId rowId1 : xrange<TRowId>(0, part.Stat.Rows - 1, 3)) {
for (TRowId rowId2 : xrange<TRowId>(rowId1, part.Stat.Rows - 1, 3)) {
#endif
TTouchEnv bTreeEnv, flatEnv;
TChargeBTreeIndex bTree(&bTreeEnv, part, tags, true);
TChargeFlatIndex flat(&flatEnv, part, tags, true);
Expand All @@ -467,12 +474,21 @@ Y_UNIT_TEST_SUITE(TChargeBTreeIndex) {
}

void CheckChargeKeys(TTestParams params, const TPartStore& part, TTagsRef tags, const TKeyCellDefaults *keyDefaults) {
#if !defined(_tsan_enabled_) && !defined(_msan_enabled_) && !defined(_asan_enabled_)
for (bool reverse : {false, true}) {
for (ui64 itemsLimit : TVector<ui64>{0, 1, 2, 5, 13, 19, part.Stat.Rows - 2, part.Stat.Rows - 1}) {
for (ui32 firstCellKey1 : xrange<ui32>(0, part.Stat.Rows / 7 + 1)) {
for (ui32 secondCellKey1 : xrange<ui32>(0, 14)) {
for (ui32 firstCellKey2 : xrange<ui32>(0, part.Stat.Rows / 7 + 1)) {
for (ui32 secondCellKey2 : xrange<ui32>(0, 14)) {
#else
for (bool reverse : {false, true}) {
for (ui64 itemsLimit : TVector<ui64>{0, 5, part.Stat.Rows - 1}) {
for (ui32 firstCellKey1 : xrange<ui32>(0, part.Stat.Rows / 7 + 1)) {
for (ui32 secondCellKey1 : xrange<ui32>(10, 14)) {
for (ui32 firstCellKey2 : xrange<ui32>(0, part.Stat.Rows / 7 + 1)) {
for (ui32 secondCellKey2 : xrange<ui32>(10, 14)) {
#endif
TVector<TCell> key1 = MakeKey(firstCellKey1, secondCellKey1);
TVector<TCell> key2 = MakeKey(firstCellKey2, secondCellKey2);

Expand Down Expand Up @@ -511,10 +527,17 @@ Y_UNIT_TEST_SUITE(TChargeBTreeIndex) {
}

void CheckChargeBytesLimit(TTestParams params, const TPartStore& part, TTagsRef tags, const TKeyCellDefaults *keyDefaults) {
#if !defined(_tsan_enabled_) && !defined(_msan_enabled_) && !defined(_asan_enabled_)
for (bool reverse : {false, true}) {
for (ui64 bytesLimit : xrange<ui64>(1, part.Stat.Bytes + 100, part.Stat.Bytes / 100)) {
for (ui32 firstCellKey1 : xrange<ui32>(0, part.Stat.Rows / 7 + 1)) {
for (ui32 secondCellKey1 : xrange<ui32>(0, 14)) {
#else
for (bool reverse : {false, true}) {
for (ui64 bytesLimit : TVector<ui64>{1l, part.Stat.Bytes / 3}) {
for (ui32 firstCellKey1 : xrange<ui32>(0, part.Stat.Rows / 7 + 1)) {
for (ui32 secondCellKey1 : xrange<ui32>(10, 14)) {
#endif
TVector<TCell> key1 = MakeKey(firstCellKey1, secondCellKey1);

TTouchEnv limitedEnv, unlimitedEnv;
Expand Down Expand Up @@ -752,9 +775,15 @@ Y_UNIT_TEST_SUITE(TPartBtreeIndexIteration) {
tags.push_back(c.Tag);
}

#if !defined(_tsan_enabled_) && !defined(_msan_enabled_) && !defined(_asan_enabled_)
for (ESeek seek : {ESeek::Exact, ESeek::Lower, ESeek::Upper}) {
for (ui32 firstCell : xrange<ui32>(0, part.Stat.Rows / 7 + 1)) {
for (ui32 secondCell : xrange<ui32>(0, 14)) {
#else
for (ESeek seek : {ESeek::Exact, ESeek::Lower, ESeek::Upper}) {
for (ui32 firstCell : xrange<ui32>(0, part.Stat.Rows / 7 + 1)) {
for (ui32 secondCell : xrange<ui32>(10, 14)) {
#endif
TVector<TCell> key = MakeKey(firstCell, secondCell);

TTouchEnv bTreeEnv, flatEnv;
Expand Down Expand Up @@ -804,11 +833,19 @@ Y_UNIT_TEST_SUITE(TPartBtreeIndexIteration) {
tags.push_back(c.Tag);
}

#if !defined(_tsan_enabled_) && !defined(_msan_enabled_) && !defined(_asan_enabled_)
for (ui64 itemsLimit : part.Slices->size() > 1 ? TVector<ui64>{0, 1, 2, 5} : TVector<ui64>{0, 1, 2, 5, 13, 19, part.Stat.Rows - 2, part.Stat.Rows - 1}) {
for (ui32 firstCellKey1 : xrange<ui32>(0, part.Stat.Rows / 7 + 1)) {
for (ui32 secondCellKey1 : xrange<ui32>(0, 14)) {
for (ui32 firstCellKey2 : xrange<ui32>(0, part.Stat.Rows / 7 + 1)) {
for (ui32 secondCellKey2 : xrange<ui32>(0, 14)) {
#else
for (ui64 itemsLimit : part.Slices->size() > 1 ? TVector<ui64>{0, 3} : TVector<ui64>{0, 5, part.Stat.Rows - 1}) {
for (ui32 firstCellKey1 : xrange<ui32>(0, part.Stat.Rows / 7 + 1)) {
for (ui32 secondCellKey1 : xrange<ui32>(10, 14)) {
for (ui32 firstCellKey2 : xrange<ui32>(0, part.Stat.Rows / 7 + 1)) {
for (ui32 secondCellKey2 : xrange<ui32>(10, 14)) {
#endif
TVector<TCell> key1 = MakeKey(firstCellKey1, secondCellKey1);
TVector<TCell> key2 = MakeKey(firstCellKey2, secondCellKey2);

Expand Down
4 changes: 4 additions & 0 deletions ydb/core/util/btree_benchmark/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
Y_BENCHMARK()

TAG(ya:fat)
SIZE(LARGE)
TIMEOUT(600)

ALLOCATOR(LF)

PEERDIR(
Expand Down
Loading