Skip to content

Commit 13f7cbd

Browse files
authored
Statistics: disable datashard traversal (#8402)
1 parent 1e1d882 commit 13f7cbd

File tree

3 files changed

+22
-12
lines changed

3 files changed

+22
-12
lines changed

ydb/core/statistics/aggregator/aggregator_impl.cpp

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -550,6 +550,9 @@ void TStatisticsAggregator::Resolve() {
550550
}
551551

552552
void TStatisticsAggregator::ScanNextDatashardRange() {
553+
// Datashard traversal is temporary disabled
554+
Y_FAIL();
555+
553556
if (DatashardRanges.empty()) {
554557
SaveStatisticsToTable();
555558
return;
@@ -699,13 +702,21 @@ void TStatisticsAggregator::ScheduleNextTraversal(NIceDb::TNiceDb& db) {
699702
}
700703

701704
TraversalPathId = pathId;
705+
TraversalStartTime = TInstant::Now();
702706

703707
std::optional<bool> isColumnTable = IsColumnTable(pathId);
704708
if (!isColumnTable){
705709
DeleteStatisticsFromTable();
706710
return;
707711
}
708712

713+
// Datashard traversal is temporary disabled
714+
if (!*isColumnTable) {
715+
SA_LOG_D("[" << TabletID() << "] ScheduleNextTraversal. Skip traversal for datashard table " << pathId);
716+
DeleteStatisticsFromTable();
717+
return;
718+
}
719+
709720
TraversalIsColumnTable = *isColumnTable;
710721

711722
SA_LOG_D("[" << TabletID() << "] Start "
@@ -716,7 +727,6 @@ void TStatisticsAggregator::ScheduleNextTraversal(NIceDb::TNiceDb& db) {
716727
}
717728

718729
void TStatisticsAggregator::StartTraversal(NIceDb::TNiceDb& db) {
719-
TraversalStartTime = TInstant::Now();
720730
PersistTraversal(db);
721731

722732
TraversalStartKey = TSerializedCellVec();

ydb/core/statistics/aggregator/ut/ut_analyze_datashard.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Y_UNIT_TEST_SUITE(AnalyzeDatashard) {
3838

3939
Analyze(runtime, saTabletId, {{pathId}});
4040

41-
ValidateCountMinDatashard(runtime, pathId);
41+
ValidateCountMinDatashardAbsense(runtime, pathId);
4242
}
4343

4444
Y_UNIT_TEST(AnalyzeTwoTables) {
@@ -64,8 +64,8 @@ Y_UNIT_TEST_SUITE(AnalyzeDatashard) {
6464

6565
Analyze(runtime, saTabletId1, {pathId1, pathId2});
6666

67-
ValidateCountMinDatashard(runtime, pathId1);
68-
ValidateCountMinDatashard(runtime, pathId2);
67+
ValidateCountMinDatashardAbsense(runtime, pathId1);
68+
ValidateCountMinDatashardAbsense(runtime, pathId2);
6969
}
7070

7171

ydb/core/statistics/aggregator/ut/ut_traverse_datashard.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Y_UNIT_TEST_SUITE(TraverseDatashard) {
3434
runtime.SimulateSleep(TDuration::Seconds(60));
3535

3636
auto pathId = ResolvePathId(runtime, "/Root/Database/Table");
37-
ValidateCountMinDatashard(runtime, pathId);
37+
ValidateCountMinDatashardAbsense(runtime, pathId);
3838
}
3939

4040
Y_UNIT_TEST(TraverseTwoTables) {
@@ -54,8 +54,8 @@ Y_UNIT_TEST_SUITE(TraverseDatashard) {
5454

5555
auto pathId1 = ResolvePathId(runtime, "/Root/Database/Table1");
5656
auto pathId2 = ResolvePathId(runtime, "/Root/Database/Table2");
57-
ValidateCountMinDatashard(runtime, pathId1);
58-
ValidateCountMinDatashard(runtime, pathId2);
57+
ValidateCountMinDatashardAbsense(runtime, pathId1);
58+
ValidateCountMinDatashardAbsense(runtime, pathId2);
5959
}
6060

6161
Y_UNIT_TEST(TraverseOneTableServerless) {
@@ -85,7 +85,7 @@ Y_UNIT_TEST_SUITE(TraverseDatashard) {
8585
runtime.SimulateSleep(TDuration::Seconds(60));
8686

8787
auto pathId = ResolvePathId(runtime, "/Root/Serverless/Table");
88-
ValidateCountMinDatashard(runtime, pathId);
88+
ValidateCountMinDatashardAbsense(runtime, pathId);
8989
}
9090

9191
Y_UNIT_TEST(TraverseTwoTablesServerless) {
@@ -117,8 +117,8 @@ Y_UNIT_TEST_SUITE(TraverseDatashard) {
117117

118118
auto pathId1 = ResolvePathId(runtime, "/Root/Serverless/Table1");
119119
auto pathId2 = ResolvePathId(runtime, "/Root/Serverless/Table2");
120-
ValidateCountMinDatashard(runtime, pathId1);
121-
ValidateCountMinDatashard(runtime, pathId2);
120+
ValidateCountMinDatashardAbsense(runtime, pathId1);
121+
ValidateCountMinDatashardAbsense(runtime, pathId2);
122122
}
123123

124124
Y_UNIT_TEST(TraverseTwoTablesTwoServerlessDbs) {
@@ -151,8 +151,8 @@ Y_UNIT_TEST_SUITE(TraverseDatashard) {
151151

152152
auto pathId1 = ResolvePathId(runtime, "/Root/Serverless1/Table1");
153153
auto pathId2 = ResolvePathId(runtime, "/Root/Serverless2/Table2");
154-
ValidateCountMinDatashard(runtime, pathId1);
155-
ValidateCountMinDatashard(runtime, pathId2);
154+
ValidateCountMinDatashardAbsense(runtime, pathId1);
155+
ValidateCountMinDatashardAbsense(runtime, pathId2);
156156
}
157157

158158
}

0 commit comments

Comments
 (0)