Skip to content

Commit 9c9f411

Browse files
authored
temporary fix for SA tablet local db schema (#7459)
1 parent e466384 commit 9c9f411

File tree

5 files changed

+13
-10
lines changed

5 files changed

+13
-10
lines changed

.github/config/muted_ya.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,3 +99,4 @@ ydb/tests/functional/ydb_cli test_ydb_impex.py.TestImpex.test_big_dataset*
9999
ydb/tests/tools/pq_read/test test_timeout.py.TestTimeout.test_timeout
100100
ydb/tests/functional/rename [test_rename.py */*] chunk chunk
101101
ydb/tests/fq/yt/kqp_yt_file/part18 test.py.test[pg-join_brackets2-default.txt]
102+
ydb/tests/functional/suite_tests test_postgres.py.TestPGSQL.test_sql_suite[plan-jointest/join2.test]

ydb/core/statistics/aggregator/aggregator_impl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@ void TStatisticsAggregator::ScheduleNextTraversal(NIceDb::TNiceDb& db) {
593593

594594
PersistForceTraversal(db);
595595

596-
db.Table<Schema::ForceTraversals>().Key(operation.OperationId, operation.PathId.OwnerId, operation.PathId.LocalPathId).Delete();
596+
// db.Table<Schema::ForceTraversals>().Key(operation.OperationId, operation.PathId.OwnerId, operation.PathId.LocalPathId).Delete();
597597
ForceTraversals.pop_front();
598598
} else if (!ScheduleTraversalsByTime.Empty()){
599599
LastTraversalWasForce = false;

ydb/core/statistics/aggregator/schema.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ struct TAggregatorSchema : NIceDb::Schema {
4545
IsColumnTable
4646
>;
4747
};
48-
48+
/*
4949
struct ForceTraversals : Table<5> {
5050
struct OperationId : Column<1, NScheme::NTypeIds::Uint64> {};
5151
struct OwnerId : Column<2, NScheme::NTypeIds::Uint64> {};
@@ -64,13 +64,13 @@ struct TAggregatorSchema : NIceDb::Schema {
6464
Types
6565
>;
6666
};
67-
67+
*/
6868
using TTables = SchemaTables<
6969
SysParams,
7070
BaseStatistics,
7171
ColumnStatistics,
72-
ScheduleTraversals,
73-
ForceTraversals
72+
ScheduleTraversals
73+
// ForceTraversals
7474
>;
7575

7676
using TSettings = SchemaSettings<

ydb/core/statistics/aggregator/tx_analyze_table.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ struct TStatisticsAggregator::TTxAnalyzeTable : public TTxBase {
5454
.ReplyToActorId = ReplyToActorId
5555
};
5656
Self->ForceTraversals.emplace_back(operation);
57-
57+
/*
5858
db.Table<Schema::ForceTraversals>().Key(Self->NextForceTraversalOperationId, pathId.OwnerId, pathId.LocalPathId).Update(
5959
NIceDb::TUpdate<Schema::ForceTraversals::OperationId>(Self->NextForceTraversalOperationId),
6060
NIceDb::TUpdate<Schema::ForceTraversals::OwnerId>(pathId.OwnerId),
@@ -63,6 +63,7 @@ struct TStatisticsAggregator::TTxAnalyzeTable : public TTxBase {
6363
NIceDb::TUpdate<Schema::ForceTraversals::ColumnTags>(columnTags),
6464
NIceDb::TUpdate<Schema::ForceTraversals::Types>(types)
6565
);
66+
*/
6667
}
6768

6869
Self->PersistNextForceTraversalOperationId(db);

ydb/core/statistics/aggregator/tx_init.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ struct TStatisticsAggregator::TTxInit : public TTxBase {
2222
auto baseStatisticsRowset = db.Table<Schema::BaseStatistics>().Range().Select();
2323
auto statisticsRowset = db.Table<Schema::ColumnStatistics>().Range().Select();
2424
auto scheduleTraversalRowset = db.Table<Schema::ScheduleTraversals>().Range().Select();
25-
auto forceTraversalRowset = db.Table<Schema::ForceTraversals>().Range().Select();
25+
// auto forceTraversalRowset = db.Table<Schema::ForceTraversals>().Range().Select();
2626

2727
if (!sysParamsRowset.IsReady() ||
2828
!baseStatisticsRowset.IsReady() ||
2929
!statisticsRowset.IsReady() ||
30-
!scheduleTraversalRowset.IsReady() ||
31-
!forceTraversalRowset.IsReady())
30+
!scheduleTraversalRowset.IsReady())
31+
// !forceTraversalRowset.IsReady())
3232
{
3333
return false;
3434
}
@@ -204,6 +204,7 @@ struct TStatisticsAggregator::TTxInit : public TTxBase {
204204
}
205205

206206
// ForceTraversals
207+
/*
207208
{
208209
Self->ForceTraversals.clear();
209210
@@ -240,7 +241,7 @@ struct TStatisticsAggregator::TTxInit : public TTxBase {
240241
SA_LOG_D("[" << Self->TabletID() << "] Loaded ForceTraversals: "
241242
<< "table count# " << Self->ForceTraversals.size());
242243
}
243-
244+
*/
244245
return true;
245246
}
246247

0 commit comments

Comments
 (0)