Skip to content

Commit 44d7bd4

Browse files
ivanmorozov333ivanmorozov333
authored
fix namings (#1131)
1 parent 600d1f0 commit 44d7bd4

File tree

11 files changed

+42
-43
lines changed

11 files changed

+42
-43
lines changed

‎ydb/core/tx/columnshard/blob_manager.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ class IBlobManager {
8989
return DoSaveBlobBatch(std::move(blobBatch), db);
9090
}
9191

92-
// Deletes the blob that was previously permanently saved
9392
virtual void DeleteBlobOnExecute(const TUnifiedBlobId& blobId, IBlobManagerDb& db) = 0;
9493
virtual void DeleteBlobOnComplete(const TUnifiedBlobId& blobId) = 0;
9594
};

‎ydb/core/tx/columnshard/blobs_action/abstract/action.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,21 +55,21 @@ class TStorageAction {
5555
return !!Writing;
5656
}
5757

58-
void OnExecuteTxAfterAction(NColumnShard::TColumnShard& self, NColumnShard::TBlobManagerDb& dbBlobs, const bool success) {
58+
void OnExecuteTxAfterAction(NColumnShard::TColumnShard& self, NColumnShard::TBlobManagerDb& dbBlobs, const bool blobsWroteSuccessfully) {
5959
if (Removing) {
60-
Removing->OnExecuteTxAfterRemoving(self, dbBlobs, success);
60+
Removing->OnExecuteTxAfterRemoving(self, dbBlobs, blobsWroteSuccessfully);
6161
}
6262
if (Writing) {
63-
Writing->OnExecuteTxAfterWrite(self, dbBlobs, success);
63+
Writing->OnExecuteTxAfterWrite(self, dbBlobs, blobsWroteSuccessfully);
6464
}
6565
}
6666

67-
void OnCompleteTxAfterAction(NColumnShard::TColumnShard& self, const bool success) {
67+
void OnCompleteTxAfterAction(NColumnShard::TColumnShard& self, const bool blobsWroteSuccessfully) {
6868
if (Removing) {
69-
Removing->OnCompleteTxAfterRemoving(self, success);
69+
Removing->OnCompleteTxAfterRemoving(self, blobsWroteSuccessfully);
7070
}
7171
if (Writing) {
72-
Writing->OnCompleteTxAfterWrite(self, success);
72+
Writing->OnCompleteTxAfterWrite(self, blobsWroteSuccessfully);
7373
}
7474
}
7575
};
@@ -144,15 +144,15 @@ class TBlobsAction {
144144
return false;
145145
}
146146

147-
void OnExecuteTxAfterAction(NColumnShard::TColumnShard& self, NColumnShard::TBlobManagerDb& dbBlobs, const bool success) {
147+
void OnExecuteTxAfterAction(NColumnShard::TColumnShard& self, NColumnShard::TBlobManagerDb& dbBlobs, const bool blobsWroteSuccessfully) {
148148
for (auto&& i : StorageActions) {
149-
i.second.OnExecuteTxAfterAction(self, dbBlobs, success);
149+
i.second.OnExecuteTxAfterAction(self, dbBlobs, blobsWroteSuccessfully);
150150
}
151151
}
152152

153-
void OnCompleteTxAfterAction(NColumnShard::TColumnShard& self, const bool success) {
153+
void OnCompleteTxAfterAction(NColumnShard::TColumnShard& self, const bool blobsWroteSuccessfully) {
154154
for (auto&& i : StorageActions) {
155-
i.second.OnCompleteTxAfterAction(self, success);
155+
i.second.OnCompleteTxAfterAction(self, blobsWroteSuccessfully);
156156
}
157157
}
158158

‎ydb/core/tx/columnshard/blobs_action/abstract/remove.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ class IBlobsDeclareRemovingAction: public ICommonBlobsAction {
1919
YDB_READONLY_DEF(THashSet<TUnifiedBlobId>, DeclaredBlobs);
2020
protected:
2121
virtual void DoDeclareRemove(const TUnifiedBlobId& blobId) = 0;
22-
virtual void DoOnExecuteTxAfterRemoving(NColumnShard::TColumnShard& self, NColumnShard::TBlobManagerDb& dbBlobs, const bool success) = 0;
23-
virtual void DoOnCompleteTxAfterRemoving(NColumnShard::TColumnShard& self, const bool success) = 0;
22+
virtual void DoOnExecuteTxAfterRemoving(NColumnShard::TColumnShard& self, NColumnShard::TBlobManagerDb& dbBlobs, const bool blobsWroteSuccessfully) = 0;
23+
virtual void DoOnCompleteTxAfterRemoving(NColumnShard::TColumnShard& self, const bool blobsWroteSuccessfully) = 0;
2424
public:
2525
IBlobsDeclareRemovingAction(const TString& storageId)
2626
: TBase(storageId)
@@ -33,11 +33,11 @@ class IBlobsDeclareRemovingAction: public ICommonBlobsAction {
3333
}
3434

3535
void DeclareRemove(const TUnifiedBlobId& blobId);
36-
void OnExecuteTxAfterRemoving(NColumnShard::TColumnShard& self, NColumnShard::TBlobManagerDb& dbBlobs, const bool success) {
37-
return DoOnExecuteTxAfterRemoving(self, dbBlobs, success);
36+
void OnExecuteTxAfterRemoving(NColumnShard::TColumnShard& self, NColumnShard::TBlobManagerDb& dbBlobs, const bool blobsWroteSuccessfully) {
37+
return DoOnExecuteTxAfterRemoving(self, dbBlobs, blobsWroteSuccessfully);
3838
}
39-
void OnCompleteTxAfterRemoving(NColumnShard::TColumnShard& self, const bool success) {
40-
return DoOnCompleteTxAfterRemoving(self, success);
39+
void OnCompleteTxAfterRemoving(NColumnShard::TColumnShard& self, const bool blobsWroteSuccessfully) {
40+
return DoOnCompleteTxAfterRemoving(self, blobsWroteSuccessfully);
4141
}
4242
};
4343

‎ydb/core/tx/columnshard/blobs_action/abstract/write.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ class IBlobsWritingAction: public ICommonBlobsAction {
3030
virtual void DoSendWriteBlobRequest(const TString& data, const TUnifiedBlobId& blobId) = 0;
3131
virtual void DoOnBlobWriteResult(const TUnifiedBlobId& blobId, const NKikimrProto::EReplyStatus status) = 0;
3232

33-
virtual void DoOnExecuteTxAfterWrite(NColumnShard::TColumnShard& self, NColumnShard::TBlobManagerDb& dbBlobs, const bool success) = 0;
34-
virtual void DoOnCompleteTxAfterWrite(NColumnShard::TColumnShard& self, const bool success) = 0;
33+
virtual void DoOnExecuteTxAfterWrite(NColumnShard::TColumnShard& self, NColumnShard::TBlobManagerDb& dbBlobs, const bool blobsWroteSuccessfully) = 0;
34+
virtual void DoOnCompleteTxAfterWrite(NColumnShard::TColumnShard& self, const bool blobsWroteSuccessfully) = 0;
3535

3636
virtual TUnifiedBlobId AllocateNextBlobId(const TString& data) = 0;
3737
public:
@@ -75,12 +75,12 @@ class IBlobsWritingAction: public ICommonBlobsAction {
7575
return DoOnCompleteTxBeforeWrite(self);
7676
}
7777

78-
void OnExecuteTxAfterWrite(NColumnShard::TColumnShard& self, NColumnShard::TBlobManagerDb& dbBlobs, const bool success) {
79-
return DoOnExecuteTxAfterWrite(self, dbBlobs, success);
78+
void OnExecuteTxAfterWrite(NColumnShard::TColumnShard& self, NColumnShard::TBlobManagerDb& dbBlobs, const bool blobsWroteSuccessfully) {
79+
return DoOnExecuteTxAfterWrite(self, dbBlobs, blobsWroteSuccessfully);
8080
}
8181

82-
void OnCompleteTxAfterWrite(NColumnShard::TColumnShard& self, const bool success) {
83-
return DoOnCompleteTxAfterWrite(self, success);
82+
void OnCompleteTxAfterWrite(NColumnShard::TColumnShard& self, const bool blobsWroteSuccessfully) {
83+
return DoOnCompleteTxAfterWrite(self, blobsWroteSuccessfully);
8484
}
8585

8686
void SendWriteBlobRequest(const TString& data, const TUnifiedBlobId& blobId);

‎ydb/core/tx/columnshard/blobs_action/bs/remove.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ class TDeclareRemovingAction: public IBlobsDeclareRemovingAction {
1515

1616
}
1717

18-
virtual void DoOnExecuteTxAfterRemoving(NColumnShard::TColumnShard& /*self*/, NColumnShard::TBlobManagerDb& dbBlobs, const bool success) {
19-
if (success) {
18+
virtual void DoOnExecuteTxAfterRemoving(NColumnShard::TColumnShard& /*self*/, NColumnShard::TBlobManagerDb& dbBlobs, const bool blobsWroteSuccessfully) {
19+
if (blobsWroteSuccessfully) {
2020
for (auto&& i : GetDeclaredBlobs()) {
2121
Manager->DeleteBlobOnExecute(i, dbBlobs);
2222
}
2323
}
2424
}
25-
virtual void DoOnCompleteTxAfterRemoving(NColumnShard::TColumnShard& /*self*/, const bool success) {
26-
if (success) {
25+
virtual void DoOnCompleteTxAfterRemoving(NColumnShard::TColumnShard& /*self*/, const bool blobsWroteSuccessfully) {
26+
if (blobsWroteSuccessfully) {
2727
for (auto&& i : GetDeclaredBlobs()) {
2828
Manager->DeleteBlobOnComplete(i);
2929
}

‎ydb/core/tx/columnshard/blobs_action/bs/write.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33

44
namespace NKikimr::NOlap::NBlobOperations::NBlobStorage {
55

6-
void TWriteAction::DoOnExecuteTxAfterWrite(NColumnShard::TColumnShard& self, NColumnShard::TBlobManagerDb& dbBlobs, const bool success) {
6+
void TWriteAction::DoOnExecuteTxAfterWrite(NColumnShard::TColumnShard& self, NColumnShard::TBlobManagerDb& dbBlobs, const bool blobsWroteSuccessfully) {
77
ui64 blobsWritten = BlobBatch.GetBlobCount();
88
ui64 bytesWritten = BlobBatch.GetTotalSize();
9-
if (success) {
9+
if (blobsWroteSuccessfully) {
1010
self.IncCounter(NColumnShard::COUNTER_UPSERT_BLOBS_WRITTEN, blobsWritten);
1111
self.IncCounter(NColumnShard::COUNTER_UPSERT_BYTES_WRITTEN, bytesWritten);
1212
// self.IncCounter(NColumnShard::COUNTER_RAW_BYTES_UPSERTED, insertedBytes);

‎ydb/core/tx/columnshard/blobs_action/bs/write.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ class TWriteAction: public IBlobsWritingAction {
2828
return;
2929
}
3030

31-
virtual void DoOnExecuteTxAfterWrite(NColumnShard::TColumnShard& self, NColumnShard::TBlobManagerDb& dbBlobs, const bool success) override;
32-
virtual void DoOnCompleteTxAfterWrite(NColumnShard::TColumnShard& /*self*/, const bool /*success*/) override {
31+
virtual void DoOnExecuteTxAfterWrite(NColumnShard::TColumnShard& self, NColumnShard::TBlobManagerDb& dbBlobs, const bool blobsWroteSuccessfully) override;
32+
virtual void DoOnCompleteTxAfterWrite(NColumnShard::TColumnShard& /*self*/, const bool /*blobsWroteSuccessfully*/) override {
3333

3434
}
3535
public:

‎ydb/core/tx/columnshard/blobs_action/memory.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@ class TMemoryWriteAction: public IBlobsWritingAction {
6868
return;
6969
}
7070

71-
virtual void DoOnExecuteTxAfterWrite(NColumnShard::TColumnShard& /*self*/, NColumnShard::TBlobManagerDb& /*dbBlobs*/, const bool /*success*/) override {
71+
virtual void DoOnExecuteTxAfterWrite(NColumnShard::TColumnShard& /*self*/, NColumnShard::TBlobManagerDb& /*dbBlobs*/, const bool /*blobsWroteSuccessfully*/) override {
7272

7373
}
74-
virtual void DoOnCompleteTxAfterWrite(NColumnShard::TColumnShard& /*self*/, const bool /*success*/) override {
74+
virtual void DoOnCompleteTxAfterWrite(NColumnShard::TColumnShard& /*self*/, const bool /*blobsWroteSuccessfully*/) override {
7575

7676
}
7777
public:
@@ -101,12 +101,12 @@ class TMemoryDeclareRemovingAction: public IBlobsDeclareRemovingAction {
101101

102102
}
103103

104-
virtual void DoOnExecuteTxAfterRemoving(NColumnShard::TColumnShard& /*self*/, NColumnShard::TBlobManagerDb& /*dbBlobs*/, const bool /*success*/) {
104+
virtual void DoOnExecuteTxAfterRemoving(NColumnShard::TColumnShard& /*self*/, NColumnShard::TBlobManagerDb& /*dbBlobs*/, const bool /*blobsWroteSuccessfully*/) {
105105
for (auto&& i : GetDeclaredBlobs()) {
106106
Storage->DeclareDataForRemove(i);
107107
}
108108
}
109-
virtual void DoOnCompleteTxAfterRemoving(NColumnShard::TColumnShard& /*self*/, const bool /*success*/) {
109+
virtual void DoOnCompleteTxAfterRemoving(NColumnShard::TColumnShard& /*self*/, const bool /*blobsWroteSuccessfully*/) {
110110

111111
}
112112
public:

‎ydb/core/tx/columnshard/blobs_action/tier/remove.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ class TDeclareRemovingAction: public IBlobsDeclareRemovingAction {
1616

1717
}
1818

19-
virtual void DoOnExecuteTxAfterRemoving(NColumnShard::TColumnShard& /*self*/, NColumnShard::TBlobManagerDb& dbBlobs, const bool success) {
20-
if (success) {
19+
virtual void DoOnExecuteTxAfterRemoving(NColumnShard::TColumnShard& /*self*/, NColumnShard::TBlobManagerDb& dbBlobs, const bool blobsWroteSuccessfully) {
20+
if (blobsWroteSuccessfully) {
2121
for (auto&& i : GetDeclaredBlobs()) {
2222
dbBlobs.AddTierBlobToDelete(GetStorageId(), i);
2323
}
2424
}
2525
}
26-
virtual void DoOnCompleteTxAfterRemoving(NColumnShard::TColumnShard& /*self*/, const bool success) {
27-
if (success) {
26+
virtual void DoOnCompleteTxAfterRemoving(NColumnShard::TColumnShard& /*self*/, const bool blobsWroteSuccessfully) {
27+
if (blobsWroteSuccessfully) {
2828
for (auto&& i : GetDeclaredBlobs()) {
2929
if (GCInfo->IsBlobInUsage(i)) {
3030
Y_ABORT_UNLESS(GCInfo->MutableBlobsToDeleteInFuture().emplace(i).second);

‎ydb/core/tx/columnshard/blobs_action/tier/write.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ void TWriteAction::DoSendWriteBlobRequest(const TString& data, const TUnifiedBlo
1515
ExternalStorageOperator->Execute(evPtr);
1616
}
1717

18-
void TWriteAction::DoOnExecuteTxAfterWrite(NColumnShard::TColumnShard& /*self*/, NColumnShard::TBlobManagerDb& dbBlobs, const bool success) {
19-
if (success) {
18+
void TWriteAction::DoOnExecuteTxAfterWrite(NColumnShard::TColumnShard& /*self*/, NColumnShard::TBlobManagerDb& dbBlobs, const bool blobsWroteSuccessfully) {
19+
if (blobsWroteSuccessfully) {
2020
for (auto&& i : GetBlobsForWrite()) {
2121
dbBlobs.RemoveTierDraftBlobId(GetStorageId(), i.first);
2222
}

0 commit comments

Comments
 (0)