aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarkady-e1ppa <arkady-e1ppa@yandex-team.com>2024-11-14 12:08:09 +0300
committerarkady-e1ppa <arkady-e1ppa@yandex-team.com>2024-11-14 12:22:27 +0300
commite667baaa857655a17da06aaf7ca0188e3f0178d8 (patch)
tree2ca5bfe0a5ed81353953f61d67cfe9ea2823ce2c
parentff08899f35c35434c56cfb49f1d6d849ed91d228 (diff)
downloadydb-e667baaa857655a17da06aaf7ca0188e3f0178d8.tar.gz
Fix babenko issues of rXXXXXX
[nodiff:caesar] commit_hash:93eef00a7132e68e727aa1f4028616db6522d03c
-rw-r--r--library/cpp/yt/threading/atomic_object-inl.h4
-rw-r--r--library/cpp/yt/threading/atomic_object.h4
-rw-r--r--yt/yt/client/api/rpc_proxy/connection_impl.h6
-rw-r--r--yt/yt/client/logging/dynamic_table_log_writer.cpp3
-rw-r--r--yt/yt/core/bus/tcp/connection.h4
-rw-r--r--yt/yt/core/rpc/bus/channel.cpp6
-rw-r--r--yt/yt/core/rpc/per_key_request_queue_provider.h2
-rw-r--r--yt/yt/core/test_framework/test_proxy_service.h6
-rw-r--r--yt/yt/core/ytree/ypath_service.cpp5
-rw-r--r--yt/yt/library/tracing/jaeger/tracer.h4
10 files changed, 23 insertions, 21 deletions
diff --git a/library/cpp/yt/threading/atomic_object-inl.h b/library/cpp/yt/threading/atomic_object-inl.h
index 452f5a0bc7..fc8238cc83 100644
--- a/library/cpp/yt/threading/atomic_object-inl.h
+++ b/library/cpp/yt/threading/atomic_object-inl.h
@@ -4,7 +4,7 @@
#include "atomic_object.h"
#endif
-namespace NYT {
+namespace NYT::NThreading {
////////////////////////////////////////////////////////////////////////////////
@@ -94,4 +94,4 @@ void FromProto(TAtomicObject<TOriginal>* original, const TSerialized& serialized
////////////////////////////////////////////////////////////////////////////////
-} // namespace NYT
+} // namespace NYT::NThreading
diff --git a/library/cpp/yt/threading/atomic_object.h b/library/cpp/yt/threading/atomic_object.h
index e986f872a0..232a567e2d 100644
--- a/library/cpp/yt/threading/atomic_object.h
+++ b/library/cpp/yt/threading/atomic_object.h
@@ -4,7 +4,7 @@
#include <concepts>
-namespace NYT {
+namespace NYT::NThreading {
////////////////////////////////////////////////////////////////////////////////
@@ -56,7 +56,7 @@ void FromProto(TAtomicObject<TOriginal>* original, const TSerialized& serialized
////////////////////////////////////////////////////////////////////////////////
-} // namespace NYT
+} // namespace NYT::NThreading
#define ATOMIC_OBJECT_INL_H_
#include "atomic_object-inl.h"
diff --git a/yt/yt/client/api/rpc_proxy/connection_impl.h b/yt/yt/client/api/rpc_proxy/connection_impl.h
index 182bfc864a..3e050989ca 100644
--- a/yt/yt/client/api/rpc_proxy/connection_impl.h
+++ b/yt/yt/client/api/rpc_proxy/connection_impl.h
@@ -9,12 +9,12 @@
#include <yt/yt/core/rpc/public.h>
// TODO(prime@): Create HTTP endpoint for discovery that works without authentication.
-#include <library/cpp/yt/threading/atomic_object.h>
-
#include <yt/yt/core/service_discovery/public.h>
#include <yt/yt/core/logging/log.h>
+#include <library/cpp/yt/threading/atomic_object.h>
+
namespace NYT::NApi::NRpcProxy {
////////////////////////////////////////////////////////////////////////////////
@@ -76,7 +76,7 @@ private:
NConcurrency::TPeriodicExecutorPtr UpdateProxyListExecutor_;
// TODO(prime@): Create HTTP endpoint for discovery that works without authentication.
- TAtomicObject<TString> DiscoveryToken_;
+ NThreading::TAtomicObject<TString> DiscoveryToken_;
NServiceDiscovery::IServiceDiscoveryPtr ServiceDiscovery_;
diff --git a/yt/yt/client/logging/dynamic_table_log_writer.cpp b/yt/yt/client/logging/dynamic_table_log_writer.cpp
index c6c731f2dd..19185a57b5 100644
--- a/yt/yt/client/logging/dynamic_table_log_writer.cpp
+++ b/yt/yt/client/logging/dynamic_table_log_writer.cpp
@@ -24,11 +24,12 @@
#include <yt/yt/core/logging/formatter.h>
#include <yt/yt/core/logging/system_log_event_provider.h>
-#include <library/cpp/yt/threading/atomic_object.h>
#include <yt/yt/core/misc/proc.h>
#include <library/cpp/yt/memory/atomic_intrusive_ptr.h>
+#include <library/cpp/yt/threading/atomic_object.h>
+
#include <util/stream/length.h>
namespace NYT::NLogging {
diff --git a/yt/yt/core/bus/tcp/connection.h b/yt/yt/core/bus/tcp/connection.h
index 421216ed81..217cfcc037 100644
--- a/yt/yt/core/bus/tcp/connection.h
+++ b/yt/yt/core/bus/tcp/connection.h
@@ -15,7 +15,6 @@
#include <yt/yt/core/net/address.h>
-#include <library/cpp/yt/threading/atomic_object.h>
#include <yt/yt/core/misc/blob.h>
#include <yt/yt/core/misc/mpsc_stack.h>
#include <yt/yt/core/misc/ring_queue.h>
@@ -26,6 +25,7 @@
#include <yt/yt/core/concurrency/pollable_detail.h>
+#include <library/cpp/yt/threading/atomic_object.h>
#include <library/cpp/yt/threading/spin_lock.h>
#include <util/network/init.h>
@@ -227,7 +227,7 @@ private:
EMultiplexingBand ActualMultiplexingBand_ = EMultiplexingBand::Default;
- TAtomicObject<TError> Error_;
+ NThreading::TAtomicObject<TError> Error_;
NNet::IAsyncDialerSessionPtr DialerSession_;
diff --git a/yt/yt/core/rpc/bus/channel.cpp b/yt/yt/core/rpc/bus/channel.cpp
index ac3fa494d0..9edfe97ecb 100644
--- a/yt/yt/core/rpc/bus/channel.cpp
+++ b/yt/yt/core/rpc/bus/channel.cpp
@@ -19,12 +19,12 @@
#include <yt/yt/core/concurrency/thread_affinity.h>
#include <yt/yt/core/misc/finally.h>
-#include <library/cpp/yt/threading/atomic_object.h>
#include <yt/yt/core/tracing/public.h>
#include <yt/yt_proto/yt/core/rpc/proto/rpc.pb.h>
+#include <library/cpp/yt/threading/atomic_object.h>
#include <library/cpp/yt/threading/rw_spin_lock.h>
#include <library/cpp/yt/threading/spin_lock.h>
@@ -178,7 +178,7 @@ private:
TEnumIndexedArray<EMultiplexingBand, TBandBucket> Buckets_;
std::atomic<bool> TerminationFlag_ = false;
- TAtomicObject<TError> TerminationError_;
+ NThreading::TAtomicObject<TError> TerminationError_;
TSessionPtr GetOrCreateSession(const TSendOptions& options)
{
@@ -687,7 +687,7 @@ private:
std::array<TBucket, BucketCount> RequestBuckets_;
std::atomic<bool> TerminationFlag_ = false;
- TAtomicObject<TError> TerminationError_;
+ NThreading::TAtomicObject<TError> TerminationError_;
TFuture<void> GetBusReadyFuture()
diff --git a/yt/yt/core/rpc/per_key_request_queue_provider.h b/yt/yt/core/rpc/per_key_request_queue_provider.h
index 4e49732082..b36f13c64b 100644
--- a/yt/yt/core/rpc/per_key_request_queue_provider.h
+++ b/yt/yt/core/rpc/per_key_request_queue_provider.h
@@ -47,7 +47,7 @@ private:
NConcurrency::TSyncMap<TKey, TRequestQueuePtr> RequestQueues_;
- TAtomicObject<TRequestQueueThrottlerConfigs> DefaultConfigs_;
+ NThreading::TAtomicObject<TRequestQueueThrottlerConfigs> DefaultConfigs_;
TKeyFromRequestHeaderCallback KeyFromRequestHeader_;
TReconfigurationCallback ReconfigurationCallback_;
diff --git a/yt/yt/core/test_framework/test_proxy_service.h b/yt/yt/core/test_framework/test_proxy_service.h
index 26c0bde173..07cdb6f2d1 100644
--- a/yt/yt/core/test_framework/test_proxy_service.h
+++ b/yt/yt/core/test_framework/test_proxy_service.h
@@ -10,10 +10,10 @@
#include <yt/yt/core/logging/log.h>
-#include <library/cpp/yt/threading/atomic_object.h>
-
#include <yt/yt/core/ytree/attributes.h>
+#include <library/cpp/yt/threading/atomic_object.h>
+
#include <library/cpp/testing/common/network.h>
namespace NYT::NRpc {
@@ -127,7 +127,7 @@ private:
TSingleShotCallbackList<void(const TError&)> Terminated_;
std::atomic<bool> TerminationFlag_ = false;
- TAtomicObject<TError> TerminationError_;
+ NThreading::TAtomicObject<TError> TerminationError_;
THashMap<std::pair<TString, TGuid>, TTestBusPtr> RequestToBus_;
diff --git a/yt/yt/core/ytree/ypath_service.cpp b/yt/yt/core/ytree/ypath_service.cpp
index 212fb9f76f..cb26f32482 100644
--- a/yt/yt/core/ytree/ypath_service.cpp
+++ b/yt/yt/core/ytree/ypath_service.cpp
@@ -22,10 +22,11 @@
#include <yt/yt/core/concurrency/periodic_executor.h>
#include <yt/yt/core/misc/checksum.h>
-#include <library/cpp/yt/threading/atomic_object.h>
#include <library/cpp/yt/memory/atomic_intrusive_ptr.h>
+#include <library/cpp/yt/threading/atomic_object.h>
+
namespace NYT::NYTree {
////////////////////////////////////////////////////////////////////////////////
@@ -523,7 +524,7 @@ private:
const IInvokerPtr WorkerInvoker_;
const TDuration UpdatePeriod_;
- TAtomicObject<TYsonString> CachedString_ = {BuildYsonStringFluently().Entity()};
+ NThreading::TAtomicObject<TYsonString> CachedString_ = {BuildYsonStringFluently().Entity()};
void Produce(IYsonConsumer* consumer)
{
diff --git a/yt/yt/library/tracing/jaeger/tracer.h b/yt/yt/library/tracing/jaeger/tracer.h
index 387b3a8360..695abfd206 100644
--- a/yt/yt/library/tracing/jaeger/tracer.h
+++ b/yt/yt/library/tracing/jaeger/tracer.h
@@ -10,12 +10,12 @@
#include <yt/yt/library/tvm/service/public.h>
#include <yt/yt/core/misc/mpsc_stack.h>
-#include <library/cpp/yt/threading/atomic_object.h>
#include <yt/yt/core/rpc/grpc/config.h>
#include <yt/yt/core/ytree/yson_struct.h>
+#include <library/cpp/yt/threading/atomic_object.h>
#include <library/cpp/yt/threading/spin_lock.h>
#include <library/cpp/yt/memory/atomic_intrusive_ptr.h>
@@ -188,7 +188,7 @@ private:
i64 TotalMemory_ = 0;
i64 TotalSize_ = 0;
- TAtomicObject<TPromise<void>> QueueEmptyPromise_ = NewPromise<void>();
+ NThreading::TAtomicObject<TPromise<void>> QueueEmptyPromise_ = NewPromise<void>();
THashMap<TString, TJaegerChannelManagerPtr> CollectorChannels_;
NRpc::NGrpc::TChannelConfigPtr OpenChannelConfig_;