Skip to content

Commit 498896d

Browse files
MBkktMBkkt
committed
Apply review suggestions
1 parent fc0f105 commit 498896d

6 files changed

+24
-22
lines changed

‎ydb/core/tx/schemeshard/schemeshard_build_index.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,8 @@ void TSchemeShard::PersistBuildIndexProcessed(NIceDb::TNiceDb& db, const TIndexB
210210

211211
void TSchemeShard::PersistBuildIndexBilled(NIceDb::TNiceDb& db, const TIndexBuildInfo& indexInfo) {
212212
db.Table<Schema::IndexBuild>().Key(indexInfo.Id).Update(
213-
NIceDb::TUpdate<Schema::IndexBuild::UploadRowsBilled>(indexInfo.Billed.GetUploadRows()),
214-
NIceDb::TUpdate<Schema::IndexBuild::UploadBytesBilled>(indexInfo.Billed.GetUploadBytes()),
213+
NIceDb::TUpdate<Schema::IndexBuild::RowsBilled>(indexInfo.Billed.GetUploadRows()),
214+
NIceDb::TUpdate<Schema::IndexBuild::BytesBilled>(indexInfo.Billed.GetUploadBytes()),
215215
NIceDb::TUpdate<Schema::IndexBuild::ReadRowsBilled>(indexInfo.Billed.GetReadRows()),
216216
NIceDb::TUpdate<Schema::IndexBuild::ReadBytesBilled>(indexInfo.Billed.GetReadBytes())
217217
);
@@ -223,8 +223,8 @@ void TSchemeShard::PersistBuildIndexUploadProgress(NIceDb::TNiceDb& db, TIndexBu
223223
NIceDb::TUpdate<Schema::IndexBuildShardStatus::Status>(shardStatus.Status),
224224
NIceDb::TUpdate<Schema::IndexBuildShardStatus::Message>(shardStatus.DebugMessage),
225225
NIceDb::TUpdate<Schema::IndexBuildShardStatus::UploadStatus>(shardStatus.UploadStatus),
226-
NIceDb::TUpdate<Schema::IndexBuildShardStatus::UploadRowsProcessed>(shardStatus.Processed.GetUploadRows()),
227-
NIceDb::TUpdate<Schema::IndexBuildShardStatus::UploadBytesProcessed>(shardStatus.Processed.GetUploadBytes()),
226+
NIceDb::TUpdate<Schema::IndexBuildShardStatus::RowsProcessed>(shardStatus.Processed.GetUploadRows()),
227+
NIceDb::TUpdate<Schema::IndexBuildShardStatus::BytesProcessed>(shardStatus.Processed.GetUploadBytes()),
228228
NIceDb::TUpdate<Schema::IndexBuildShardStatus::ReadRowsProcessed>(shardStatus.Processed.GetReadRows()),
229229
NIceDb::TUpdate<Schema::IndexBuildShardStatus::ReadBytesProcessed>(shardStatus.Processed.GetReadBytes())
230230
);
@@ -246,8 +246,8 @@ void TSchemeShard::PersistBuildIndexUploadReset(NIceDb::TNiceDb& db, TIndexBuild
246246
shardStatus.Processed = {};
247247
db.Table<Schema::IndexBuildShardStatus>().Key(buildId, shardIdx.GetOwnerId(), shardIdx.GetLocalId()).Update(
248248
NIceDb::TUpdate<Schema::IndexBuildShardStatus::Status>(shardStatus.Status),
249-
NIceDb::TUpdate<Schema::IndexBuildShardStatus::UploadRowsProcessed>(shardStatus.Processed.GetUploadRows()),
250-
NIceDb::TUpdate<Schema::IndexBuildShardStatus::UploadBytesProcessed>(shardStatus.Processed.GetUploadBytes()),
249+
NIceDb::TUpdate<Schema::IndexBuildShardStatus::RowsProcessed>(shardStatus.Processed.GetUploadRows()),
250+
NIceDb::TUpdate<Schema::IndexBuildShardStatus::BytesProcessed>(shardStatus.Processed.GetUploadBytes()),
251251
NIceDb::TUpdate<Schema::IndexBuildShardStatus::ReadRowsProcessed>(shardStatus.Processed.GetReadRows()),
252252
NIceDb::TUpdate<Schema::IndexBuildShardStatus::ReadBytesProcessed>(shardStatus.Processed.GetReadBytes())
253253
);

‎ydb/core/tx/schemeshard/schemeshard_build_index_tx_base.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,10 @@ void TSchemeShard::TIndexBuilder::TTxBase::ApplyBill(NTabletFlatExecutor::TTrans
142142
TString id = TStringBuilder()
143143
<< buildId << "-"
144144
<< buildInfo.TablePathId.OwnerId << "-" << buildInfo.TablePathId.LocalPathId << "-"
145-
<< billed.GetUploadRows() + billed.GetReadRows() << "-" << billed.GetUploadBytes() + billed.GetReadBytes() << "-"
146-
<< processed.GetUploadRows() + processed.GetReadRows() << "-" << processed.GetUploadBytes() + processed.GetReadBytes();
145+
<< billed.GetUploadRows() << "-" << billed.GetReadRows() << "-"
146+
<< billed.GetUploadBytes() << "-" << billed.GetReadBytes() << "-"
147+
<< processed.GetUploadRows() << "-" << processed.GetReadRows() << "-"
148+
<< processed.GetUploadBytes() << "-" << processed.GetReadBytes();
147149

148150
NIceDb::TNiceDb db(txc.DB);
149151

‎ydb/core/tx/schemeshard/schemeshard_info_types.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -3413,8 +3413,8 @@ struct TIndexBuildInfo: public TSimpleRefCount<TIndexBuildInfo> {
34133413

34143414
auto& billed = indexInfo->Billed;
34153415
billed = {
3416-
row.template GetValueOrDefault<Schema::IndexBuild::UploadRowsBilled>(0),
3417-
row.template GetValueOrDefault<Schema::IndexBuild::UploadBytesBilled>(0),
3416+
row.template GetValueOrDefault<Schema::IndexBuild::RowsBilled>(0),
3417+
row.template GetValueOrDefault<Schema::IndexBuild::BytesBilled>(0),
34183418
row.template GetValueOrDefault<Schema::IndexBuild::ReadRowsBilled>(0),
34193419
row.template GetValueOrDefault<Schema::IndexBuild::ReadBytesBilled>(0),
34203420
};
@@ -3462,8 +3462,8 @@ struct TIndexBuildInfo: public TSimpleRefCount<TIndexBuildInfo> {
34623462

34633463
auto& processed = shardStatus.Processed;
34643464
processed = {
3465-
row.template GetValueOrDefault<Schema::IndexBuildShardStatus::UploadRowsProcessed>(0),
3466-
row.template GetValueOrDefault<Schema::IndexBuildShardStatus::UploadBytesProcessed>(0),
3465+
row.template GetValueOrDefault<Schema::IndexBuildShardStatus::RowsProcessed>(0),
3466+
row.template GetValueOrDefault<Schema::IndexBuildShardStatus::BytesProcessed>(0),
34673467
row.template GetValueOrDefault<Schema::IndexBuildShardStatus::ReadRowsProcessed>(0),
34683468
row.template GetValueOrDefault<Schema::IndexBuildShardStatus::ReadBytesProcessed>(0),
34693469
};

‎ydb/core/tx/schemeshard/schemeshard_schema.h

+8-8
Original file line numberDiff line numberDiff line change
@@ -1316,8 +1316,8 @@ struct Schema : NIceDb::Schema {
13161316

13171317
struct MaxRetries : Column<27, NScheme::NTypeIds::Uint32> {};
13181318

1319-
struct UploadRowsBilled : Column<28, NScheme::NTypeIds::Uint64> {};
1320-
struct UploadBytesBilled : Column<29, NScheme::NTypeIds::Uint64> {};
1319+
struct /*Upload*/ RowsBilled : Column<28, NScheme::NTypeIds::Uint64> {};
1320+
struct /*Upload*/ BytesBilled : Column<29, NScheme::NTypeIds::Uint64> {};
13211321

13221322
struct BuildKind : Column<30, NScheme::NTypeIds::Uint32> {};
13231323

@@ -1366,8 +1366,8 @@ struct Schema : NIceDb::Schema {
13661366
UnlockTxDone,
13671367
CancelRequest,
13681368
MaxRetries,
1369-
UploadRowsBilled,
1370-
UploadBytesBilled,
1369+
RowsBilled,
1370+
BytesBilled,
13711371
BuildKind,
13721372
AlterMainTableTxId,
13731373
AlterMainTableTxStatus,
@@ -1446,8 +1446,8 @@ struct Schema : NIceDb::Schema {
14461446
struct Message : Column<7, NScheme::NTypeIds::Utf8> {};
14471447
struct UploadStatus : Column<8, NScheme::NTypeIds::Uint32> { using Type = Ydb::StatusIds::StatusCode; };
14481448

1449-
struct UploadRowsProcessed : Column<9, NScheme::NTypeIds::Uint64> {};
1450-
struct UploadBytesProcessed : Column<10, NScheme::NTypeIds::Uint64> {};
1449+
struct /*Upload*/ RowsProcessed : Column<9, NScheme::NTypeIds::Uint64> {};
1450+
struct /*Upload*/ BytesProcessed : Column<10, NScheme::NTypeIds::Uint64> {};
14511451

14521452
struct ReadRowsProcessed : Column<11, NScheme::NTypeIds::Uint64> {};
14531453
struct ReadBytesProcessed : Column<12, NScheme::NTypeIds::Uint64> {};
@@ -1462,8 +1462,8 @@ struct Schema : NIceDb::Schema {
14621462
Status,
14631463
Message,
14641464
UploadStatus,
1465-
UploadRowsProcessed,
1466-
UploadBytesProcessed,
1465+
RowsProcessed,
1466+
BytesProcessed,
14671467
ReadRowsProcessed,
14681468
ReadBytesProcessed
14691469
>;

‎ydb/core/tx/schemeshard/ut_index_build/ut_index_build.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ Y_UNIT_TEST_SUITE(IndexBuildTest) {
299299
auto descr = TestGetBuildIndex(runtime, tenantSchemeShard, "/MyRoot/ServerLessDB", txId);
300300
UNIT_ASSERT_VALUES_EQUAL(descr.GetIndexBuild().GetState(), Ydb::Table::IndexBuildState::STATE_DONE);
301301

302-
const TString meteringData = R"({"usage":{"start":0,"quantity":179,"finish":0,"unit":"request_unit","type":"delta"},"tags":{},"id":"106-72075186233409549-2-0-0-202-3636","cloud_id":"CLOUD_ID_VAL","source_wt":0,"source_id":"sless-docapi-ydb-ss","resource_id":"DATABASE_ID_VAL","schema":"ydb.serverless.requests.v1","folder_id":"FOLDER_ID_VAL","version":"1.0.0"})";
302+
const TString meteringData = R"({"usage":{"start":0,"quantity":179,"finish":0,"unit":"request_unit","type":"delta"},"tags":{},"id":"106-72075186233409549-2-0-0-0-0-101-101-1818-1818","cloud_id":"CLOUD_ID_VAL","source_wt":0,"source_id":"sless-docapi-ydb-ss","resource_id":"DATABASE_ID_VAL","schema":"ydb.serverless.requests.v1","folder_id":"FOLDER_ID_VAL","version":"1.0.0"})";
303303

304304
UNIT_ASSERT_NO_DIFF(meteringMessages, meteringData + "\n");
305305

‎ydb/core/tx/schemeshard/ut_index_build/ut_vector_index_build.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ Y_UNIT_TEST_SUITE (VectorIndexBuildTest) {
128128
auto descr = TestGetBuildIndex(runtime, tenantSchemeShard, "/MyRoot/ServerLessDB", txId);
129129
UNIT_ASSERT_VALUES_EQUAL(descr.GetIndexBuild().GetState(), Ydb::Table::IndexBuildState::STATE_DONE);
130130

131-
const TString meteringData = R"({"usage":{"start":2,"quantity":330,"finish":2,"unit":"request_unit","type":"delta"},"tags":{},"id":"106-72075186233409549-2-0-0-604-3976","cloud_id":"CLOUD_ID_VAL","source_wt":2,"source_id":"sless-docapi-ydb-ss","resource_id":"DATABASE_ID_VAL","schema":"ydb.serverless.requests.v1","folder_id":"FOLDER_ID_VAL","version":"1.0.0"})""\n";
131+
const TString meteringData = R"({"usage":{"start":2,"quantity":330,"finish":2,"unit":"request_unit","type":"delta"},"tags":{},"id":"106-72075186233409549-2-0-0-0-0-200-404-1290-2686","cloud_id":"CLOUD_ID_VAL","source_wt":2,"source_id":"sless-docapi-ydb-ss","resource_id":"DATABASE_ID_VAL","schema":"ydb.serverless.requests.v1","folder_id":"FOLDER_ID_VAL","version":"1.0.0"})""\n";
132132

133133
UNIT_ASSERT_NO_DIFF(meteringMessages, meteringData);
134134

0 commit comments

Comments
 (0)