@@ -903,13 +903,12 @@ Y_UNIT_TEST_SUITE(TPartBtreeIndexIteration) {
903903 tags.push_back (c.Tag );
904904 }
905905
906- #if !defined(_tsan_enabled_) && !defined(_msan_enabled_) && !defined(_asan_enabled_)
907- for (auto [readLo, readHi] : TVector<std::pair<ui32, ui32>>{{1 , 1 }}) { // TODO
906+ for (auto [readLo, readHi] : TVector<std::pair<ui32, ui32>>{{512 , 1024 }}) {
908907 for (ESeek seek : {ESeek::Exact, ESeek::Lower, ESeek::Upper}) {
908+ #if !defined(_tsan_enabled_) && !defined(_msan_enabled_) && !defined(_asan_enabled_)
909909 for (ui32 firstCell : xrange<ui32>(0 , part.Stat .Rows / 7 + 1 )) {
910910 for (ui32 secondCell : xrange<ui32>(0 , 14 )) {
911911 #else
912- for (ESeek seek : {ESeek::Exact, ESeek::Lower, ESeek::Upper}) {
913912 for (ui32 firstCell : xrange<ui32>(0 , part.Stat .Rows / 7 + 1 )) {
914913 for (ui32 secondCell : xrange<ui32>(10 , 14 )) {
915914 #endif
@@ -985,11 +984,11 @@ Y_UNIT_TEST_SUITE(TPartBtreeIndexIteration) {
985984 }
986985
987986 #if !defined(_tsan_enabled_) && !defined(_msan_enabled_) && !defined(_asan_enabled_)
988- for (ui64 itemsLimit : params.Groups || params.History || params.Slices ? TVector<ui64>{0 , 1 , 2 , 5 } : TVector<ui64>{0 , 1 , 2 , 5 , 13 , 19 , part.Stat .Rows - 2 , part.Stat .Rows - 1 }) {
987+ for (ui64 itemsLimit : params.Groups || params.History || params.Slices ? TVector<ui64>{0 , 3 } : TVector<ui64>{0 , 1 , 2 , 5 , 13 , 19 , part.Stat .Rows - 2 , part.Stat .Rows - 1 }) {
989988 for (ui32 firstCellKey1 : xrange<ui32>(0 , part.Stat .Rows / 7 + 1 )) {
990989 for (ui32 secondCellKey1 : xrange<ui32>(0 , 14 )) {
991- for (ui32 firstCellKey2 : xrange<ui32>(0 , part.Stat .Rows / 7 + 1 )) {
992- for (ui32 secondCellKey2 : xrange<ui32>(0 , itemsLimit ? 0 : 14 )) {
990+ for (ui32 firstCellKey2 : xrange<ui32>(0 , itemsLimit ? 1 : part.Stat .Rows / 7 + 1 )) {
991+ for (ui32 secondCellKey2 : xrange<ui32>(0 , itemsLimit ? 1 : 14 )) {
993992 #else
994993 for (ui64 itemsLimit : params.Groups || params.History || params.Slices ? TVector<ui64>{0 , 3 } : TVector<ui64>{0 , 5 , part.Stat .Rows - 1 }) {
995994 for (ui32 firstCellKey1 : xrange<ui32>(0 , part.Stat .Rows / 7 + 1 )) {
@@ -1075,19 +1074,19 @@ Y_UNIT_TEST_SUITE(TPartBtreeIndexIteration) {
10751074 }
10761075
10771076 Y_UNIT_TEST (OneNode_Groups_Slices) {
1078- for (auto slices : xrange<ui32>(TTestParams::ESlices::None + 1 , TTestParams::ESlices::UpperLoopLimit )) {
1077+ for (auto slices : xrange<ui32>(TTestParams::ESlices::None + 1 , TTestParams::ESlices::Many + 1 )) {
10791078 CheckPart ({.Levels = 1 , .Groups = true , .Slices = TTestParams::ESlices (slices)});
10801079 }
10811080 }
10821081
10831082 Y_UNIT_TEST (OneNode_History_Slices) {
1084- for (auto slices : xrange<ui32>(TTestParams::ESlices::None + 1 , TTestParams::ESlices::UpperLoopLimit )) {
1083+ for (auto slices : xrange<ui32>(TTestParams::ESlices::None + 1 , TTestParams::ESlices::Many + 1 )) {
10851084 CheckPart ({.Levels = 1 , .History = true , .Slices = TTestParams::ESlices (slices)});
10861085 }
10871086 }
10881087
10891088 Y_UNIT_TEST (OneNode_Groups_History_Slices) {
1090- for (auto slices : xrange<ui32>(TTestParams::ESlices::None + 1 , TTestParams::ESlices::UpperLoopLimit )) {
1089+ for (auto slices : xrange<ui32>(TTestParams::ESlices::None + 1 , TTestParams::ESlices::Many + 1 )) {
10911090 CheckPart ({.Levels = 1 , .Groups = true , .History = true , .Slices = TTestParams::ESlices (slices)});
10921091 }
10931092 }
@@ -1115,25 +1114,25 @@ Y_UNIT_TEST_SUITE(TPartBtreeIndexIteration) {
11151114 }
11161115
11171116 Y_UNIT_TEST (FewNodes_Groups_Slices) {
1118- for (auto slices : xrange<ui32>(TTestParams::ESlices::None + 1 , TTestParams::ESlices::UpperLoopLimit )) {
1117+ for (auto slices : xrange<ui32>(TTestParams::ESlices::None + 1 , TTestParams::ESlices::Many + 1 )) {
11191118 CheckPart ({.Levels = 3 , .Groups = true , .Slices = TTestParams::ESlices (slices)});
11201119 }
11211120 }
11221121
11231122 Y_UNIT_TEST (FewNodes_History_Slices) {
1124- for (auto slices : xrange<ui32>(TTestParams::ESlices::None + 1 , TTestParams::ESlices::UpperLoopLimit )) {
1123+ for (auto slices : xrange<ui32>(TTestParams::ESlices::None + 1 , TTestParams::ESlices::Many + 1 )) {
11251124 CheckPart ({.Levels = 3 , .History = true , .Slices = TTestParams::ESlices (slices)});
11261125 }
11271126 }
11281127
11291128 Y_UNIT_TEST (FewNodes_Groups_History_Slices) {
1130- for (auto slices : xrange<ui32>(TTestParams::ESlices::None + 1 , TTestParams::ESlices::UpperLoopLimit )) {
1129+ for (auto slices : xrange<ui32>(TTestParams::ESlices::None + 1 , TTestParams::ESlices::Many + 1 )) {
11311130 CheckPart ({.Levels = 3 , .Groups = true , .History = true , .Slices = TTestParams::ESlices (slices)});
11321131 }
11331132 }
11341133
11351134 Y_UNIT_TEST (FewNodes_Groups_History_Slices_Sticky) {
1136- for (auto slices : xrange<ui32>(TTestParams::ESlices::None + 1 , TTestParams::ESlices::UpperLoopLimit )) {
1135+ for (auto slices : xrange<ui32>(TTestParams::ESlices::None + 1 , TTestParams::ESlices::Many + 1 )) {
11371136 CheckPart ({.Levels = 3 , .Groups = true , .History = true , .Slices = TTestParams::ESlices (slices), .StickSomePages = true });
11381137 }
11391138 }
0 commit comments