Merge 3693cb5 into 052ab22

Author: kunga

ydb/core/tablet_flat/benchmark/b_part.cpp

@@ -37,8 +37,6 @@ namespace {
 
         conf.WriteBTreeIndex = writeBTreeIndex;
 
-        conf.SliceSize = conf.Group(0).PageSize * 4;
-
         return conf;
     }
 
@@ -48,24 +46,33 @@ namespace {
         void SetUp(::benchmark::State& state) 
         {
             const bool useBTree = state.range(0);
-            const bool groups = state.range(1);
-            const bool history = state.range(2);
+            const ui32 partsCount = state.range(1);
+            const bool groups = state.range(2);
+            const bool history = state.range(3);
 
             ui64 rows = history ? 300000 : 1000000;
             if (BENCHMARK_MAKE_LARGE_PART) {
                 rows *= 10;
             }
             Mass = new NTest::TMass(new NTest::TModelStd(groups), rows);
-            Subset = TMake(*Mass, PageConf(Mass->Model->Scheme->Families.size(), useBTree)).Mixed(0, 1, TMixerOne{ }, history ? 0.7 : 0);
+            Subset = TMake(*Mass, PageConf(Mass->Model->Scheme->Families.size(), useBTree)).Mixed(0, partsCount, TMixerRnd(partsCount), history ? 0.7 : 0);
 
+            ui64 dataBytes = 0, dataPages = 0, indexBytes = 0;
+            ui32 bTreeLevels = 0;
             for (const auto& part : Subset->Flatten) { // single part
-                state.counters["DataBytes"] = part->Stat.Bytes;
-                state.counters["DataPages"] = IndexTools::CountMainPages(*part);
-                state.counters["IndexBytes"] = part->IndexesRawSize;
+                dataBytes += part->Stat.Bytes;
+                dataPages += IndexTools::CountMainPages(*part);
+                indexBytes += part->IndexesRawSize;
                 if (useBTree) {
-                    state.counters["Levels{0}"] = part->IndexPages.BTreeGroups[0].LevelCount;
+                    bTreeLevels = Max(bTreeLevels, part->IndexPages.BTreeGroups[0].LevelCount);
                 }
             }
+            state.counters["DataBytes"] = dataBytes;
+            state.counters["DataPages"] = dataPages;
+            state.counters["IndexBytes"] = indexBytes;
+            if (useBTree) {
+                state.counters["Levels{0}"] = bTreeLevels;
+            }
 
             if (history) {
                 Checker = new TCheckIter(*Subset, {new TTestEnv()}, TRowVersion(0, 8));
@@ -150,7 +157,7 @@ BENCHMARK_DEFINE_F(TPartFixture, Prev)(benchmark::State& state) {
 
 BENCHMARK_DEFINE_F(TPartFixture, SeekKey)(benchmark::State& state) {
     const bool useBTree = state.range(0);
-    const ESeek seek = ESeek(state.range(3));
+    const ESeek seek = ESeek(state.range(4));
 
     TRowTool rowTool(*Subset->Scheme);
     auto tags = TVector<TTag>();
@@ -178,9 +185,9 @@ BENCHMARK_DEFINE_F(TPartFixture, SeekKey)(benchmark::State& state) {
 }
 
 BENCHMARK_DEFINE_F(TPartFixture, DoReads)(benchmark::State& state) {
-    const bool reverse = state.range(3);
-    const ESeek seek = static_cast<ESeek>(state.range(4));
-    const ui32 items = state.range(5);
+    const bool reverse = state.range(4);
+    const ESeek seek = static_cast<ESeek>(state.range(5));
+    const ui32 items = state.range(6);
 
     for (auto _ : state) {
         auto it = Mass->Saved.Any(Rnd);
@@ -200,8 +207,8 @@ BENCHMARK_DEFINE_F(TPartFixture, DoReads)(benchmark::State& state) {
 }
 
 BENCHMARK_DEFINE_F(TPartFixture, DoCharge)(benchmark::State& state) {
-    const bool reverse = state.range(3);
-    const ui32 items = state.range(4);
+    const bool reverse = state.range(4);
+    const ui32 items = state.range(5);
 
     auto tags = TVector<TTag>();
     for (auto c : Subset->Scheme->Cols) {
@@ -233,27 +240,31 @@ BENCHMARK_DEFINE_F(TPartFixture, BuildStats)(benchmark::State& state) {
 BENCHMARK_REGISTER_F(TPartFixture, SeekRowId)
     ->ArgsProduct({
         /* b-tree */ {0, 1},
+        /* parts */ {4},
         /* groups: */ {0, 1},
         /* history: */ {0}})
     ->Unit(benchmark::kMicrosecond);
 
 BENCHMARK_REGISTER_F(TPartFixture, Next)
     ->ArgsProduct({
         /* b-tree */ {0, 1},
+        /* parts */ {4},
         /* groups: */ {0, 1},
         /* history: */ {0}})
     ->Unit(benchmark::kMicrosecond);
 
 BENCHMARK_REGISTER_F(TPartFixture, Prev)
     ->ArgsProduct({
         /* b-tree */ {0, 1},
+        /* parts */ {4},
         /* groups: */ {0, 1},
         /* history: */ {0}})
     ->Unit(benchmark::kMicrosecond);
 
 BENCHMARK_REGISTER_F(TPartFixture, SeekKey)
     ->ArgsProduct({
         /* b-tree */ {0, 1},
+        /* parts */ {4},
         /* groups: */ {0, 1},
         /* history: */ {0},
         /* ESeek: */ {1}})
@@ -262,6 +273,7 @@ BENCHMARK_REGISTER_F(TPartFixture, SeekKey)
 BENCHMARK_REGISTER_F(TPartFixture, DoReads)
     ->ArgsProduct({
         /* b-tree */ {0, 1},
+        /* parts */ {4},
         /* groups: */ {1},
         /* history: */ {1},
         /* reverse: */ {0},
@@ -272,6 +284,7 @@ BENCHMARK_REGISTER_F(TPartFixture, DoReads)
 BENCHMARK_REGISTER_F(TPartFixture, DoCharge)
     ->ArgsProduct({
         /* b-tree */ {0, 1},
+        /* parts */ {4},
         /* groups: */ {1},
         /* history: */ {1},
         /* reverse: */ {0},
@@ -281,6 +294,7 @@ BENCHMARK_REGISTER_F(TPartFixture, DoCharge)
 BENCHMARK_REGISTER_F(TPartFixture, BuildStats)
     ->ArgsProduct({
         /* b-tree */ {0, 1},
+        /* parts */ {1, 4, 10},
         /* groups: */ {0, 1},
         /* history: */ {0, 1}})
     ->Unit(benchmark::kMicrosecond);