From 1a9e296ee72309e27c9be99b5c1a5c97ea04a5ab Mon Sep 17 00:00:00 2001 From: ivanmorozov333 Date: Thu, 12 Dec 2024 13:10:26 +0300 Subject: [PATCH 1/6] fix states usage for accessors request filling --- ydb/core/tx/columnshard/data_accessor/request.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ydb/core/tx/columnshard/data_accessor/request.h b/ydb/core/tx/columnshard/data_accessor/request.h index cf7012bbfc88..842bea4cc4dc 100644 --- a/ydb/core/tx/columnshard/data_accessor/request.h +++ b/ydb/core/tx/columnshard/data_accessor/request.h @@ -276,7 +276,7 @@ class TDataAccessorsRequest: public NColumnShard::TMonitoringObjectsCountersecond.OnError(errorMessage); From 8cec7e4ab3550e7fb9bf2ff832cb7a4e9190bc81 Mon Sep 17 00:00:00 2001 From: ivanmorozov333 Date: Thu, 12 Dec 2024 13:31:13 +0300 Subject: [PATCH 2/6] correction --- ydb/core/tx/columnshard/columnshard__write.cpp | 5 +++++ ydb/core/tx/columnshard/data_accessor/request.h | 1 + 2 files changed, 6 insertions(+) diff --git a/ydb/core/tx/columnshard/columnshard__write.cpp b/ydb/core/tx/columnshard/columnshard__write.cpp index c54b2bfe236c..e11ea06780d5 100644 --- a/ydb/core/tx/columnshard/columnshard__write.cpp +++ b/ydb/core/tx/columnshard/columnshard__write.cpp @@ -482,6 +482,7 @@ void TColumnShard::Handle(NEvents::TDataEvents::TEvWrite::TPtr& ev, const TActor ctx.Send(source, result.release(), 0, cookie); }; if (behaviour == EOperationBehaviour::CommitWriteLock) { + TMemoryProfileGuard mpg1("NEvents::TDataEvents::TEvWrite::Commit"); auto commitOperation = std::make_shared(TabletID()); auto conclusionParse = commitOperation->Parse(*ev->Get()); if (conclusionParse.IsFail()) { @@ -520,6 +521,7 @@ void TColumnShard::Handle(NEvents::TDataEvents::TEvWrite::TPtr& ev, const TActor ctx.Send(source, result.release(), 0, cookie); return; } + TMemoryProfileGuard mpg2("NEvents::TDataEvents::TEvWrite::Continue"); const auto& operation = record.GetOperations()[0]; const std::optional mType = @@ -583,14 +585,17 @@ void TColumnShard::Handle(NEvents::TDataEvents::TEvWrite::TPtr& ev, const TActor return; } + TMemoryProfileGuard mpg3("NEvents::TDataEvents::TEvWrite::Continue3"); OperationsManager->RegisterLock(lockId, Generation()); auto writeOperation = OperationsManager->RegisterOperation( pathId, lockId, cookie, granuleShardingVersionId, *mType, AppDataVerified().FeatureFlags.GetEnableWritePortionsOnInsert()); Y_ABORT_UNLESS(writeOperation); + TMemoryProfileGuard mpg4("NEvents::TDataEvents::TEvWrite::Continue4"); writeOperation->SetBehaviour(behaviour); NOlap::TWritingContext wContext(pathId, SelfId(), schema, StoragesManager, Counters.GetIndexationCounters().SplitterCounters, Counters.GetCSCounters().WritingCounters, NOlap::TSnapshot::Max()); arrowData->SetSeparationPoints(GetIndexAs().GetGranulePtrVerified(pathId)->GetBucketPositions()); + TMemoryProfileGuard mpg3("NEvents::TDataEvents::TEvWrite::Continue5"); writeOperation->Start(*this, arrowData, source, wContext); } diff --git a/ydb/core/tx/columnshard/data_accessor/request.h b/ydb/core/tx/columnshard/data_accessor/request.h index 842bea4cc4dc..6cba75a0d90d 100644 --- a/ydb/core/tx/columnshard/data_accessor/request.h +++ b/ydb/core/tx/columnshard/data_accessor/request.h @@ -276,6 +276,7 @@ class TDataAccessorsRequest: public NColumnShard::TMonitoringObjectsCounter Date: Thu, 12 Dec 2024 13:32:41 +0300 Subject: [PATCH 3/6] fix --- ydb/core/tx/columnshard/data_accessor/request.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ydb/core/tx/columnshard/data_accessor/request.h b/ydb/core/tx/columnshard/data_accessor/request.h index 6cba75a0d90d..892b19e49226 100644 --- a/ydb/core/tx/columnshard/data_accessor/request.h +++ b/ydb/core/tx/columnshard/data_accessor/request.h @@ -276,7 +276,7 @@ class TDataAccessorsRequest: public NColumnShard::TMonitoringObjectsCounter Date: Thu, 12 Dec 2024 13:34:10 +0300 Subject: [PATCH 4/6] fix --- ydb/core/tx/columnshard/columnshard__write.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ydb/core/tx/columnshard/columnshard__write.cpp b/ydb/core/tx/columnshard/columnshard__write.cpp index e11ea06780d5..538a54fc9bff 100644 --- a/ydb/core/tx/columnshard/columnshard__write.cpp +++ b/ydb/core/tx/columnshard/columnshard__write.cpp @@ -595,7 +595,7 @@ void TColumnShard::Handle(NEvents::TDataEvents::TEvWrite::TPtr& ev, const TActor NOlap::TWritingContext wContext(pathId, SelfId(), schema, StoragesManager, Counters.GetIndexationCounters().SplitterCounters, Counters.GetCSCounters().WritingCounters, NOlap::TSnapshot::Max()); arrowData->SetSeparationPoints(GetIndexAs().GetGranulePtrVerified(pathId)->GetBucketPositions()); - TMemoryProfileGuard mpg3("NEvents::TDataEvents::TEvWrite::Continue5"); + TMemoryProfileGuard mpg5("NEvents::TDataEvents::TEvWrite::Continue5"); writeOperation->Start(*this, arrowData, source, wContext); } From 622b6624eee1a7d3cafa6eae27dd8195dccd26e1 Mon Sep 17 00:00:00 2001 From: ivanmorozov333 Date: Thu, 12 Dec 2024 14:12:50 +0300 Subject: [PATCH 5/6] fix --- ydb/core/tx/columnshard/columnshard__write.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ydb/core/tx/columnshard/columnshard__write.cpp b/ydb/core/tx/columnshard/columnshard__write.cpp index 538a54fc9bff..bde82c119f16 100644 --- a/ydb/core/tx/columnshard/columnshard__write.cpp +++ b/ydb/core/tx/columnshard/columnshard__write.cpp @@ -537,6 +537,7 @@ void TColumnShard::Handle(NEvents::TDataEvents::TEvWrite::TPtr& ev, const TActor return; } + TMemoryProfileGuard mpg2("NEvents::TDataEvents::TEvWrite::Continue::21"); auto schema = TablesManager.GetPrimaryIndex()->GetVersionedIndex().GetSchemaOptional(operation.GetTableId().GetSchemaVersion()); if (!schema) { sendError("unknown schema version", NKikimrDataEvents::TEvWriteResult::STATUS_BAD_REQUEST); @@ -552,12 +553,14 @@ void TColumnShard::Handle(NEvents::TDataEvents::TEvWrite::TPtr& ev, const TActor Counters.GetColumnTablesCounters()->GetPathIdCounter(pathId)->OnWriteEvent(); + TMemoryProfileGuard mpg2("NEvents::TDataEvents::TEvWrite::Continue::0"); auto arrowData = std::make_shared(schema); if (!arrowData->Parse(operation, NEvWrite::TPayloadReader(*ev->Get()))) { sendError("parsing data error", NKikimrDataEvents::TEvWriteResult::STATUS_BAD_REQUEST); return; } + TMemoryProfileGuard mpg2("NEvents::TDataEvents::TEvWrite::Continue::1"); auto overloadStatus = CheckOverloaded(pathId); if (overloadStatus != EOverloadStatus::None) { std::unique_ptr result = NEvents::TDataEvents::TEvWriteResult::BuildError( @@ -573,6 +576,7 @@ void TColumnShard::Handle(NEvents::TDataEvents::TEvWrite::TPtr& ev, const TActor granuleShardingVersionId = record.GetGranuleShardingVersionId(); } + TMemoryProfileGuard mpg2("NEvents::TDataEvents::TEvWrite::Continue::2"); ui64 lockId = 0; if (behaviour == EOperationBehaviour::NoTxWrite) { lockId = BuildEphemeralTxId(); From 058f344b48e445cbadde5ee8c015e6827d7ce828 Mon Sep 17 00:00:00 2001 From: ivanmorozov333 Date: Thu, 12 Dec 2024 14:33:04 +0300 Subject: [PATCH 6/6] fix --- ydb/core/tx/columnshard/columnshard__write.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ydb/core/tx/columnshard/columnshard__write.cpp b/ydb/core/tx/columnshard/columnshard__write.cpp index bde82c119f16..694c47c33a1a 100644 --- a/ydb/core/tx/columnshard/columnshard__write.cpp +++ b/ydb/core/tx/columnshard/columnshard__write.cpp @@ -537,7 +537,7 @@ void TColumnShard::Handle(NEvents::TDataEvents::TEvWrite::TPtr& ev, const TActor return; } - TMemoryProfileGuard mpg2("NEvents::TDataEvents::TEvWrite::Continue::21"); + TMemoryProfileGuard mpg21("NEvents::TDataEvents::TEvWrite::Continue::21"); auto schema = TablesManager.GetPrimaryIndex()->GetVersionedIndex().GetSchemaOptional(operation.GetTableId().GetSchemaVersion()); if (!schema) { sendError("unknown schema version", NKikimrDataEvents::TEvWriteResult::STATUS_BAD_REQUEST); @@ -553,14 +553,14 @@ void TColumnShard::Handle(NEvents::TDataEvents::TEvWrite::TPtr& ev, const TActor Counters.GetColumnTablesCounters()->GetPathIdCounter(pathId)->OnWriteEvent(); - TMemoryProfileGuard mpg2("NEvents::TDataEvents::TEvWrite::Continue::0"); + TMemoryProfileGuard mpg20("NEvents::TDataEvents::TEvWrite::Continue::0"); auto arrowData = std::make_shared(schema); if (!arrowData->Parse(operation, NEvWrite::TPayloadReader(*ev->Get()))) { sendError("parsing data error", NKikimrDataEvents::TEvWriteResult::STATUS_BAD_REQUEST); return; } - TMemoryProfileGuard mpg2("NEvents::TDataEvents::TEvWrite::Continue::1"); + TMemoryProfileGuard mpg21("NEvents::TDataEvents::TEvWrite::Continue::1"); auto overloadStatus = CheckOverloaded(pathId); if (overloadStatus != EOverloadStatus::None) { std::unique_ptr result = NEvents::TDataEvents::TEvWriteResult::BuildError( @@ -576,7 +576,7 @@ void TColumnShard::Handle(NEvents::TDataEvents::TEvWrite::TPtr& ev, const TActor granuleShardingVersionId = record.GetGranuleShardingVersionId(); } - TMemoryProfileGuard mpg2("NEvents::TDataEvents::TEvWrite::Continue::2"); + TMemoryProfileGuard mpg22("NEvents::TDataEvents::TEvWrite::Continue::2"); ui64 lockId = 0; if (behaviour == EOperationBehaviour::NoTxWrite) { lockId = BuildEphemeralTxId();