TTableHistogramBuilderBtreeIndex improvements (#5451)

kunga · web-flow · commit f93a9f308ae2 · 2024-06-17T11:38:56.000+02:00
diff --git a/ydb/core/protos/tx_datashard.proto b/ydb/core/protos/tx_datashard.proto
@@ -769,6 +769,7 @@ message TEvGetTableStats {
     optional uint64 DataSizeResolution = 2;
     optional uint64 RowCountResolution = 3;
     optional bool CollectKeySample = 4;
+    optional uint32 HistogramBucketsCount = 5;
 }
 
 message TEvGetTableStatsResult {
diff --git a/ydb/core/tablet_flat/benchmark/b_part.cpp b/ydb/core/tablet_flat/benchmark/b_part.cpp
@@ -17,6 +17,7 @@
 #include <ydb/core/tablet_flat/test/libs/table/wrap_part.h>
 #include <ydb/core/tablet_flat/test/libs/table/test_steps.h>
 
+// ya test -r -D BENCHMARK_MAKE_LARGE_PART
 #ifndef BENCHMARK_MAKE_LARGE_PART
 #define BENCHMARK_MAKE_LARGE_PART 0
 #endif
@@ -37,8 +38,6 @@ namespace {
         
         conf.WriteBTreeIndex = writeBTreeIndex;
 
-        conf.SliceSize = conf.Group(0).PageSize * 4;
-
         return conf;
     }
 
@@ -48,24 +47,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 +158,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 +186,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 +208,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) {
@@ -226,34 +234,38 @@ BENCHMARK_DEFINE_F(TPartFixture, DoCharge)(benchmark::State& state) {
 BENCHMARK_DEFINE_F(TPartFixture, BuildStats)(benchmark::State& state) {
     for (auto _ : state) {
         TStats stats;
-        BuildStats(*Subset, stats, NDataShard::gDbStatsRowCountResolution, NDataShard::gDbStatsDataSizeResolution, &Env, [](){});
+        BuildStats(*Subset, stats, NDataShard::gDbStatsRowCountResolution, NDataShard::gDbStatsDataSizeResolution, NDataShard::gDbStatsHistogramBucketsCount, &Env, [](){});
     }
 }
 
 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 +274,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 +285,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 +295,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);
diff --git a/ydb/core/tablet_flat/flat_stat_table.cpp b/ydb/core/tablet_flat/flat_stat_table.cpp
@@ -7,7 +7,7 @@
 namespace NKikimr {
 namespace NTable {
 
-bool BuildStats(const TSubset& subset, TStats& stats, ui64 rowCountResolution, ui64 dataSizeResolution, IPages* env, TBuildStatsYieldHandler yieldHandler) {
+bool BuildStats(const TSubset& subset, TStats& stats, ui64 rowCountResolution, ui64 dataSizeResolution, ui32 histogramBucketsCount, IPages* env, TBuildStatsYieldHandler yieldHandler) {
     stats.Clear();
 
     bool mixedIndex = false;
@@ -22,7 +22,7 @@ bool BuildStats(const TSubset& subset, TStats& stats, ui64 rowCountResolution, u
 
     return mixedIndex
         ? BuildStatsMixedIndex(subset, stats, rowCountResolution, dataSizeResolution, env, yieldHandler)
-        : BuildStatsBTreeIndex(subset, stats, rowCountResolution, dataSizeResolution, env, yieldHandler);
+        : BuildStatsBTreeIndex(subset, stats, histogramBucketsCount, env, yieldHandler);
 }
 
 void GetPartOwners(const TSubset& subset, THashSet<ui64>& partOwners) {
diff --git a/ydb/core/tablet_flat/flat_stat_table.h b/ydb/core/tablet_flat/flat_stat_table.h
@@ -190,7 +190,7 @@ class TKeyAccessSample {
 
 using TBuildStatsYieldHandler = std::function<void()>;
 
-bool BuildStats(const TSubset& subset, TStats& stats, ui64 rowCountResolution, ui64 dataSizeResolution, IPages* env, TBuildStatsYieldHandler yieldHandler);
+bool BuildStats(const TSubset& subset, TStats& stats, ui64 rowCountResolution, ui64 dataSizeResolution, ui32 histogramBucketsCount, IPages* env, TBuildStatsYieldHandler yieldHandler);
 void GetPartOwners(const TSubset& subset, THashSet<ui64>& partOwners);
 
 }}
diff --git a/ydb/core/tablet_flat/flat_stat_table_btree_index.h b/ydb/core/tablet_flat/flat_stat_table_btree_index.h
@@ -196,7 +196,7 @@ bool AddDataSize(const TPartView& part, TStats& stats, IPages* env, TBuildStatsY
 
 }
 
-inline bool BuildStatsBTreeIndex(const TSubset& subset, TStats& stats, ui64 rowCountResolution, ui64 dataSizeResolution, IPages* env, TBuildStatsYieldHandler yieldHandler) {
+inline bool BuildStatsBTreeIndex(const TSubset& subset, TStats& stats, ui32 histogramBucketsCount, IPages* env, TBuildStatsYieldHandler yieldHandler) {
     stats.Clear();
 
     bool ready = true;
@@ -209,7 +209,7 @@ inline bool BuildStatsBTreeIndex(const TSubset& subset, TStats& stats, ui64 rowC
         return false;
     }
 
-    ready &= BuildStatsHistogramsBTreeIndex(subset, stats, rowCountResolution, dataSizeResolution, env, yieldHandler);
+    ready &= BuildStatsHistogramsBTreeIndex(subset, stats, histogramBucketsCount, env, yieldHandler);
 
     return ready;
 }
diff --git a/ydb/core/tablet_flat/flat_stat_table_btree_index_histogram.h b/ydb/core/tablet_flat/flat_stat_table_btree_index_histogram.h
@@ -127,17 +127,22 @@ class TTableHistogramBuilderBtreeIndex {
     };
 
 public:
-    TTableHistogramBuilderBtreeIndex(const TSubset& subset, IPages* env, TBuildStatsYieldHandler yieldHandler)
+    TTableHistogramBuilderBtreeIndex(const TSubset& subset, IPages* env, ui32 histogramBucketsCount, TBuildStatsYieldHandler yieldHandler)
         : Subset(subset)
         , KeyDefaults(*Subset.Scheme->Keys)
         , Env(env)
+        , HistogramBucketsCount(histogramBucketsCount)
         , YieldHandler(yieldHandler)
     {
     }
 
     template <typename TGetSize>
-    bool Build(THistogram& histogram, ui64 resolution, ui64 statTotalSize) {
-        Resolution = resolution;
+    bool Build(THistogram& histogram, ui64 statTotalSize) {
+        if (!HistogramBucketsCount) {
+            return true;
+        }
+
+        Resolution = statTotalSize / HistogramBucketsCount;
         StatTotalSize = statTotalSize;
         
         bool ready = true;
@@ -497,6 +502,7 @@ class TTableHistogramBuilderBtreeIndex {
     const TSubset& Subset;
     const TKeyCellDefaults& KeyDefaults;
     IPages* const Env;
+    ui32 HistogramBucketsCount;
     TBuildStatsYieldHandler YieldHandler;
     ui64 Resolution, StatTotalSize;
     TDeque<TBtreeIndexNode> LoadedBTreeNodes; // keep nodes to use TCellsIterable key refs
@@ -505,13 +511,13 @@ class TTableHistogramBuilderBtreeIndex {
 
 }
 
-inline bool BuildStatsHistogramsBTreeIndex(const TSubset& subset, TStats& stats, ui64 rowCountResolution, ui64 dataSizeResolution, IPages* env, TBuildStatsYieldHandler yieldHandler) {
+inline bool BuildStatsHistogramsBTreeIndex(const TSubset& subset, TStats& stats, ui32 histogramBucketsCount, IPages* env, TBuildStatsYieldHandler yieldHandler) {
     bool ready = true;
     
-    TTableHistogramBuilderBtreeIndex builder(subset, env, yieldHandler);
+    TTableHistogramBuilderBtreeIndex builder(subset, env, histogramBucketsCount, yieldHandler);
 
-    ready &= builder.Build<TTableHistogramBuilderBtreeIndex::TGetRowCount>(stats.RowCountHistogram, rowCountResolution, stats.RowCount);
-    ready &= builder.Build<TTableHistogramBuilderBtreeIndex::TGetDataSize>(stats.DataSizeHistogram, dataSizeResolution, stats.DataSize.Size);
+    ready &= builder.Build<TTableHistogramBuilderBtreeIndex::TGetRowCount>(stats.RowCountHistogram, stats.RowCount);
+    ready &= builder.Build<TTableHistogramBuilderBtreeIndex::TGetDataSize>(stats.DataSizeHistogram, stats.DataSize.Size);
 
     return ready;
 }
diff --git a/ydb/core/tablet_flat/ut/ut_stat.cpp b/ydb/core/tablet_flat/ut/ut_stat.cpp
@@ -92,13 +92,13 @@ namespace {
         UNIT_ASSERT_VALUES_EQUAL(stats.IndexSize.Size, expectedIndex);
     }
 
-    void CheckBTreeIndex(const TSubset& subset, ui64 expectedRows, ui64 expectedData, ui64 expectedIndex, ui64 rowCountResolution = 531, ui64 dataSizeResolution = 53105) {
+    void CheckBTreeIndex(const TSubset& subset, ui64 expectedRows, ui64 expectedData, ui64 expectedIndex, ui32 histogramBucketsCount = 10) {
         TStats stats;
         TTouchEnv env;
 
         const ui32 attempts = 25;
         for (ui32 attempt : xrange(attempts)) {
-            if (NTable::BuildStatsBTreeIndex(subset, stats, rowCountResolution, dataSizeResolution, &env, [](){})) {
+            if (NTable::BuildStatsBTreeIndex(subset, stats, histogramBucketsCount, &env, [](){})) {
                 break;
             }
             UNIT_ASSERT_C(attempt + 1 < attempts, "Too many attempts");
@@ -554,7 +554,7 @@ Y_UNIT_TEST_SUITE(BuildStatsHistogram) {
         }
     }
 
-    void Check(const TSubset& subset, TMode mode, ui32 buckets = 10, bool verifyPercents = true) {
+    void Check(const TSubset& subset, TMode mode, ui32 histogramBucketsCount = 10, bool verifyPercents = true) {
         if (mode == 0) {
             Dump(subset);
         }
@@ -567,21 +567,21 @@ Y_UNIT_TEST_SUITE(BuildStatsHistogram) {
             CalcDataBefore(subset, TSerializedCellVec(emptyKey), totalBytes, totalRows);
         }
 
-        ui64 rowCountResolution = totalRows / buckets;
-        ui64 dataSizeResolution = totalBytes / buckets;
+        ui64 rowCountResolution = totalRows / histogramBucketsCount;
+        ui64 dataSizeResolution = totalBytes / histogramBucketsCount;
 
         TTouchEnv env;
         // env.Faulty = false; // uncomment for debug
         TStats stats;
         auto buildStats = [&]() {
             if (mode == BTreeIndex) {
-                return NTable::BuildStatsBTreeIndex(subset, stats, rowCountResolution, dataSizeResolution, &env, [](){});
+                return NTable::BuildStatsBTreeIndex(subset, stats, histogramBucketsCount, &env, [](){});
             } else {
                 return NTable::BuildStatsMixedIndex(subset, stats, rowCountResolution, dataSizeResolution, &env, [](){});
             }
         };
 
-        const ui32 attempts = 25;
+        const ui32 attempts = 35;
         for (ui32 attempt : xrange(attempts)) {
             if (buildStats()) {
                 break;
@@ -1010,6 +1010,29 @@ Y_UNIT_TEST_SUITE(BuildStatsHistogram) {
             Check(*subset, mode);
         }
     }
+
+    // this test uses same data as benchmark::TPartFixture/BuildStats/*, but may be debugged and prints result histograms
+    Y_UNIT_TEST(Benchmark)
+    {
+        const ui32 partsCount = 4;
+        const bool groups = false;
+        const bool history = false;
+        ui64 rowsCount = history ? 300000 : 1000000;
+
+        rowsCount /= 100; // to be faster
+
+        TAutoPtr<TMass> mass = new NTest::TMass(new NTest::TModelStd(groups), rowsCount);
+
+        for (auto mode : {BTreeIndex, FlatIndex, MixedIndex}) {
+            NPage::TConf conf;
+            conf.Groups.resize(mass->Model->Scheme->Families.size());
+            conf.WriteBTreeIndex = (mode == FlatIndex ? false : true);
+
+            TAutoPtr<TSubset> subset = TMake(*mass, conf).Mixed(0, partsCount, TMixerRnd(partsCount), history ? 0.7 : 0);
+            
+            Check(*subset, mode, 10, false);
+        }
+    }
 }
 
 }
diff --git a/ydb/core/tx/datashard/datashard.cpp b/ydb/core/tx/datashard/datashard.cpp
@@ -37,6 +37,7 @@ bool gAllowLogBatchingDefaultValue = true;
 TDuration gDbStatsReportInterval = TDuration::Seconds(10);
 ui64 gDbStatsDataSizeResolution = 10*1024*1024;
 ui64 gDbStatsRowCountResolution = 100000;
+ui32 gDbStatsHistogramBucketsCount = 10;
 
 // The first byte is 0x01 so it would fail to parse as an internal tablet protobuf
 TStringBuf SnapshotTransferReadSetMagic("\x01SRS", 4);
diff --git a/ydb/core/tx/datashard/datashard.h b/ydb/core/tx/datashard/datashard.h
@@ -151,6 +151,7 @@ namespace NDataShard {
     extern TDuration gDbStatsReportInterval;
     extern ui64 gDbStatsDataSizeResolution;
     extern ui64 gDbStatsRowCountResolution;
+    extern ui32 gDbStatsHistogramBucketsCount;
 
     // This SeqNo is used to discard outdated schema Tx requests on datashards.
     // In case of tablet restart on network disconnects SS can resend same Propose for the same schema Tx.
@@ -829,11 +830,8 @@ struct TEvDataShard {
                                                         NKikimrTxDataShard::TEvGetTableStats,
                                                         TEvDataShard::EvGetTableStats> {
         TEvGetTableStats() = default;
-        explicit TEvGetTableStats(ui64 tableId, ui64 dataSizeResolution = 0, ui64 rowCountResolution = 0, bool collectKeySample = false) {
+        explicit TEvGetTableStats(ui64 tableId) {
             Record.SetTableId(tableId);
-            Record.SetDataSizeResolution(dataSizeResolution);
-            Record.SetRowCountResolution(rowCountResolution);
-            Record.SetCollectKeySample(collectKeySample);
         }
     };
 
diff --git a/ydb/core/tx/datashard/datashard__stats.cpp b/ydb/core/tx/datashard/datashard__stats.cpp
diff --git a/ydb/core/tx/datashard/datashard_user_table.h b/ydb/core/tx/datashard/datashard_user_table.h
diff --git a/ydb/core/tx/schemeshard/schemeshard__table_stats.cpp b/ydb/core/tx/schemeshard/schemeshard__table_stats.cpp

Original file line number	Diff line number	Diff line change
`@@ -769,6 +769,7 @@ message TEvGetTableStats {`
`769`	`769`	`optional uint64 DataSizeResolution = 2;`
`770`	`770`	`optional uint64 RowCountResolution = 3;`
`771`	`771`	`optional bool CollectKeySample = 4;`
	`772`	`+ optional uint32 HistogramBucketsCount = 5;`
`772`	`773`	`}`
`773`	`774`
`774`	`775`	`message TEvGetTableStatsResult {`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ bool AddDataSize(const TPartView& part, TStats& stats, IPages* env, TBuildStatsY`
`196`	`196`
`197`	`197`	`}`
`198`	`198`
`199`		`-inline bool BuildStatsBTreeIndex(const TSubset& subset, TStats& stats, ui64 rowCountResolution, ui64 dataSizeResolution, IPages* env, TBuildStatsYieldHandler yieldHandler) {`
	`199`	`+inline bool BuildStatsBTreeIndex(const TSubset& subset, TStats& stats, ui32 histogramBucketsCount, IPages* env, TBuildStatsYieldHandler yieldHandler) {`
`200`	`200`	`stats.Clear();`
`201`	`201`
`202`	`202`	`bool ready = true;`
`@@ -209,7 +209,7 @@ inline bool BuildStatsBTreeIndex(const TSubset& subset, TStats& stats, ui64 rowC`
`209`	`209`	`return false;`
`210`	`210`	`}`
`211`	`211`
`212`		`- ready &= BuildStatsHistogramsBTreeIndex(subset, stats, rowCountResolution, dataSizeResolution, env, yieldHandler);`
	`212`	`+ ready &= BuildStatsHistogramsBTreeIndex(subset, stats, histogramBucketsCount, env, yieldHandler);`
`213`	`213`
`214`	`214`	`return ready;`
`215`	`215`	`}`