Skip to content

Commit dfa1fbd

Browse files
precharge
1 parent 4f9ea5f commit dfa1fbd

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

ydb/core/tx/columnshard/normalizer/portion/leaked_blobs.cpp

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ class TLeakedBlobsNormalizerChanges: public INormalizerChanges {
2121
TLeakedBlobsNormalizerChanges(THashSet<TLogoBlobID>&& leaks, const ui64 tabletId, NColumnShard::TBlobGroupSelector dsGroupSelector)
2222
: Leaks(std::move(leaks))
2323
, TabletId(tabletId)
24-
, DsGroupSelector(dsGroupSelector)
25-
{
24+
, DsGroupSelector(dsGroupSelector) {
2625
}
2726

2827
bool ApplyOnExecute(NTabletFlatExecutor::TTransactionContext& txc, const TNormalizationController& /*normController*/) const override {
@@ -65,7 +64,8 @@ class TRemoveLeakedBlobsActor: public TActorBootstrapped<TRemoveLeakedBlobsActor
6564
for (auto&& i : CSBlobIds) {
6665
AFL_VERIFY(BSBlobIds.erase(i))("error", "have to use broken blobs repair")("blob_id", i);
6766
}
68-
TActorContext::AsActorContext().Send(CSActorId, std::make_unique<NColumnShard::TEvPrivate::TEvNormalizerResult>(
67+
TActorContext::AsActorContext().Send(
68+
CSActorId, std::make_unique<NColumnShard::TEvPrivate::TEvNormalizerResult>(
6969
std::make_shared<TLeakedBlobsNormalizerChanges>(std::move(BSBlobIds), CSTabletId, DsGroupSelector)));
7070
PassAway();
7171
}
@@ -77,8 +77,7 @@ class TRemoveLeakedBlobsActor: public TActorBootstrapped<TRemoveLeakedBlobsActor
7777
, CSBlobIds(std::move(csBlobIDs))
7878
, CSActorId(csActorId)
7979
, CSTabletId(csTabletId)
80-
, DsGroupSelector(dsGroupSelector)
81-
{
80+
, DsGroupSelector(dsGroupSelector) {
8281
}
8382

8483
void Bootstrap(const TActorContext& ctx) {
@@ -142,11 +141,11 @@ class TRemoveLeakedBlobsTask: public INormalizerTask {
142141
, CSBlobIDs(std::move(csBlobIDs))
143142
, TabletId(tabletId)
144143
, ActorId(actorId)
145-
, DsGroupSelector(dsGroupSelector)
146-
{
144+
, DsGroupSelector(dsGroupSelector) {
147145
}
148146
void Start(const TNormalizationController& /*controller*/, const TNormalizationContext& /*nCtx*/) override {
149-
NActors::TActivationContext::Register(new TRemoveLeakedBlobsActor(std::move(Channels), std::move(CSBlobIDs), ActorId, TabletId, DsGroupSelector));
147+
NActors::TActivationContext::Register(
148+
new TRemoveLeakedBlobsActor(std::move(Channels), std::move(CSBlobIDs), ActorId, TabletId, DsGroupSelector));
150149
}
151150
};
152151

@@ -155,8 +154,8 @@ TConclusion<std::vector<INormalizerTask::TPtr>> TLeakedBlobsNormalizer::DoInit(
155154
using namespace NColumnShard;
156155
AFL_VERIFY(AppDataVerified().FeatureFlags.GetEnableWritePortionsOnInsert());
157156
NIceDb::TNiceDb db(txc.DB);
158-
bool ready = true;
159-
ready = ready & Schema::Precharge<Schema::IndexColumns>(db, txc.DB.GetScheme());
157+
const bool ready = Schema::Precharge<Schema::IndexPortions>(db, txc.DB.GetScheme()) &
158+
Schema::Precharge<Schema::IndexColumns>(db, txc.DB.GetScheme()) & Schema::Precharge<Schema::IndexIndexes>(db, txc.DB.GetScheme());
160159
if (!ready) {
161160
return TConclusionStatus::Fail("Not ready");
162161
}

0 commit comments

Comments
 (0)