From 58e2ece105cfcf9c6c2bff4e7193cc4c2984cd3b Mon Sep 17 00:00:00 2001 From: ivanmorozov333 Date: Wed, 22 Jan 2025 17:09:16 +0300 Subject: [PATCH 1/2] fix tsan alerts --- .../engines/reader/common_reader/iterator/fetching.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ydb/core/tx/columnshard/engines/reader/common_reader/iterator/fetching.h b/ydb/core/tx/columnshard/engines/reader/common_reader/iterator/fetching.h index 9e284e2c5a70..1eed177bbac3 100644 --- a/ydb/core/tx/columnshard/engines/reader/common_reader/iterator/fetching.h +++ b/ydb/core/tx/columnshard/engines/reader/common_reader/iterator/fetching.h @@ -67,8 +67,8 @@ class TFetchingStepsSignalsCollection: public NColumnShard::TCommonCountersOwner class IFetchingStep: public TNonCopyable { private: YDB_READONLY_DEF(TString, Name); - TAtomicCounter SumDuration; - YDB_READONLY(ui64, SumSize, 0); + YDB_READONLY_DEF(TAtomicCounter, SumDurationUs); + YDB_READONLY_DEF(TAtomicCounter, SumSize); TFetchingStepSignals Signals; protected: @@ -83,11 +83,11 @@ class IFetchingStep: public TNonCopyable { } void AddDuration(const TDuration d) { - SumDuration.Add(d.MicroSeconds()); + SumDurationUs.Add(d.MicroSeconds()); Signals.AddDuration(d); } void AddDataSize(const ui64 size) { - SumSize += size; + SumSize.Add(size); Signals.AddBytes(size); } From 08147ae61d51298a8fffe022ce9f404787b35328 Mon Sep 17 00:00:00 2001 From: ivanmorozov333 Date: Wed, 22 Jan 2025 17:13:25 +0300 Subject: [PATCH 2/2] correction --- .../engines/reader/common_reader/iterator/fetching.cpp | 2 +- .../engines/reader/common_reader/iterator/fetching.h | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ydb/core/tx/columnshard/engines/reader/common_reader/iterator/fetching.cpp b/ydb/core/tx/columnshard/engines/reader/common_reader/iterator/fetching.cpp index f22fa8683677..edfcf0c69660 100644 --- a/ydb/core/tx/columnshard/engines/reader/common_reader/iterator/fetching.cpp +++ b/ydb/core/tx/columnshard/engines/reader/common_reader/iterator/fetching.cpp @@ -121,7 +121,7 @@ void TFetchingScript::Allocation(const std::set& entityIds, const EStageFe TString IFetchingStep::DebugString() const { TStringBuilder sb; sb << "name=" << Name << ";duration=" << GetSumDuration() << ";" - << "size=" << 1e-9 * SumSize << ";details={" << DoDebugString() << "};"; + << "size=" << 1e-9 * GetSumSize() << ";details={" << DoDebugString() << "};"; return sb; } diff --git a/ydb/core/tx/columnshard/engines/reader/common_reader/iterator/fetching.h b/ydb/core/tx/columnshard/engines/reader/common_reader/iterator/fetching.h index 1eed177bbac3..de64e8664583 100644 --- a/ydb/core/tx/columnshard/engines/reader/common_reader/iterator/fetching.h +++ b/ydb/core/tx/columnshard/engines/reader/common_reader/iterator/fetching.h @@ -67,8 +67,8 @@ class TFetchingStepsSignalsCollection: public NColumnShard::TCommonCountersOwner class IFetchingStep: public TNonCopyable { private: YDB_READONLY_DEF(TString, Name); - YDB_READONLY_DEF(TAtomicCounter, SumDurationUs); - YDB_READONLY_DEF(TAtomicCounter, SumSize); + TAtomicCounter SumDuration; + TAtomicCounter SumSize; TFetchingStepSignals Signals; protected: @@ -82,8 +82,12 @@ class IFetchingStep: public TNonCopyable { return TDuration::MicroSeconds(SumDuration.Val()); } + ui64 GetSumSize() const { + return SumSize.Val(); + } + void AddDuration(const TDuration d) { - SumDurationUs.Add(d.MicroSeconds()); + SumDuration.Add(d.MicroSeconds()); Signals.AddDuration(d); } void AddDataSize(const ui64 size) {