diff options
| author | timestep <timestep@yandex-team.ru> | 2022-02-10 16:49:17 +0300 |
|---|---|---|
| committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:49:17 +0300 |
| commit | 30f4921b0fa8722e5531e72cb40a93b526f6973a (patch) | |
| tree | 5d5cb817648f650d76cf1076100726fd9b8448e8 | |
| parent | 38b4bd28ca420294f532ac7ca6b2770d60e3dfd0 (diff) | |
| download | ydb-30f4921b0fa8722e5531e72cb40a93b526f6973a.tar.gz | |
Restoring authorship annotation for <timestep@yandex-team.ru>. Commit 2 of 2.
255 files changed, 674 insertions, 674 deletions
diff --git a/library/cpp/actors/core/actor_coroutine.h b/library/cpp/actors/core/actor_coroutine.h index 71f020bc12..6bcb768eaf 100644 --- a/library/cpp/actors/core/actor_coroutine.h +++ b/library/cpp/actors/core/actor_coroutine.h @@ -99,7 +99,7 @@ namespace NActors { return ev.GetTypeRewrite() == TEventType::EventType; }; THolder<IEventHandle> event = WaitForSpecificEvent(filter, deadline); - return THolder<typename TEventType::THandle>(static_cast<typename TEventType::THandle*>(event ? event.Release() : nullptr)); + return THolder<typename TEventType::THandle>(static_cast<typename TEventType::THandle*>(event ? event.Release() : nullptr)); } protected: // Actor System compatibility section diff --git a/library/cpp/actors/core/actor_coroutine_ut.cpp b/library/cpp/actors/core/actor_coroutine_ut.cpp index 9456ce67a1..951512b877 100644 --- a/library/cpp/actors/core/actor_coroutine_ut.cpp +++ b/library/cpp/actors/core/actor_coroutine_ut.cpp @@ -102,7 +102,7 @@ Y_UNIT_TEST_SUITE(ActorCoro) { }; void Check(THolder<IEventBase> && message) { - THolder<TActorSystemSetup> setup = MakeHolder<TActorSystemSetup>(); + THolder<TActorSystemSetup> setup = MakeHolder<TActorSystemSetup>(); setup->NodeId = 0; setup->ExecutorsCount = 1; setup->Executors.Reset(new TAutoPtr<IExecutorPool>[setup->ExecutorsCount]); @@ -117,7 +117,7 @@ Y_UNIT_TEST_SUITE(ActorCoro) { TManualEvent doneEvent; TAtomic itemsProcessed = 0; - TActorId actor = actorSystem.Register(new TActorCoro(MakeHolder<TCoroActor>(doneEvent, itemsProcessed))); + TActorId actor = actorSystem.Register(new TActorCoro(MakeHolder<TCoroActor>(doneEvent, itemsProcessed))); NanoSleep(3UL * 1000 * 1000 * 1000); actorSystem.Send(actor, message.Release()); doneEvent.WaitI(); diff --git a/library/cpp/actors/core/ask.cpp b/library/cpp/actors/core/ask.cpp index 7ba8d15e47..0054c9a906 100644 --- a/library/cpp/actors/core/ask.cpp +++ b/library/cpp/actors/core/ask.cpp @@ -69,6 +69,6 @@ namespace NActors { TDuration timeout, const NThreading::TPromise<THolder<IEventBase>>& promise) { - return MakeHolder<TAskActor>(expectedEventType, std::move(recipient), std::move(event), timeout, promise); + return MakeHolder<TAskActor>(expectedEventType, std::move(recipient), std::move(event), timeout, promise); } } diff --git a/library/cpp/actors/core/ask_ut.cpp b/library/cpp/actors/core/ask_ut.cpp index 3bf54035d4..e72ebdba9b 100644 --- a/library/cpp/actors/core/ask_ut.cpp +++ b/library/cpp/actors/core/ask_ut.cpp @@ -56,7 +56,7 @@ Y_UNIT_TEST_SUITE(AskActor) { { auto fut = runtime->GetAnyNodeActorSystem()->Ask<TEvents::TEvPong>( pingpong, - THolder(new TEvents::TEvPing)); + THolder(new TEvents::TEvPing)); runtime->DispatchEvents(); fut.ExtractValueSync(); } @@ -64,7 +64,7 @@ Y_UNIT_TEST_SUITE(AskActor) { { auto fut = runtime->GetAnyNodeActorSystem()->Ask<TEvents::TEvBlob>( pingpong, - THolder(new TEvents::TEvBlob("hello!"))); + THolder(new TEvents::TEvBlob("hello!"))); runtime->DispatchEvents(); auto ev = fut.ExtractValueSync(); UNIT_ASSERT_VALUES_EQUAL(ev->Blob, "hello!"); @@ -73,7 +73,7 @@ Y_UNIT_TEST_SUITE(AskActor) { { auto fut = runtime->GetAnyNodeActorSystem()->Ask<IEventBase>( pingpong, - THolder(new TEvents::TEvPing)); + THolder(new TEvents::TEvPing)); runtime->DispatchEvents(); auto ev = fut.ExtractValueSync(); UNIT_ASSERT_VALUES_EQUAL(ev->Type(), TEvents::TEvPong::EventType); @@ -87,7 +87,7 @@ Y_UNIT_TEST_SUITE(AskActor) { { auto fut = runtime->GetAnyNodeActorSystem()->Ask<TEvents::TEvBlob>( pingpong, - THolder(new TEvents::TEvPing)); + THolder(new TEvents::TEvPing)); runtime->DispatchEvents(); UNIT_ASSERT_EXCEPTION_CONTAINS( fut.ExtractValueSync(), @@ -103,7 +103,7 @@ Y_UNIT_TEST_SUITE(AskActor) { { auto fut = runtime->GetAnyNodeActorSystem()->Ask<TEvents::TEvPong>( ping, - THolder(new TEvents::TEvPing), + THolder(new TEvents::TEvPing), TDuration::Seconds(1)); auto start = runtime->GetCurrentTime(); runtime->DispatchEvents({}, TDuration::Seconds(5)); @@ -117,7 +117,7 @@ Y_UNIT_TEST_SUITE(AskActor) { { auto fut = runtime->GetAnyNodeActorSystem()->Ask<IEventBase>( ping, - THolder(new TEvents::TEvPing), + THolder(new TEvents::TEvPing), TDuration::Seconds(1)); auto start = runtime->GetCurrentTime(); runtime->DispatchEvents({}, TDuration::Seconds(5)); diff --git a/library/cpp/actors/core/event_pb_payload_ut.cpp b/library/cpp/actors/core/event_pb_payload_ut.cpp index 8d0d50d885..eab007bc15 100644 --- a/library/cpp/actors/core/event_pb_payload_ut.cpp +++ b/library/cpp/actors/core/event_pb_payload_ut.cpp @@ -66,7 +66,7 @@ Y_UNIT_TEST_SUITE(TEventProtoWithPayload) { } UNIT_ASSERT_VALUES_EQUAL(chunkerRes, ser); - THolder<IEventBase> ev2 = THolder(TEventTo::Load(buffers)); + THolder<IEventBase> ev2 = THolder(TEventTo::Load(buffers)); TEventTo& msg2 = static_cast<TEventTo&>(*ev2); UNIT_ASSERT_VALUES_EQUAL(msg2.Record.GetMeta(), msg.Record.GetMeta()); UNIT_ASSERT_EQUAL(msg2.GetPayload(msg2.Record.GetPayloadId(0)), msg.GetPayload(msg.Record.GetPayloadId(0))); diff --git a/library/cpp/actors/core/scheduler_actor_ut.cpp b/library/cpp/actors/core/scheduler_actor_ut.cpp index fff059ef94..09b7369d36 100644 --- a/library/cpp/actors/core/scheduler_actor_ut.cpp +++ b/library/cpp/actors/core/scheduler_actor_ut.cpp @@ -52,7 +52,7 @@ Y_UNIT_TEST_SUITE(SchedulerActor) { }; void Test(TAtomicBase eventsTotalCount, ui32 scheduleDeltaMs) { - THolder<TActorSystemSetup> setup = MakeHolder<TActorSystemSetup>(); + THolder<TActorSystemSetup> setup = MakeHolder<TActorSystemSetup>(); setup->NodeId = 0; setup->ExecutorsCount = 1; setup->Executors.Reset(new TAutoPtr<IExecutorPool>[setup->ExecutorsCount]); diff --git a/library/cpp/actors/dnscachelib/dnscache.cpp b/library/cpp/actors/dnscachelib/dnscache.cpp index 0c9e5b8c35..649339ddb2 100644 --- a/library/cpp/actors/dnscachelib/dnscache.cpp +++ b/library/cpp/actors/dnscachelib/dnscache.cpp @@ -99,7 +99,7 @@ NAddr::IRemoteAddrPtr TDnsCache::GetAddr( sin6.sin6_addr = addr.AddrsV6.front(); sin6.sin6_port = HostToInet(port); - return MakeHolder<NAddr::TIPv6Addr>(sin6); + return MakeHolder<NAddr::TIPv6Addr>(sin6); } } @@ -108,7 +108,7 @@ NAddr::IRemoteAddrPtr TDnsCache::GetAddr( TGuard<TMutex> lock(CacheMtx); if (!addr.AddrsV4.empty()) { - return MakeHolder<NAddr::TIPv4Addr>(TIpAddress(addr.AddrsV4.front(), port)); + return MakeHolder<NAddr::TIPv4Addr>(TIpAddress(addr.AddrsV4.front(), port)); } } @@ -124,7 +124,7 @@ void TDnsCache::GetAllAddresses( TGuard<TMutex> lock(CacheMtx); for (size_t i = 0; i < addr4.AddrsV4.size(); i++) { - addrs.push_back(MakeHolder<NAddr::TIPv4Addr>(TIpAddress(addr4.AddrsV4[i], 0))); + addrs.push_back(MakeHolder<NAddr::TIPv4Addr>(TIpAddress(addr4.AddrsV4[i], 0))); } } @@ -139,7 +139,7 @@ void TDnsCache::GetAllAddresses( for (size_t i = 0; i < addr6.AddrsV6.size(); i++) { sin6.sin6_addr = addr6.AddrsV6[i]; - addrs.push_back(MakeHolder<NAddr::TIPv6Addr>(sin6)); + addrs.push_back(MakeHolder<NAddr::TIPv6Addr>(sin6)); } } } diff --git a/library/cpp/actors/http/http_proxy_incoming.cpp b/library/cpp/actors/http/http_proxy_incoming.cpp index a464a5d81a..80fe2af53d 100644 --- a/library/cpp/actors/http/http_proxy_incoming.cpp +++ b/library/cpp/actors/http/http_proxy_incoming.cpp @@ -205,7 +205,7 @@ protected: << ") Response: " << TString(response->GetRawData()).substr(0, MAX_LOGGED_SIZE)); } - THolder<TEvHttpProxy::TEvReportSensors> sensors(BuildIncomingRequestSensors(request, response)); + THolder<TEvHttpProxy::TEvReportSensors> sensors(BuildIncomingRequestSensors(request, response)); ctx.Send(Endpoint.Owner, sensors.Release()); if (request == Requests.front() && CurrentResponse == nullptr) { CurrentResponse = response; diff --git a/library/cpp/actors/http/http_proxy_outgoing.cpp b/library/cpp/actors/http/http_proxy_outgoing.cpp index 16584916a7..d9189dba8a 100644 --- a/library/cpp/actors/http/http_proxy_outgoing.cpp +++ b/library/cpp/actors/http/http_proxy_outgoing.cpp @@ -39,7 +39,7 @@ public: LOG_DEBUG_S(ctx, HttpLog, "(#" << TSocketImpl::GetRawSocket() << "," << Address << ") -> (" << Response->Status << " " << Response->Message << ")"); ctx.Send(RequestOwner, new TEvHttpProxy::TEvHttpIncomingResponse(Request, Response)); RequestOwner = TActorId(); - THolder<TEvHttpProxy::TEvReportSensors> sensors(BuildOutgoingRequestSensors(Request, Response)); + THolder<TEvHttpProxy::TEvReportSensors> sensors(BuildOutgoingRequestSensors(Request, Response)); ctx.Send(Owner, sensors.Release()); LOG_DEBUG_S(ctx, HttpLog, "(#" << TSocketImpl::GetRawSocket() << "," << Address << ") connection closed"); Die(ctx); @@ -50,7 +50,7 @@ public: if (RequestOwner) { ctx.Send(RequestOwner, new TEvHttpProxy::TEvHttpIncomingResponse(Request, Response, error)); RequestOwner = TActorId(); - THolder<TEvHttpProxy::TEvReportSensors> sensors(BuildOutgoingRequestSensors(Request, Response)); + THolder<TEvHttpProxy::TEvReportSensors> sensors(BuildOutgoingRequestSensors(Request, Response)); ctx.Send(Owner, sensors.Release()); Die(ctx); } diff --git a/library/cpp/actors/http/http_proxy_sock_impl.h b/library/cpp/actors/http/http_proxy_sock_impl.h index caaa2b7e2f..bf8c71d05a 100644 --- a/library/cpp/actors/http/http_proxy_sock_impl.h +++ b/library/cpp/actors/http/http_proxy_sock_impl.h @@ -162,7 +162,7 @@ struct TSecureSocketImpl : TPlainSocketImpl, TSslHelpers { {} void InitClientSsl() { - Bio.Reset(BIO_new(IoMethod())); + Bio.Reset(BIO_new(IoMethod())); BIO_set_data(Bio.Get(), this); BIO_set_nbio(Bio.Get(), 1); Ctx = CreateClientContext(); @@ -171,7 +171,7 @@ struct TSecureSocketImpl : TPlainSocketImpl, TSslHelpers { } void InitServerSsl(SSL_CTX* ctx) { - Bio.Reset(BIO_new(IoMethod())); + Bio.Reset(BIO_new(IoMethod())); BIO_set_data(Bio.Get(), this); BIO_set_nbio(Bio.Get(), 1); Ssl = ConstructSsl(ctx, Bio.Get()); diff --git a/library/cpp/actors/http/http_ut.cpp b/library/cpp/actors/http/http_ut.cpp index aa2edf2492..4c922f8d0f 100644 --- a/library/cpp/actors/http/http_ut.cpp +++ b/library/cpp/actors/http/http_ut.cpp @@ -275,7 +275,7 @@ CRA/5XcX13GJwHHj6LCoc3sL7mt8qV9HKY2AOZ88mpObzISZxgPpdKCfjsrdm63V NActors::IActor* proxy = NHttp::CreateHttpProxy(sensors); NActors::TActorId proxyId = actorSystem.Register(proxy); - THolder<NHttp::TEvHttpProxy::TEvAddListeningPort> add = MakeHolder<NHttp::TEvHttpProxy::TEvAddListeningPort>(port); + THolder<NHttp::TEvHttpProxy::TEvAddListeningPort> add = MakeHolder<NHttp::TEvHttpProxy::TEvAddListeningPort>(port); ///////// https configuration add->Secure = true; add->CertificateFile = certificateFile.Name(); @@ -305,7 +305,7 @@ CRA/5XcX13GJwHHj6LCoc3sL7mt8qV9HKY2AOZ88mpObzISZxgPpdKCfjsrdm63V } /*Y_UNIT_TEST(AdvancedRunning) { - THolder<NActors::TActorSystemSetup> setup = MakeHolder<NActors::TActorSystemSetup>(); + THolder<NActors::TActorSystemSetup> setup = MakeHolder<NActors::TActorSystemSetup>(); setup->NodeId = 1; setup->ExecutorsCount = 1; setup->Executors = new TAutoPtr<NActors::IExecutorPool>[1]; @@ -320,7 +320,7 @@ CRA/5XcX13GJwHHj6LCoc3sL7mt8qV9HKY2AOZ88mpObzISZxgPpdKCfjsrdm63V NHttp::THttpProxy* outgoingProxy = new NHttp::THttpProxy(); NActors::TActorId outgoingProxyId = actorSystem.Register(outgoingProxy); - THolder<NHttp::THttpStaticStringRequest> httpRequest = MakeHolder<NHttp::THttpStaticStringRequest>("GET /test HTTP/1.1\r\n\r\n"); + THolder<NHttp::THttpStaticStringRequest> httpRequest = MakeHolder<NHttp::THttpStaticStringRequest>("GET /test HTTP/1.1\r\n\r\n"); actorSystem.Send(outgoingProxyId, new NHttp::TEvHttpProxy::TEvHttpOutgoingRequest("[::]:13337", std::move(httpRequest))); Sleep(TDuration::Minutes(60)); diff --git a/library/cpp/actors/testlib/test_runtime.h b/library/cpp/actors/testlib/test_runtime.h index a05e292911..26e3b45c98 100644 --- a/library/cpp/actors/testlib/test_runtime.h +++ b/library/cpp/actors/testlib/test_runtime.h @@ -364,7 +364,7 @@ namespace NActors { TAutoPtr<IEventHandle> handle; std::function<bool(const TEvent&)> truth = [](const TEvent&) { return true; }; GrabEdgeEventIf(handle, truth, simTimeout); - return THolder(handle ? handle->Release<TEvent>().Release() : nullptr); + return THolder(handle ? handle->Release<TEvent>().Release() : nullptr); } template<class TEvent> @@ -707,7 +707,7 @@ namespace NActors { using TReplyCheckerCreator = std::function<THolder<IReplyChecker>(void)>; inline THolder<IReplyChecker> CreateNoneReplyChecker() { - return MakeHolder<TNoneReplyChecker>(); + return MakeHolder<TNoneReplyChecker>(); } TAutoPtr<IStrandingDecoratorFactory> CreateStrandingDecoratorFactory(TTestActorRuntimeBase* runtime, diff --git a/library/cpp/codecs/greedy_dict/gd_builder.cpp b/library/cpp/codecs/greedy_dict/gd_builder.cpp index 11072e889d..561bfbca01 100644 --- a/library/cpp/codecs/greedy_dict/gd_builder.cpp +++ b/library/cpp/codecs/greedy_dict/gd_builder.cpp @@ -11,7 +11,7 @@ namespace NGreedyDict { void TDictBuilder::RebuildCounts(ui32 maxcand, bool final) { if (!Current) { - Current = MakeHolder<TEntrySet>(); + Current = MakeHolder<TEntrySet>(); Current->InitWithAlpha(); } @@ -24,7 +24,7 @@ namespace NGreedyDict { CompoundCountsPool.Clear(); if (!final) { - CompoundCounts = MakeHolder<TCompoundCounts>(&CompoundCountsPool); + CompoundCounts = MakeHolder<TCompoundCounts>(&CompoundCountsPool); CompoundCounts->reserve(maxcand); } diff --git a/library/cpp/containers/comptrie/pattern_searcher.h b/library/cpp/containers/comptrie/pattern_searcher.h index e9c45e2b2e..caab51dc1c 100644 --- a/library/cpp/containers/comptrie/pattern_searcher.h +++ b/library/cpp/containers/comptrie/pattern_searcher.h @@ -42,7 +42,7 @@ public: public: TCompactPatternSearcherBuilder() { - TBase::Impl = MakeHolder<TCompactPatternSearcherBuilderImpl>(); + TBase::Impl = MakeHolder<TCompactPatternSearcherBuilderImpl>(); } bool Add(const TSymbol* key, size_t keyLength, const TData& value) { diff --git a/library/cpp/coroutine/engine/cont_poller.h b/library/cpp/coroutine/engine/cont_poller.h index 2211ef3a9f..b638b2df1a 100644 --- a/library/cpp/coroutine/engine/cont_poller.h +++ b/library/cpp/coroutine/engine/cont_poller.h @@ -111,7 +111,7 @@ namespace NCoro { T* Get(size_t index) { TRef& ret = Lst_.Get(index); if (!ret) { - ret = TRef(new (&Pool_) TValue()); + ret = TRef(new (&Pool_) TValue()); } return ret.Get(); } diff --git a/library/cpp/coroutine/listener/listen.cpp b/library/cpp/coroutine/listener/listen.cpp index d327847bcb..3d4e711d1d 100644 --- a/library/cpp/coroutine/listener/listen.cpp +++ b/library/cpp/coroutine/listener/listen.cpp @@ -234,10 +234,10 @@ public: switch (sa.Sa->sa_family) { case AF_INET: - L_.PushBack(new TOneSocketListener(this, MakeHolder<TIPv4Addr>(*sa.In))); + L_.PushBack(new TOneSocketListener(this, MakeHolder<TIPv4Addr>(*sa.In))); break; case AF_INET6: - L_.PushBack(new TOneSocketListener(this, MakeHolder<TIPv6Addr>(*sa.In6))); + L_.PushBack(new TOneSocketListener(this, MakeHolder<TIPv6Addr>(*sa.In6))); break; default: ythrow yexception() << TStringBuf("unknown protocol"); @@ -245,12 +245,12 @@ public: } inline void Bind(const TIpAddress& addr) { - L_.PushBack(new TOneSocketListener(this, MakeHolder<TIPv4Addr>(addr))); + L_.PushBack(new TOneSocketListener(this, MakeHolder<TIPv4Addr>(addr))); } inline void Bind(const TNetworkAddress& addr) { for (TNetworkAddress::TIterator it = addr.Begin(); it != addr.End(); ++it) { - L_.PushBack(new TOneSocketListener(this, MakeHolder<TStoredAddrInfo>(&*it, addr))); + L_.PushBack(new TOneSocketListener(this, MakeHolder<TStoredAddrInfo>(&*it, addr))); } } diff --git a/library/cpp/digest/md5/md5_medium_ut.cpp b/library/cpp/digest/md5/md5_medium_ut.cpp index 33e6fea0a2..a940c5cb66 100644 --- a/library/cpp/digest/md5/md5_medium_ut.cpp +++ b/library/cpp/digest/md5/md5_medium_ut.cpp @@ -6,7 +6,7 @@ Y_UNIT_TEST_SUITE(TMD5MediumTest) { Y_UNIT_TEST(TestOverflow) { if (sizeof(size_t) > sizeof(unsigned int)) { const size_t maxUi32 = (size_t)Max<unsigned int>(); - TArrayHolder<char> buf(new char[maxUi32]); + TArrayHolder<char> buf(new char[maxUi32]); memset(buf.Get(), 0, maxUi32); diff --git a/library/cpp/getopt/small/completer_command.cpp b/library/cpp/getopt/small/completer_command.cpp index 8621bce58e..5e593eec7e 100644 --- a/library/cpp/getopt/small/completer_command.cpp +++ b/library/cpp/getopt/small/completer_command.cpp @@ -160,6 +160,6 @@ namespace NLastGetopt { }; THolder<TMainClassArgs> MakeCompletionMod(const TModChooser* modChooser, TString command, TString modName) { - return MakeHolder<TCompleterMode>(modChooser, std::move(command), std::move(modName)); + return MakeHolder<TCompleterMode>(modChooser, std::move(command), std::move(modName)); } } diff --git a/library/cpp/getopt/small/modchooser.cpp b/library/cpp/getopt/small/modchooser.cpp index 3af79856aa..2fa5cfd070 100644 --- a/library/cpp/getopt/small/modchooser.cpp +++ b/library/cpp/getopt/small/modchooser.cpp @@ -89,12 +89,12 @@ void TModChooser::AddMode(const TString& mode, const TMainFunctionRawPtrV func, } void TModChooser::AddMode(const TString& mode, const TMainFunctionPtr func, const TString& description, bool hidden, bool noCompletion) { - Wrappers.push_back(MakeHolder<PtrWrapper>(func)); + Wrappers.push_back(MakeHolder<PtrWrapper>(func)); AddMode(mode, Wrappers.back().Get(), description, hidden, noCompletion); } void TModChooser::AddMode(const TString& mode, const TMainFunctionPtrV func, const TString& description, bool hidden, bool noCompletion) { - Wrappers.push_back(MakeHolder<PtrvWrapper>(func)); + Wrappers.push_back(MakeHolder<PtrvWrapper>(func)); AddMode(mode, Wrappers.back().Get(), description, hidden, noCompletion); } @@ -103,11 +103,11 @@ void TModChooser::AddMode(const TString& mode, TMainClass* func, const TString& ythrow yexception() << "TMode '" << mode << "' already exists in TModChooser."; } - Modes[mode] = UnsortedModes.emplace_back(MakeHolder<TMode>(mode, func, description, hidden, noCompletion)).Get(); + Modes[mode] = UnsortedModes.emplace_back(MakeHolder<TMode>(mode, func, description, hidden, noCompletion)).Get(); } void TModChooser::AddMode(const TString& mode, TMainClassV* func, const TString& description, bool hidden, bool noCompletion) { - Wrappers.push_back(MakeHolder<ClassWrapper>(func)); + Wrappers.push_back(MakeHolder<ClassWrapper>(func)); AddMode(mode, Wrappers.back().Get(), description, hidden, noCompletion); } diff --git a/library/cpp/http/server/http_ut.cpp b/library/cpp/http/server/http_ut.cpp index b8da3c4c35..cc62bb988e 100644 --- a/library/cpp/http/server/http_ut.cpp +++ b/library/cpp/http/server/http_ut.cpp @@ -167,7 +167,7 @@ Y_UNIT_TEST_SUITE(THttpServerTest) { THolder<TSocket> singleReqSocket; if (KeepAliveConnection) { if (!KeepAlivedSocket) { - KeepAlivedSocket = MakeHolder<TSocket>(TNetworkAddress("localhost", Port), TDuration::Seconds(10)); + KeepAlivedSocket = MakeHolder<TSocket>(TNetworkAddress("localhost", Port), TDuration::Seconds(10)); } s = KeepAlivedSocket.Get(); } else { @@ -711,7 +711,7 @@ Y_UNIT_TEST_SUITE(THttpServerTest) { for (size_t i = 0; i < 3; ++i) { auto func = [&server, port, keepAlive]() { server.BusyThread(); - THolder<TTestRequest> r = MakeHolder<TTestRequest>(port); + THolder<TTestRequest> r = MakeHolder<TTestRequest>(port); r->KeepAliveConnection = keepAlive; r->Execute(); }; diff --git a/library/cpp/logger/element_ut.cpp b/library/cpp/logger/element_ut.cpp index 03a7b2eb36..32edc52dfb 100644 --- a/library/cpp/logger/element_ut.cpp +++ b/library/cpp/logger/element_ut.cpp @@ -22,14 +22,14 @@ UNIT_TEST_SUITE_REGISTRATION(TLogElementTest); void TLogElementTest::TestMoveCtor() { TStringStream output; - TLog log(MakeHolder<TStreamLogBackend>(&output)); + TLog log(MakeHolder<TStreamLogBackend>(&output)); - THolder<TLogElement> src = MakeHolder<TLogElement>(&log); + THolder<TLogElement> src = MakeHolder<TLogElement>(&log); TString message = "Hello, World!"; (*src) << message; - THolder<TLogElement> dst = MakeHolder<TLogElement>(std::move(*src)); + THolder<TLogElement> dst = MakeHolder<TLogElement>(std::move(*src)); src.Destroy(); UNIT_ASSERT(output.Str() == ""); diff --git a/library/cpp/logger/global/global.cpp b/library/cpp/logger/global/global.cpp index 1532ee2d57..9fbd10f666 100644 --- a/library/cpp/logger/global/global.cpp +++ b/library/cpp/logger/global/global.cpp @@ -19,7 +19,7 @@ void DoInitGlobalLog(const TString& logType, const int logLevel, const bool rota } void DoInitGlobalLog(THolder<TLogBackend> backend, THolder<ILoggerFormatter> formatter) { - DoInitGlobalLog(THolder(new TGlobalLog(std::move(backend))), std::move(formatter)); + DoInitGlobalLog(THolder(new TGlobalLog(std::move(backend))), std::move(formatter)); } bool GlobalLogInitialized() { diff --git a/library/cpp/logger/log.cpp b/library/cpp/logger/log.cpp index 4073ae924f..e1d70cc3d2 100644 --- a/library/cpp/logger/log.cpp +++ b/library/cpp/logger/log.cpp @@ -208,7 +208,7 @@ bool TLog::OpenLog(const char* path, ELogPriority lp) { if (path) { ResetBackend(CreateLogBackend(path, lp)); } else { - ResetBackend(MakeHolder<TStreamLogBackend>(&Cerr)); + ResetBackend(MakeHolder<TStreamLogBackend>(&Cerr)); } return true; diff --git a/library/cpp/logger/log_ut.cpp b/library/cpp/logger/log_ut.cpp index be750de918..8de46f17f5 100644 --- a/library/cpp/logger/log_ut.cpp +++ b/library/cpp/logger/log_ut.cpp @@ -62,7 +62,7 @@ void TLogTest::TestFile() { void TLogTest::TestThreaded() { { TFileLogBackend fb(LOGFILE); - TLog log(THolder(new TThreadedLogBackend(&fb))); + TLog log(THolder(new TThreadedLogBackend(&fb))); int v1 = 12; unsigned v2 = 34; @@ -106,7 +106,7 @@ void TLogTest::TestThreadedWithOverflow() { TFakeLogBackend fb; { - TLog log(THolder(new TThreadedLogBackend(&fb, 2))); + TLog log(THolder(new TThreadedLogBackend(&fb, 2))); auto guard = fb.Guard(); log.AddLog("first write"); @@ -118,7 +118,7 @@ void TLogTest::TestThreadedWithOverflow() { { ui32 overflows = 0; - TLog log(THolder(new TThreadedLogBackend(&fb, 2, [&overflows] { ++overflows; }))); + TLog log(THolder(new TThreadedLogBackend(&fb, 2, [&overflows] { ++overflows; }))); auto guard = fb.Guard(); log.AddLog("first write"); @@ -134,7 +134,7 @@ void TLogTest::TestThreadedWithOverflow() { void TLogTest::TestNoFlush() { { TFileLogBackend fb(LOGFILE); - TLog log(THolder(new TThreadedLogBackend(&fb))); + TLog log(THolder(new TThreadedLogBackend(&fb))); int v1 = 12; unsigned v2 = 34; @@ -154,7 +154,7 @@ void TLogTest::TestFormat() { TStringStream data; { - TLog log(THolder(new TStreamLogBackend(&data))); + TLog log(THolder(new TStreamLogBackend(&data))); log << "qw" << " " @@ -169,7 +169,7 @@ void TLogTest::TestWrite() { TString test; { - TLog log(THolder(new TStreamLogBackend(&data))); + TLog log(THolder(new TStreamLogBackend(&data))); for (size_t i = 0; i < 1000; ++i) { TVector<char> buf(i, (char)i); diff --git a/library/cpp/logger/system.cpp b/library/cpp/logger/system.cpp index 25e3d8fd4e..42233f63d2 100644 --- a/library/cpp/logger/system.cpp +++ b/library/cpp/logger/system.cpp @@ -76,7 +76,7 @@ namespace { class TSysLogInstance: public TLog { public: inline TSysLogInstance() - : TLog(MakeHolder<TStreamLogBackend>(&Cnull)) + : TLog(MakeHolder<TStreamLogBackend>(&Cnull)) { } }; diff --git a/library/cpp/logger/system.h b/library/cpp/logger/system.h index 545e0be377..b8c60b3023 100644 --- a/library/cpp/logger/system.h +++ b/library/cpp/logger/system.h @@ -8,8 +8,8 @@ #define YSYSLOGINIT_FLAGS(ident, facility, flags) \ struct TLogIniter { \ TLogIniter() { \ - SysLogInstance().ResetBackend(THolder<TLogBackend>( \ - (ident) ? (TLogBackend*)(new TSysLogBackend((ident), (facility), (flags))) : (TLogBackend*)(new TNullLogBackend())));\ + SysLogInstance().ResetBackend(THolder<TLogBackend>( \ + (ident) ? (TLogBackend*)(new TSysLogBackend((ident), (facility), (flags))) : (TLogBackend*)(new TNullLogBackend())));\ } \ } Y_CAT(loginit, __LINE__); diff --git a/library/cpp/lwtrace/mon/mon_lwtrace.cpp b/library/cpp/lwtrace/mon/mon_lwtrace.cpp index ac5b63a5c8..a61ee9ce22 100644 --- a/library/cpp/lwtrace/mon/mon_lwtrace.cpp +++ b/library/cpp/lwtrace/mon/mon_lwtrace.cpp @@ -4672,7 +4672,7 @@ private: }; void RegisterPages(NMonitoring::TMonService2* mon, bool allowUnsafe) { - THolder<NLwTraceMonPage::TLWTraceMonPage> p = MakeHolder<NLwTraceMonPage::TLWTraceMonPage>(allowUnsafe); + THolder<NLwTraceMonPage::TLWTraceMonPage> p = MakeHolder<NLwTraceMonPage::TLWTraceMonPage>(allowUnsafe); mon->Register(p.Release()); #define WWW_STATIC_FILE(file, type) \ diff --git a/library/cpp/messagebus/moved_ut.cpp b/library/cpp/messagebus/moved_ut.cpp index df91f00287..c1a07cce7e 100644 --- a/library/cpp/messagebus/moved_ut.cpp +++ b/library/cpp/messagebus/moved_ut.cpp @@ -4,7 +4,7 @@ Y_UNIT_TEST_SUITE(TMovedTest) { Y_UNIT_TEST(Simple) { - TMoved<THolder<int>> h1(MakeHolder<int>(10)); + TMoved<THolder<int>> h1(MakeHolder<int>(10)); TMoved<THolder<int>> h2 = h1; UNIT_ASSERT(!*h1); UNIT_ASSERT(!!*h2); diff --git a/library/cpp/monlib/dynamic_counters/encode.cpp b/library/cpp/monlib/dynamic_counters/encode.cpp index 265a505fb6..ffa48d276e 100644 --- a/library/cpp/monlib/dynamic_counters/encode.cpp +++ b/library/cpp/monlib/dynamic_counters/encode.cpp @@ -98,9 +98,9 @@ namespace NMonitoring { THolder<ICountableConsumer> CreateEncoder(IOutputStream* out, EFormat format, TCountableBase::EVisibility vis) { switch (format) { case EFormat::JSON: - return MakeHolder<TConsumer>(NMonitoring::EncoderJson(out), vis); + return MakeHolder<TConsumer>(NMonitoring::EncoderJson(out), vis); case EFormat::SPACK: - return MakeHolder<TConsumer>(NMonitoring::EncoderSpackV1( + return MakeHolder<TConsumer>(NMonitoring::EncoderSpackV1( out, NMonitoring::ETimePrecision::SECONDS, NMonitoring::ECompression::ZSTD), vis); diff --git a/library/cpp/monlib/encode/fake/fake.cpp b/library/cpp/monlib/encode/fake/fake.cpp index 6400366235..69d691361a 100644 --- a/library/cpp/monlib/encode/fake/fake.cpp +++ b/library/cpp/monlib/encode/fake/fake.cpp @@ -46,6 +46,6 @@ namespace NMonitoring { }; IMetricEncoderPtr EncoderFake() { - return MakeHolder<TFakeEncoder>(); + return MakeHolder<TFakeEncoder>(); } } diff --git a/library/cpp/monlib/encode/protobuf/protobuf_encoder.cpp b/library/cpp/monlib/encode/protobuf/protobuf_encoder.cpp index c272deb676..2d11b9d5ba 100644 --- a/library/cpp/monlib/encode/protobuf/protobuf_encoder.cpp +++ b/library/cpp/monlib/encode/protobuf/protobuf_encoder.cpp @@ -238,11 +238,11 @@ namespace NMonitoring { } IMetricEncoderPtr EncoderProtobuf(NProto::TSingleSamplesList* samples) { - return MakeHolder<TSingleSamplesEncoder>(samples); + return MakeHolder<TSingleSamplesEncoder>(samples); } IMetricEncoderPtr EncoderProtobuf(NProto::TMultiSamplesList* samples) { - return MakeHolder<TMultiSamplesEncoder>(samples); + return MakeHolder<TMultiSamplesEncoder>(samples); } } diff --git a/library/cpp/monlib/encode/spack/compression.cpp b/library/cpp/monlib/encode/spack/compression.cpp index 52ac65bc86..0d2152fc85 100644 --- a/library/cpp/monlib/encode/spack/compression.cpp +++ b/library/cpp/monlib/encode/spack/compression.cpp @@ -353,11 +353,11 @@ namespace NMonitoring { case ECompression::IDENTITY: return nullptr; case ECompression::ZLIB: - return MakeHolder<TFramedDecompressStream<TZlibCodec, TAdler32>>(in); + return MakeHolder<TFramedDecompressStream<TZlibCodec, TAdler32>>(in); case ECompression::ZSTD: - return MakeHolder<TFramedDecompressStream<TZstdCodec, TXxHash32>>(in); + return MakeHolder<TFramedDecompressStream<TZstdCodec, TXxHash32>>(in); case ECompression::LZ4: - return MakeHolder<TFramedDecompressStream<TLz4Codec, TXxHash32>>(in); + return MakeHolder<TFramedDecompressStream<TLz4Codec, TXxHash32>>(in); case ECompression::UNKNOWN: return nullptr; } @@ -369,11 +369,11 @@ namespace NMonitoring { case ECompression::IDENTITY: return nullptr; case ECompression::ZLIB: - return MakeHolder<TFramedCompressStream<TZlibCodec, TAdler32>>(out); + return MakeHolder<TFramedCompressStream<TZlibCodec, TAdler32>>(out); case ECompression::ZSTD: - return MakeHolder<TFramedCompressStream<TZstdCodec, TXxHash32>>(out); + return MakeHolder<TFramedCompressStream<TZstdCodec, TXxHash32>>(out); case ECompression::LZ4: - return MakeHolder<TFramedCompressStream<TLz4Codec, TXxHash32>>(out); + return MakeHolder<TFramedCompressStream<TLz4Codec, TXxHash32>>(out); case ECompression::UNKNOWN: return nullptr; } diff --git a/library/cpp/monlib/encode/text/text_encoder.cpp b/library/cpp/monlib/encode/text/text_encoder.cpp index 00b0598e24..10336261f0 100644 --- a/library/cpp/monlib/encode/text/text_encoder.cpp +++ b/library/cpp/monlib/encode/text/text_encoder.cpp @@ -220,7 +220,7 @@ namespace NMonitoring { } IMetricEncoderPtr EncoderText(IOutputStream* out, bool humanReadableTs) { - return MakeHolder<TEncoderText>(out, humanReadableTs); + return MakeHolder<TEncoderText>(out, humanReadableTs); } } diff --git a/library/cpp/monlib/metrics/fake.cpp b/library/cpp/monlib/metrics/fake.cpp index 6a149a93c3..b6f5e37af8 100644 --- a/library/cpp/monlib/metrics/fake.cpp +++ b/library/cpp/monlib/metrics/fake.cpp @@ -84,7 +84,7 @@ namespace NMonitoring { { TWriteGuard g{Lock_}; - IMetricPtr metric = MakeHolder<TMetric>(std::forward<Args>(args)...); + IMetricPtr metric = MakeHolder<TMetric>(std::forward<Args>(args)...); // decltype(Metrics_)::iterator breaks build on windows THashMap<ILabelsPtr, IMetricPtr>::iterator it; diff --git a/library/cpp/monlib/metrics/histogram_collector_explicit.cpp b/library/cpp/monlib/metrics/histogram_collector_explicit.cpp index 867846980c..377fc233ef 100644 --- a/library/cpp/monlib/metrics/histogram_collector_explicit.cpp +++ b/library/cpp/monlib/metrics/histogram_collector_explicit.cpp @@ -50,6 +50,6 @@ namespace NMonitoring { Y_ENSURE(IsSorted(bounds.begin(), bounds.end()), "bounds for explicit histogram must be sorted"); - return MakeHolder<TExplicitHistogramCollector>(bounds); + return MakeHolder<TExplicitHistogramCollector>(bounds); } } diff --git a/library/cpp/monlib/metrics/histogram_collector_linear.cpp b/library/cpp/monlib/metrics/histogram_collector_linear.cpp index f845f9d386..f8ad86f3a4 100644 --- a/library/cpp/monlib/metrics/histogram_collector_linear.cpp +++ b/library/cpp/monlib/metrics/histogram_collector_linear.cpp @@ -62,6 +62,6 @@ namespace NMonitoring { << ", but got: " << bucketsCount); Y_ENSURE(bucketWidth >= 1, "bucketWidth must be >= 1, got: " << bucketWidth); - return MakeHolder<TLinearHistogramCollector>(bucketsCount, startValue, bucketWidth); + return MakeHolder<TLinearHistogramCollector>(bucketsCount, startValue, bucketWidth); } } diff --git a/library/cpp/monlib/service/auth.cpp b/library/cpp/monlib/service/auth.cpp index 2a068970ea..ddabcfbbf7 100644 --- a/library/cpp/monlib/service/auth.cpp +++ b/library/cpp/monlib/service/auth.cpp @@ -15,7 +15,7 @@ namespace { } // namespace THolder<IAuthProvider> CreateFakeAuth() { - return MakeHolder<TFakeAuthProvider>(); + return MakeHolder<TFakeAuthProvider>(); } diff --git a/library/cpp/monlib/service/pages/index_mon_page.cpp b/library/cpp/monlib/service/pages/index_mon_page.cpp index 84d36d1be0..83ff8b529a 100644 --- a/library/cpp/monlib/service/pages/index_mon_page.cpp +++ b/library/cpp/monlib/service/pages/index_mon_page.cpp @@ -44,7 +44,7 @@ void TIndexMonPage::Output(IMonHttpRequest& request) { } } if (found) { - THolder<IMonHttpRequest> child(request.MakeChild(found.Get(), TString{pathInfo})); + THolder<IMonHttpRequest> child(request.MakeChild(found.Get(), TString{pathInfo})); found->Output(*child); } else { request.Output() << HTTPNOTFOUND; diff --git a/library/cpp/openssl/io/stream.cpp b/library/cpp/openssl/io/stream.cpp index f7aad42067..0b4be38c0e 100644 --- a/library/cpp/openssl/io/stream.cpp +++ b/library/cpp/openssl/io/stream.cpp @@ -282,11 +282,11 @@ public: TBuiltinCerts() { TString c = NResource::Find("/builtin/cacert"); - TBioPtr cbio(BIO_new_mem_buf(c.data(), c.size())); + TBioPtr cbio(BIO_new_mem_buf(c.data(), c.size())); Y_ENSURE_EX(cbio, TSslError() << "BIO_new_mem_buf"); while (true) { - TX509Ptr cert(PEM_read_bio_X509(cbio.Get(), nullptr, nullptr, nullptr)); + TX509Ptr cert(PEM_read_bio_X509(cbio.Get(), nullptr, nullptr, nullptr)); if (!cert) { break; } @@ -304,7 +304,7 @@ public: } TOpenSslX509StorePtr GetX509Store() const { - TOpenSslX509StorePtr store(X509_STORE_new()); + TOpenSslX509StorePtr store(X509_STORE_new()); for (const TX509Ptr& c : Certs) { if (0 == X509_STORE_add_cert(store.Get(), c.Get())) { diff --git a/library/cpp/protobuf/json/json_output_create.cpp b/library/cpp/protobuf/json/json_output_create.cpp index 40f5d4c6ad..378e4ea65a 100644 --- a/library/cpp/protobuf/json/json_output_create.cpp +++ b/library/cpp/protobuf/json/json_output_create.cpp @@ -6,27 +6,27 @@ namespace NProtobufJson { TJsonMapOutputPtr CreateJsonMapOutput(IOutputStream& out, const NJson::TJsonWriterConfig& config) { - return MakeHolder<TJsonWriterOutput>(&out, config); + return MakeHolder<TJsonWriterOutput>(&out, config); } TJsonMapOutputPtr CreateJsonMapOutput(NJson::TJsonWriter& writer) { - return MakeHolder<TBaseJsonWriterOutput>(writer); + return MakeHolder<TBaseJsonWriterOutput>(writer); } TJsonMapOutputPtr CreateJsonMapOutput(TString& str, const TProto2JsonConfig& config) { - return MakeHolder<TJsonStringWriterOutput>(&str, config); + return MakeHolder<TJsonStringWriterOutput>(&str, config); } TJsonMapOutputPtr CreateJsonMapOutput(TStringStream& out, const TProto2JsonConfig& config) { - return MakeHolder<TJsonWriterOutput>(&out, config); + return MakeHolder<TJsonWriterOutput>(&out, config); } TJsonMapOutputPtr CreateJsonMapOutput(IOutputStream& out, const TProto2JsonConfig& config) { - return MakeHolder<TJsonWriterOutput>(&out, config); + return MakeHolder<TJsonWriterOutput>(&out, config); } TJsonMapOutputPtr CreateJsonMapOutput(NJson::TJsonValue& json) { - return MakeHolder<TJsonValueOutput>(json); + return MakeHolder<TJsonValueOutput>(json); } } diff --git a/library/cpp/scheme/scimpl_protobuf.cpp b/library/cpp/scheme/scimpl_protobuf.cpp index 64a03a661d..0c99122c69 100644 --- a/library/cpp/scheme/scimpl_protobuf.cpp +++ b/library/cpp/scheme/scimpl_protobuf.cpp @@ -316,7 +316,7 @@ namespace NSc { auto mutableField = reflection->GetMutableRepeatedFieldRef<Message>(&msg, field); for (const auto& value : fieldValue.GetDict()) { - THolder<Message> entry(mutableField.NewMessage()); + THolder<Message> entry(mutableField.NewMessage()); auto entryDesc = entry->GetDescriptor(); auto keyField = entryDesc->FindFieldByNumber(1); auto valueField = entryDesc->FindFieldByNumber(2); diff --git a/library/cpp/testing/unittest/registar.h b/library/cpp/testing/unittest/registar.h index c19fbf9dd2..44517a0092 100644 --- a/library/cpp/testing/unittest/registar.h +++ b/library/cpp/testing/unittest/registar.h @@ -939,7 +939,7 @@ public: \ static void AddTest(const char* name, \ const std::function<void(NUnitTest::TTestContext&)>& body, bool forceFork) \ { \ - Tests().push_back([=]{ return MakeHolder<NUnitTest::TBaseTestCase>(name, body, forceFork); }); \ + Tests().push_back([=]{ return MakeHolder<NUnitTest::TBaseTestCase>(name, body, forceFork); }); \ } \ \ static void AddTest(TTestCaseFactory testCaseFactory) { \ diff --git a/library/cpp/testing/unittest/utmain.cpp b/library/cpp/testing/unittest/utmain.cpp index c5d8e0cf7b..305bc6b40f 100644 --- a/library/cpp/testing/unittest/utmain.cpp +++ b/library/cpp/testing/unittest/utmain.cpp @@ -725,7 +725,7 @@ int NUnitTest::RunMain(int argc, char** argv) { processor.SetTraceProcessor(new TTraceWriterProcessor(argv[i], OpenAlways | ForAppend)); } else if (strcmp(name, "--list-path") == 0) { ++i; - listFile = MakeHolder<TFixedBufferFileOutput>(argv[i]); + listFile = MakeHolder<TFixedBufferFileOutput>(argv[i]); listStream = listFile.Get(); } else if (strcmp(name, "--test-param") == 0) { ++i; diff --git a/library/cpp/threading/equeue/equeue_ut.cpp b/library/cpp/threading/equeue/equeue_ut.cpp index f80cef8646..9cf2aced44 100644 --- a/library/cpp/threading/equeue/equeue_ut.cpp +++ b/library/cpp/threading/equeue/equeue_ut.cpp @@ -15,7 +15,7 @@ Y_UNIT_TEST_SUITE(TElasticQueueTest) { struct TQueueSetup { TQueueSetup() { - Queue.Reset(new TElasticQueue(MakeHolder<TSimpleThreadPool>())); + Queue.Reset(new TElasticQueue(MakeHolder<TSimpleThreadPool>())); Queue->Start(ThreadCount, MaxQueueSize); } ~TQueueSetup() { diff --git a/library/cpp/yson/node/node.cpp b/library/cpp/yson/node/node.cpp index 2c305d812e..b39e070718 100644 --- a/library/cpp/yson/node/node.cpp +++ b/library/cpp/yson/node/node.cpp @@ -846,7 +846,7 @@ void TNode::AssureList() void TNode::CreateAttributes() { - Attributes_ = MakeHolder<TNode>(); + Attributes_ = MakeHolder<TNode>(); Attributes_->Value_ = TMapType(); } diff --git a/util/network/address.cpp b/util/network/address.cpp index 058173084a..a81a9e6994 100644 --- a/util/network/address.cpp +++ b/util/network/address.cpp @@ -137,7 +137,7 @@ IRemoteAddrPtr NAddr::GetSockAddr(SOCKET s) { ythrow TSystemError() << "getsockname() failed"; } - return addr; + return addr; } IRemoteAddrPtr NAddr::GetPeerAddr(SOCKET s) { diff --git a/util/stream/zlib.cpp b/util/stream/zlib.cpp index 080a4daab9..60f4e9439f 100644 --- a/util/stream/zlib.cpp +++ b/util/stream/zlib.cpp @@ -210,7 +210,7 @@ public: // Create exactly the same files on all platforms by fixing OS field in the header. if (p.Type == ZLib::GZip) { - GZHeader_ = MakeHolder<gz_header>(); + GZHeader_ = MakeHolder<gz_header>(); GZHeader_->os = 3; // UNIX deflateSetHeader(Z(), GZHeader_.Get()); } diff --git a/util/system/shellcommand.cpp b/util/system/shellcommand.cpp index d2546206e7..b1989b5c8c 100644 --- a/util/system/shellcommand.cpp +++ b/util/system/shellcommand.cpp @@ -59,7 +59,7 @@ namespace { #if defined(_unix_) void SetUserGroups(const passwd* pw) { int ngroups = 1; - THolder<gid_t, TFree> groups = THolder<gid_t, TFree>(static_cast<gid_t*>(malloc(ngroups * sizeof(gid_t)))); + THolder<gid_t, TFree> groups = THolder<gid_t, TFree>(static_cast<gid_t*>(malloc(ngroups * sizeof(gid_t)))); if (getgrouplist(pw->pw_name, pw->pw_gid, reinterpret_cast<TGetGroupListGid*>(groups.Get()), &ngroups) == -1) { groups.Reset(static_cast<gid_t*>(malloc(ngroups * sizeof(gid_t)))); if (getgrouplist(pw->pw_name, pw->pw_gid, reinterpret_cast<TGetGroupListGid*>(groups.Get()), &ngroups) == -1) { diff --git a/ydb/core/base/tracing.h b/ydb/core/base/tracing.h index ac1ea46daf..40420e4541 100644 --- a/ydb/core/base/tracing.h +++ b/ydb/core/base/tracing.h @@ -173,7 +173,7 @@ public: TLightWriteGuard g{ Lock }; auto it = Factorymap.find(signalType); if (it == Factorymap.end()) { - Factorymap[signalType] = MakeHolder<TSignalCreator<TSignalType>>(); + Factorymap[signalType] = MakeHolder<TSignalCreator<TSignalType>>(); } } diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_actor.cpp b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_actor.cpp index 8d9f30e5de..d92b19c6cc 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_actor.cpp +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_actor.cpp @@ -590,7 +590,7 @@ public: void ErrorHandle(NPDisk::TEvChunkRead::TPtr &ev) { const NPDisk::TEvChunkRead &evChunkRead = *ev->Get(); PDisk->Mon.GetReadCounter(evChunkRead.PriorityClass)->CountRequest(0); - THolder<NPDisk::TEvChunkReadResult> result = MakeHolder<NPDisk::TEvChunkReadResult>(NKikimrProto::CORRUPTED, + THolder<NPDisk::TEvChunkReadResult> result = MakeHolder<NPDisk::TEvChunkReadResult>(NKikimrProto::CORRUPTED, evChunkRead.ChunkIdx, evChunkRead.Offset, evChunkRead.Cookie, 0, "PDisk is in error state"); LOG_DEBUG(*TlsActivationContext, NKikimrServices::BS_PDISK, "PDiskId# %" PRIu32 " %s To: %" PRIu64 " Marker# BSY02", (ui32)PDisk->PDiskId, result->ToString().c_str(), (ui64)ev->Sender.LocalId()); diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_blockdevice_async.cpp b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_blockdevice_async.cpp index cf562ce3d4..34c20999b7 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_blockdevice_async.cpp +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_blockdevice_async.cpp @@ -805,20 +805,20 @@ protected: } if (IsFileOpened) { IoContext->SetActorSystem(ActorSystem); - CompletionThread = MakeHolder<TCompletionThread>(*this, MaxQueuedCompletionActions); - TrimThread = MakeHolder<TTrimThread>(*this); - SharedCallback = MakeHolder<TSharedCallback>(*this); + CompletionThread = MakeHolder<TCompletionThread>(*this, MaxQueuedCompletionActions); + TrimThread = MakeHolder<TTrimThread>(*this); + SharedCallback = MakeHolder<TSharedCallback>(*this); if (Flags & TDeviceMode::UseSpdk) { - SpdkSubmitGetThread = MakeHolder<TSubmitGetThread>(*this); + SpdkSubmitGetThread = MakeHolder<TSubmitGetThread>(*this); SpdkState->LaunchThread(TSubmitGetThread::ThreadProcSpdk, SpdkSubmitGetThread.Get()); } else { if (Flags & TDeviceMode::UseSubmitGetThread) { - SubmitThread = MakeHolder<TSubmitGetThread>(*this); + SubmitThread = MakeHolder<TSubmitGetThread>(*this); SubmitThread->Start(); } else { - SubmitThread = MakeHolder<TSubmitThread>(*this); + SubmitThread = MakeHolder<TSubmitThread>(*this); SubmitThread->Start(); - GetEventsThread = MakeHolder<TGetThread>(*this); + GetEventsThread = MakeHolder<TGetThread>(*this); GetEventsThread->Start(); } } diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl.cpp b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl.cpp index ecea2e1c1e..d00fc0f220 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl.cpp +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl.cpp @@ -515,7 +515,7 @@ bool TPDisk::ReleaseUnusedLogChunks(TCompletionEventSender *completion) { Mon.SplicedLogChunks->Add(chunksToRelease.size()); auto *releaseReq = ReqCreator.CreateFromArgs<TReleaseChunks>(*gapStart, *gapEnd, std::move(chunksToRelease)); - auto flushAction = MakeHolder<TCompletionEventSender>(this, THolder<TReleaseChunks>(releaseReq)); + auto flushAction = MakeHolder<TCompletionEventSender>(this, THolder<TReleaseChunks>(releaseReq)); TReqId reqId(AtomicIncrement(ReqCreator.LastReqId)); WriteSysLogRestorePoint(flushAction.Release(), reqId, {}); PrintLogChunksInfo("log splice"); @@ -901,7 +901,7 @@ void TPDisk::SendChunkReadError(const TIntrusivePtr<TChunkRead>& read, TStringSt Y_VERIFY(status != NKikimrProto::OK); LOG_ERROR_S(*ActorSystem, NKikimrServices::BS_PDISK, error.Str()); - THolder<NPDisk::TEvChunkReadResult> result = MakeHolder<NPDisk::TEvChunkReadResult>(status, + THolder<NPDisk::TEvChunkReadResult> result = MakeHolder<NPDisk::TEvChunkReadResult>(status, read->ChunkIdx, read->Offset, read->Cookie, GetStatusFlags(read->Owner, read->OwnerGroupType), error.Str()); ActorSystem->Send(read->Sender, result.Release()); read->IsReplied = true; @@ -1150,11 +1150,11 @@ void TPDisk::ChunkReserve(TChunkReserve &evChunkReserve) { errorReason << allocateError; if (chunks.empty()) { - result = MakeHolder<NPDisk::TEvChunkReserveResult>(NKikimrProto::OUT_OF_SPACE, + result = MakeHolder<NPDisk::TEvChunkReserveResult>(NKikimrProto::OUT_OF_SPACE, NotEnoughDiskSpaceStatusFlags(evChunkReserve.Owner, evChunkReserve.OwnerGroupType), errorReason.Str()); } else { - result = MakeHolder<NPDisk::TEvChunkReserveResult>(NKikimrProto::OK, 0); + result = MakeHolder<NPDisk::TEvChunkReserveResult>(NKikimrProto::OK, 0); result->ChunkIds = std::move(chunks); result->StatusFlags = GetStatusFlags(evChunkReserve.Owner, evChunkReserve.OwnerGroupType); } diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_requestimpl.cpp b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_requestimpl.cpp index cd7ed438e4..27f26b1f4d 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_requestimpl.cpp +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_requestimpl.cpp @@ -48,8 +48,8 @@ void TChunkRead::Abort(TActorSystem* actorSystem) { Y_VERIFY(!IsReplied); TStringStream error; error << "ReqId# " << ReqId << " ChunkRead is deleted because of PDisk stoppage"; - THolder<NPDisk::TEvChunkReadResult> result = MakeHolder - <NPDisk::TEvChunkReadResult>(NKikimrProto::ERROR, + THolder<NPDisk::TEvChunkReadResult> result = MakeHolder + <NPDisk::TEvChunkReadResult>(NKikimrProto::ERROR, ChunkIdx, Offset, Cookie, NKikimrBlobStorage::StatusIsValid, error.Str()); actorSystem->Send(Sender, result.Release()); diff --git a/ydb/core/blobstorage/vdisk/common/vdisk_events.h b/ydb/core/blobstorage/vdisk/common/vdisk_events.h index 502f88ab42..47fbd959c9 100644 --- a/ydb/core/blobstorage/vdisk/common/vdisk_events.h +++ b/ydb/core/blobstorage/vdisk/common/vdisk_events.h @@ -1044,7 +1044,7 @@ namespace NKikimr { NKikimrBlobStorage::EGetHandleClass cls, EFlags flags = EFlags::None, TMaybe<ui64> requestCookie = {}, std::initializer_list<TExtremeQuery> queries = {}, ui32 forceBlockedGeneration = 0) { std::unique_ptr<TEvVGet> res(new TEvVGet(vdisk, deadline, cls, bool(ui32(flags) & ui32(EFlags::NotifyIfNotReady)), - bool(ui32(flags) & ui32(EFlags::ShowInternals)), requestCookie, true, true, forceBlockedGeneration)); + bool(ui32(flags) & ui32(EFlags::ShowInternals)), requestCookie, true, true, forceBlockedGeneration)); for (const auto &q : queries) { res->AddExtremeQuery(std::get<0>(q), std::get<1>(q), std::get<2>(q), std::get<3>(q)); } @@ -1055,7 +1055,7 @@ namespace NKikimr { NKikimrBlobStorage::EGetHandleClass cls, EFlags flags = EFlags::None, TMaybe<ui64> requestCookie = {}, std::initializer_list<TExtremeQuery> queries = {}, ui32 forceBlockedGeneration = 0) { std::unique_ptr<TEvVGet> res(new TEvVGet(vdisk, deadline, cls, bool(ui32(flags) & ui32(EFlags::NotifyIfNotReady)), - bool(ui32(flags) & ui32(EFlags::ShowInternals)), requestCookie, false, true, forceBlockedGeneration)); + bool(ui32(flags) & ui32(EFlags::ShowInternals)), requestCookie, false, true, forceBlockedGeneration)); for (const auto &q : queries) { res->AddExtremeQuery(std::get<0>(q), std::get<1>(q), std::get<2>(q), std::get<3>(q)); } @@ -1067,7 +1067,7 @@ namespace NKikimr { const TLogoBlobID &fromId, const TLogoBlobID &toId, ui32 maxResults = 0, const ui64 *cookie = nullptr, ui32 forceBlockedGeneration = 0) { std::unique_ptr<TEvVGet> res(new TEvVGet(vdisk, deadline, cls, bool(ui32(flags) & ui32(EFlags::NotifyIfNotReady)), - bool(ui32(flags) & ui32(EFlags::ShowInternals)), requestCookie, true, false, forceBlockedGeneration)); + bool(ui32(flags) & ui32(EFlags::ShowInternals)), requestCookie, true, false, forceBlockedGeneration)); NKikimrBlobStorage::TRangeQuery *q = res->Record.MutableRangeQuery(); LogoBlobIDFromLogoBlobID(fromId, q->MutableFrom()); LogoBlobIDFromLogoBlobID(toId, q->MutableTo()); diff --git a/ydb/core/blobstorage/vdisk/query/query_spacetracker_ut.cpp b/ydb/core/blobstorage/vdisk/query/query_spacetracker_ut.cpp index 34a3d50720..8f5b39bab8 100644 --- a/ydb/core/blobstorage/vdisk/query/query_spacetracker_ut.cpp +++ b/ydb/core/blobstorage/vdisk/query/query_spacetracker_ut.cpp @@ -184,7 +184,7 @@ namespace NKikimr { UNIT_ASSERT(result.ByteSizeLong() == protobufSize); NKikimrBlobStorage::TEvVGetResult desResult; - TArrayHolder<char> buffer(new char[protobufSize]); + TArrayHolder<char> buffer(new char[protobufSize]); Y_PROTOBUF_SUPPRESS_NODISCARD result.SerializeToArray(buffer.Get(), protobufSize); UNIT_ASSERT(desResult.ParseFromArray(buffer.Get(), protobufSize)); } diff --git a/ydb/core/blobstorage/vdisk/syncer/guid_recovery.cpp b/ydb/core/blobstorage/vdisk/syncer/guid_recovery.cpp index a167de7d0e..d4dc97f9ab 100644 --- a/ydb/core/blobstorage/vdisk/syncer/guid_recovery.cpp +++ b/ydb/core/blobstorage/vdisk/syncer/guid_recovery.cpp @@ -678,7 +678,7 @@ namespace NKikimr { using namespace std::placeholders; auto call = [&reconfigureProxy, msg = ev->Get()] (TVDiskInfo<TNeighborVDiskState>& x) { reconfigureProxy(std::unique_ptr<TEvVGenerationChange>(msg->Clone()), x); - }; + }; DecisionMaker.ReconfigureAllWorkingProxies(call); } diff --git a/ydb/core/client/client_ut.cpp b/ydb/core/client/client_ut.cpp index f1d8bd0a01..b94c722588 100644 --- a/ydb/core/client/client_ut.cpp +++ b/ydb/core/client/client_ut.cpp @@ -2093,7 +2093,7 @@ Y_UNIT_TEST_SUITE(TClientTest) { ))__"; { - THolder<TEvTablet::TEvLocalMKQL> reqWrite = MakeHolder<TEvTablet::TEvLocalMKQL>(); + THolder<TEvTablet::TEvLocalMKQL> reqWrite = MakeHolder<TEvTablet::TEvLocalMKQL>(); reqWrite->Record.MutableProgram()->MutableProgram()->SetText(Sprintf(writeQuery, ui64(10))); runtime.Send(new IEventHandle(leaderId, edge, reqWrite.Release())); @@ -2108,7 +2108,7 @@ Y_UNIT_TEST_SUITE(TClientTest) { } { - THolder<TEvTablet::TEvLocalMKQL> reqRead = MakeHolder<TEvTablet::TEvLocalMKQL>(); + THolder<TEvTablet::TEvLocalMKQL> reqRead = MakeHolder<TEvTablet::TEvLocalMKQL>(); reqRead->Record.MutableProgram()->MutableProgram()->SetText(readQuery); runtime.Send(new IEventHandle(followerId, edge, reqRead.Release())); @@ -2223,7 +2223,7 @@ Y_UNIT_TEST_SUITE(TClientTest) { ))__"; { - THolder<TEvTablet::TEvLocalMKQL> reqWrite = MakeHolder<TEvTablet::TEvLocalMKQL>(); + THolder<TEvTablet::TEvLocalMKQL> reqWrite = MakeHolder<TEvTablet::TEvLocalMKQL>(); reqWrite->Record.MutableProgram()->MutableProgram()->SetText(Sprintf(writeQuery, ui64(10))); runtime.Send(new IEventHandle(leaderId, edge, reqWrite.Release())); @@ -2232,7 +2232,7 @@ Y_UNIT_TEST_SUITE(TClientTest) { } { - THolder<TEvTablet::TEvLocalMKQL> reqRead = MakeHolder<TEvTablet::TEvLocalMKQL>(); + THolder<TEvTablet::TEvLocalMKQL> reqRead = MakeHolder<TEvTablet::TEvLocalMKQL>(); reqRead->Record.MutableProgram()->MutableProgram()->SetText(readQuery); runtime.Send(new IEventHandle(followerId, edge, reqRead.Release())); @@ -2284,7 +2284,7 @@ Y_UNIT_TEST_SUITE(TClientTest) { { // Read row from offline follower - THolder<TEvTablet::TEvLocalMKQL> reqRead = MakeHolder<TEvTablet::TEvLocalMKQL>(); + THolder<TEvTablet::TEvLocalMKQL> reqRead = MakeHolder<TEvTablet::TEvLocalMKQL>(); reqRead->Record.MutableProgram()->MutableProgram()->SetText(readQuery); runtime.Send(new IEventHandle(followerId2, edge, reqRead.Release())); @@ -2370,7 +2370,7 @@ Y_UNIT_TEST_SUITE(TClientTest) { auto prevObserverFunc = runtime.SetObserverFunc(blockConfirmations); { - THolder<TEvTablet::TEvLocalMKQL> reqWrite = MakeHolder<TEvTablet::TEvLocalMKQL>(); + THolder<TEvTablet::TEvLocalMKQL> reqWrite = MakeHolder<TEvTablet::TEvLocalMKQL>(); reqWrite->Record.MutableProgram()->MutableProgram()->SetText(Sprintf(writeQuery, ui64(10))); runtime.Send(new IEventHandle(leaderId, edge, reqWrite.Release())); @@ -2379,7 +2379,7 @@ Y_UNIT_TEST_SUITE(TClientTest) { } { - THolder<TEvTablet::TEvLocalMKQL> reqRead = MakeHolder<TEvTablet::TEvLocalMKQL>(); + THolder<TEvTablet::TEvLocalMKQL> reqRead = MakeHolder<TEvTablet::TEvLocalMKQL>(); reqRead->Record.MutableProgram()->MutableProgram()->SetText(readQuery); runtime.Send(new IEventHandle(followerId, edge, reqRead.Release())); @@ -2427,7 +2427,7 @@ Y_UNIT_TEST_SUITE(TClientTest) { { // Read row from offline follower (unconfirmed commit must be ignored) - THolder<TEvTablet::TEvLocalMKQL> reqRead = MakeHolder<TEvTablet::TEvLocalMKQL>(); + THolder<TEvTablet::TEvLocalMKQL> reqRead = MakeHolder<TEvTablet::TEvLocalMKQL>(); reqRead->Record.MutableProgram()->MutableProgram()->SetText(readQuery); runtime.Send(new IEventHandle(followerId2, edge, reqRead.Release())); @@ -2474,7 +2474,7 @@ Y_UNIT_TEST_SUITE(TClientTest) { { // Read row from offline follower - THolder<TEvTablet::TEvLocalMKQL> reqRead = MakeHolder<TEvTablet::TEvLocalMKQL>(); + THolder<TEvTablet::TEvLocalMKQL> reqRead = MakeHolder<TEvTablet::TEvLocalMKQL>(); reqRead->Record.MutableProgram()->MutableProgram()->SetText(readQuery); runtime.Send(new IEventHandle(followerId3, edge, reqRead.Release())); diff --git a/ydb/core/client/server/grpc_proxy_status.cpp b/ydb/core/client/server/grpc_proxy_status.cpp index a33ecd23c8..827335ad40 100644 --- a/ydb/core/client/server/grpc_proxy_status.cpp +++ b/ydb/core/client/server/grpc_proxy_status.cpp @@ -145,7 +145,7 @@ public: void ReplyAndDie(const TActorContext& ctx) { - THolder<TEvGRpcProxyStatus::TEvResponse> response = MakeHolder<TEvGRpcProxyStatus::TEvResponse>(); + THolder<TEvGRpcProxyStatus::TEvResponse> response = MakeHolder<TEvGRpcProxyStatus::TEvResponse>(); response->PerNodeResponse = PerNodeResponse; response->NodeNames = NodeNames; @@ -235,7 +235,7 @@ void TGRpcProxyStatusActor::Handle(TEvGRpcProxyStatus::TEvResponse::TPtr &ev, const TActorContext& ctx) { for (auto & sender : Requests) { - THolder<TEvGRpcProxyStatus::TEvResponse> response = MakeHolder<TEvGRpcProxyStatus::TEvResponse>(); + THolder<TEvGRpcProxyStatus::TEvResponse> response = MakeHolder<TEvGRpcProxyStatus::TEvResponse>(); response->PerNodeResponse = ev->Get()->PerNodeResponse; response->NodeNames = ev->Get()->NodeNames; response->NodeDataCenter = ev->Get()->NodeDataCenter; diff --git a/ydb/core/client/server/msgbus_server_pq_metarequest.cpp b/ydb/core/client/server/msgbus_server_pq_metarequest.cpp index a732e1e9e6..32f37251cc 100644 --- a/ydb/core/client/server/msgbus_server_pq_metarequest.cpp +++ b/ydb/core/client/server/msgbus_server_pq_metarequest.cpp @@ -640,7 +640,7 @@ void TPersQueueGetReadSessionsInfoTopicWorker::Answer(const TActorContext& ctx, res->SetErrorCode(NPersQueue::NErrorCode::INITIALIZING); res->SetErrorReason("Getting of session info failed"); } - THolder<TEvPersQueue::TEvReadSessionsInfoResponse> request = MakeHolder<TEvPersQueue::TEvReadSessionsInfoResponse>(); + THolder<TEvPersQueue::TEvReadSessionsInfoResponse> request = MakeHolder<TEvPersQueue::TEvReadSessionsInfoResponse>(); request->Record.Swap(&(BalancerResponse->Get()->Record)); request->Record.ClearPartitionInfo(); diff --git a/ydb/core/client/server/msgbus_server_s3_listing.cpp b/ydb/core/client/server/msgbus_server_s3_listing.cpp index 9421465c92..3626866322 100644 --- a/ydb/core/client/server/msgbus_server_s3_listing.cpp +++ b/ydb/core/client/server/msgbus_server_s3_listing.cpp @@ -718,7 +718,7 @@ private: public: TS3ListingRequestGrpc(TAutoPtr<TEvS3ListingRequest> request, TActorId schemeCache) : TS3ListingRequestBase(schemeCache, - THolder<const NACLib::TUserToken>(request->GetInternalToken() ? new NACLib::TUserToken(request->GetInternalToken()) : nullptr)) + THolder<const NACLib::TUserToken>(request->GetInternalToken() ? new NACLib::TUserToken(request->GetInternalToken()) : nullptr)) , GrpcRequest(request) {} diff --git a/ydb/core/cms/cms_tx_get_log_tail.cpp b/ydb/core/cms/cms_tx_get_log_tail.cpp index 17b2d4c4fa..8477e1d21a 100644 --- a/ydb/core/cms/cms_tx_get_log_tail.cpp +++ b/ydb/core/cms/cms_tx_get_log_tail.cpp @@ -30,7 +30,7 @@ public: "TTxGetLogTail found " << records.size() << " matching log records"); - Response = MakeHolder<TEvCms::TEvGetLogTailResponse>(); + Response = MakeHolder<TEvCms::TEvGetLogTailResponse>(); auto &rec = Response->Record; rec.MutableStatus()->SetCode(TStatus::OK); for (auto it = records.rbegin(); it != records.rend(); ++it) { diff --git a/ydb/core/cms/console/configs_dispatcher.cpp b/ydb/core/cms/console/configs_dispatcher.cpp index 99bc1fb4ac..8e50754239 100644 --- a/ydb/core/cms/console/configs_dispatcher.cpp +++ b/ydb/core/cms/console/configs_dispatcher.cpp @@ -712,7 +712,7 @@ void TConfigsDispatcher::Handle(TEvConfigsDispatcher::TEvGetConfigRequest::TPtr Send(ev->Sender, std::move(resp), 0, ev->Cookie); } else { Register(CreateNodeConfigCourier(ev->Get()->ConfigItemKinds, SelfId(), NextRequestCookie)); - ConfigRequests[NextRequestCookie++] = THolder<IEventHandle>(ev.Release()); + ConfigRequests[NextRequestCookie++] = THolder<IEventHandle>(ev.Release()); } } diff --git a/ydb/core/cms/console/tx_processor.cpp b/ydb/core/cms/console/tx_processor.cpp index 293cc4b78d..9ba7e9ad4c 100644 --- a/ydb/core/cms/console/tx_processor.cpp +++ b/ydb/core/cms/console/tx_processor.cpp @@ -51,7 +51,7 @@ void TTxProcessor::ProcessTx(ITransaction *tx, { LOG_TRACE_S(ctx, Service, LogPrefix << "enqueue tx"); - TxQueue.push_back(THolder<ITransaction>(tx)); + TxQueue.push_back(THolder<ITransaction>(tx)); ProcessNextTx(ctx); } diff --git a/ydb/core/driver_lib/cli_base/cli_cmds_root.cpp b/ydb/core/driver_lib/cli_base/cli_cmds_root.cpp index 028a6df913..197eccfcfd 100644 --- a/ydb/core/driver_lib/cli_base/cli_cmds_root.cpp +++ b/ydb/core/driver_lib/cli_base/cli_cmds_root.cpp @@ -132,7 +132,7 @@ private: }; int NewLiteClient(int argc, char** argv) { - THolder<TClientCommandRootLite> commandsRoot = MakeHolder<TClientCommandRootLite>(); + THolder<TClientCommandRootLite> commandsRoot = MakeHolder<TClientCommandRootLite>(); commandsRoot->Opts.SetTitle("YDB client"); TClientCommand::TConfig config(argc, argv); return commandsRoot->Process(config); diff --git a/ydb/core/driver_lib/run/run.cpp b/ydb/core/driver_lib/run/run.cpp index 0729e8c456..a4f74aa4e0 100644 --- a/ydb/core/driver_lib/run/run.cpp +++ b/ydb/core/driver_lib/run/run.cpp @@ -313,7 +313,7 @@ public: virtual void Initialize(NKikimr::TAppData* appData) override { if (Config.HasCmsConfig()) - appData->DefaultCmsConfig = MakeHolder<NKikimrCms::TCmsConfig>(Config.GetCmsConfig()); + appData->DefaultCmsConfig = MakeHolder<NKikimrCms::TCmsConfig>(Config.GetCmsConfig()); } }; diff --git a/ydb/core/engine/mkql_keys.cpp b/ydb/core/engine/mkql_keys.cpp index 10d3fc4b24..05afb89adc 100644 --- a/ydb/core/engine/mkql_keys.cpp +++ b/ydb/core/engine/mkql_keys.cpp @@ -80,7 +80,7 @@ THolder<TKeyDesc> ExtractKeyTuple(const TTableId& tableId, TTupleLiteral* tuple, TTableRange range(TConstArrayRef<TCell>(fromValues.data(), tuple->GetValuesCount()), inclusiveFrom, TConstArrayRef<TCell>(toValues.data(), staticComponents), inclusiveTo, point); - return MakeHolder<TKeyDesc>(tableId, range, rowOperation, keyColumnTypes, columns); + return MakeHolder<TKeyDesc>(tableId, range, rowOperation, keyColumnTypes, columns); } void ExtractReadColumns(TStructType* columnsType, TStructLiteral* tags, TVector<TKeyDesc::TColumnOp>& columns) { diff --git a/ydb/core/grpc_services/rpc_alter_table.cpp b/ydb/core/grpc_services/rpc_alter_table.cpp index 901ef90668..d1f2755b66 100644 --- a/ydb/core/grpc_services/rpc_alter_table.cpp +++ b/ydb/core/grpc_services/rpc_alter_table.cpp @@ -137,7 +137,7 @@ public: const auto& req = GetProtoRequest(); if (!Request_->GetInternalToken().empty()) { - UserToken = MakeHolder<NACLib::TUserToken>(Request_->GetInternalToken()); + UserToken = MakeHolder<NACLib::TUserToken>(Request_->GetInternalToken()); } auto ops = GetOps(); diff --git a/ydb/core/grpc_services/rpc_discovery.cpp b/ydb/core/grpc_services/rpc_discovery.cpp index e0439d97f2..75550f92ac 100644 --- a/ydb/core/grpc_services/rpc_discovery.cpp +++ b/ydb/core/grpc_services/rpc_discovery.cpp @@ -179,19 +179,19 @@ public: return; } - LookupResponse = THolder<TEvStateStorage::TEvBoardInfo>(ev->Release().Release()); + LookupResponse = THolder<TEvStateStorage::TEvBoardInfo>(ev->Release().Release()); TryReplyAndDie(); } void Handle(TEvInterconnect::TEvNodeInfo::TPtr &ev) { - NameserviceResponse = THolder<TEvInterconnect::TEvNodeInfo>(ev->Release().Release()); + NameserviceResponse = THolder<TEvInterconnect::TEvNodeInfo>(ev->Release().Release()); TryReplyAndDie(); } void Handle(TEvTxProxySchemeCache::TEvNavigateKeySetResult::TPtr &ev) { - SchemeCacheResponse = THolder<TEvTxProxySchemeCache::TEvNavigateKeySetResult>(ev->Release().Release()); + SchemeCacheResponse = THolder<TEvTxProxySchemeCache::TEvNavigateKeySetResult>(ev->Release().Release()); TEvTxProxySchemeCache::TEvNavigateKeySetResult *msg = SchemeCacheResponse.Get(); NSchemeCache::TSchemeCacheNavigate *navigate = msg->Request.Get(); diff --git a/ydb/core/kesus/proxy/proxy.cpp b/ydb/core/kesus/proxy/proxy.cpp index 7293d0e4a3..9633816e60 100644 --- a/ydb/core/kesus/proxy/proxy.cpp +++ b/ydb/core/kesus/proxy/proxy.cpp @@ -249,7 +249,7 @@ private: const auto& ctx = TActivationContext::AsActorContext(); LOG_TRACE_S(ctx, NKikimrServices::KESUS_PROXY, "Forwarding resolve result from SchemeCache: " << KesusPath.Quote()); - Send(Owner, new TEvPrivate::TEvResolveResult(KesusPath, THolder<TEvTxProxySchemeCache::TEvNavigateKeySetResult>(ev->Release().Release()))); + Send(Owner, new TEvPrivate::TEvResolveResult(KesusPath, THolder<TEvTxProxySchemeCache::TEvNavigateKeySetResult>(ev->Release().Release()))); PassAway(); } diff --git a/ydb/core/kesus/tablet/tx_config_set.cpp b/ydb/core/kesus/tablet/tx_config_set.cpp index ad780ead40..93eae8a9ed 100644 --- a/ydb/core/kesus/tablet/tx_config_set.cpp +++ b/ydb/core/kesus/tablet/tx_config_set.cpp @@ -27,7 +27,7 @@ struct TKesusTablet::TTxConfigSet : public TTxBase { "[" << Self->TabletID() << "] TTxConfigSet::Execute (sender=" << Sender << ", cookie=" << Cookie << ", path=" << Record.GetConfig().path().Quote() << ")"); - Reply = MakeHolder<TEvKesus::TEvSetConfigResult>(Record.GetTxId(), Self->TabletID()); + Reply = MakeHolder<TEvKesus::TEvSetConfigResult>(Record.GetTxId(), Self->TabletID()); ui64 newVersion = Record.GetVersion(); if (newVersion == 0) { diff --git a/ydb/core/kqp/executer/kqp_planner_strategy.cpp b/ydb/core/kqp/executer/kqp_planner_strategy.cpp index f09dc93069..b0f323dbc2 100644 --- a/ydb/core/kqp/executer/kqp_planner_strategy.cpp +++ b/ydb/core/kqp/executer/kqp_planner_strategy.cpp @@ -127,7 +127,7 @@ public: } // anonymous namespace THolder<IKqpPlannerStrategy> CreateKqpGreedyPlanner() { - return MakeHolder<TKqpGreedyPlanner>(); + return MakeHolder<TKqpGreedyPlanner>(); } } // namespace NKikimr::NKqp diff --git a/ydb/core/kqp/runtime/kqp_spilling_file.cpp b/ydb/core/kqp/runtime/kqp_spilling_file.cpp index 742e9c5730..0dd0a4f7a3 100644 --- a/ydb/core/kqp/runtime/kqp_spilling_file.cpp +++ b/ydb/core/kqp/runtime/kqp_spilling_file.cpp @@ -802,7 +802,7 @@ private: TFile file; if (CreateFile) { file = TFile(FileName, CreateAlways | WrOnly); - resp->NewFileHandle = MakeHolder<TFileHandle>(FileName, OpenExisting | RdWr); + resp->NewFileHandle = MakeHolder<TFileHandle>(FileName, OpenExisting | RdWr); } else { file = TFile::ForAppend(FileName); } diff --git a/ydb/core/mind/dynamic_nameserver.cpp b/ydb/core/mind/dynamic_nameserver.cpp index 0f5cd610df..6f4f147982 100644 --- a/ydb/core/mind/dynamic_nameserver.cpp +++ b/ydb/core/mind/dynamic_nameserver.cpp @@ -112,7 +112,7 @@ void TDynamicNodeSearcher::OnSuccess(const TActorContext &ctx) THolder<TEvInterconnect::TEvNodeInfo> reply(new TEvInterconnect::TEvNodeInfo(NodeId)); auto it = Config->DynamicNodes.find(NodeId); if (it != Config->DynamicNodes.end()) - reply->Node = MakeHolder<TEvInterconnect::TNodeInfo>(it->first, it->second.Address, + reply->Node = MakeHolder<TEvInterconnect::TNodeInfo>(it->first, it->second.Address, it->second.Host, it->second.ResolveHost, it->second.Port, it->second.Location); ctx.Send(OrigRequest->Sender, reply.Release()); @@ -362,7 +362,7 @@ void TDynamicNameserver::Handle(TEvInterconnect::TEvGetNode::TPtr &ev, const TAc if (!config || nodeId <= config->MaxStaticNodeId) { auto it = StaticConfig->StaticNodeTable.find(nodeId); if (it != StaticConfig->StaticNodeTable.end()) - reply->Node = MakeHolder<TEvInterconnect::TNodeInfo>(it->first, it->second.Address, + reply->Node = MakeHolder<TEvInterconnect::TNodeInfo>(it->first, it->second.Address, it->second.Host, it->second.ResolveHost, it->second.Port, it->second.Location); ctx.Send(ev->Sender, reply.Release()); @@ -370,7 +370,7 @@ void TDynamicNameserver::Handle(TEvInterconnect::TEvGetNode::TPtr &ev, const TAc ui32 domain = NodeIdToDomain(nodeId, *AppData(ctx)->DomainsInfo); auto it = DynamicConfigs[domain]->DynamicNodes.find(nodeId); if (it != DynamicConfigs[domain]->DynamicNodes.end() && it->second.Expire > ctx.Now()) { - reply->Node = MakeHolder<TEvInterconnect::TNodeInfo>(it->first, it->second.Address, + reply->Node = MakeHolder<TEvInterconnect::TNodeInfo>(it->first, it->second.Address, it->second.Host, it->second.ResolveHost, it->second.Port, it->second.Location); ctx.Send(ev->Sender, reply.Release()); diff --git a/ydb/core/mind/hive/hive_domains.cpp b/ydb/core/mind/hive/hive_domains.cpp index d0efcb2634..4ddb952aec 100644 --- a/ydb/core/mind/hive/hive_domains.cpp +++ b/ydb/core/mind/hive/hive_domains.cpp @@ -32,7 +32,7 @@ bool THive::SeenDomain(TSubDomainKey domain) { } void THive::ResolveDomain(TSubDomainKey domain) { - THolder<NSchemeCache::TSchemeCacheNavigate> request = MakeHolder<NSchemeCache::TSchemeCacheNavigate>(); + THolder<NSchemeCache::TSchemeCacheNavigate> request = MakeHolder<NSchemeCache::TSchemeCacheNavigate>(); request->ResultSet.emplace_back(); auto& entry = request->ResultSet.back(); entry.TableId = TTableId(domain.first, domain.second); diff --git a/ydb/core/mind/hive/hive_impl.cpp b/ydb/core/mind/hive/hive_impl.cpp index 1357cb14c9..58ca2ac3e4 100644 --- a/ydb/core/mind/hive/hive_impl.cpp +++ b/ydb/core/mind/hive/hive_impl.cpp @@ -30,7 +30,7 @@ void THive::Handle(TEvHive::TEvCreateTablet::TPtr& ev) { Execute(CreateCreateTablet(std::move(rec), ev->Sender, ev->Cookie)); } else { BLOG_ERROR("Invalid arguments specified to TEvCreateTablet: " << rec.DebugString()); - THolder<TEvHive::TEvCreateTabletReply> reply = MakeHolder<TEvHive::TEvCreateTabletReply>(); + THolder<TEvHive::TEvCreateTabletReply> reply = MakeHolder<TEvHive::TEvCreateTabletReply>(); reply->Record.SetStatus(NKikimrProto::EReplyStatus::ERROR); reply->Record.SetErrorReason(NKikimrHive::EErrorReason::ERROR_REASON_INVALID_ARGUMENTS); if (rec.HasOwner()) { @@ -612,7 +612,7 @@ void THive::Handle(TEvInterconnect::TEvNodeConnected::TPtr &ev) { void THive::Handle(TEvInterconnect::TEvNodeDisconnected::TPtr &ev) { BLOG_W("Handle TEvInterconnect::TEvNodeDisconnected, NodeId " << ev->Get()->NodeId); - Execute(CreateDisconnectNode(THolder<TEvInterconnect::TEvNodeDisconnected>(ev->Release().Release()))); + Execute(CreateDisconnectNode(THolder<TEvInterconnect::TEvNodeDisconnected>(ev->Release().Release()))); } void THive::Handle(TEvInterconnect::TEvNodeInfo::TPtr &ev) { @@ -1698,7 +1698,7 @@ void THive::Handle(TEvHive::TEvRequestHiveDomainStats::TPtr& ev) { } } - THolder<TEvHive::TEvResponseHiveDomainStats> response = MakeHolder<TEvHive::TEvResponseHiveDomainStats>(); + THolder<TEvHive::TEvResponseHiveDomainStats> response = MakeHolder<TEvHive::TEvResponseHiveDomainStats>(); auto& record = response->Record; for (const auto& pr1 : subDomainStats) { @@ -1723,7 +1723,7 @@ void THive::Handle(TEvHive::TEvRequestHiveDomainStats::TPtr& ev) { } void THive::Handle(TEvHive::TEvRequestHiveNodeStats::TPtr& ev) { - THolder<TEvHive::TEvResponseHiveNodeStats> response = MakeHolder<TEvHive::TEvResponseHiveNodeStats>(); + THolder<TEvHive::TEvResponseHiveNodeStats> response = MakeHolder<TEvHive::TEvResponseHiveNodeStats>(); auto& record = response->Record; for (auto it = Nodes.begin(); it != Nodes.end(); ++it) { auto& nodeStats = *record.AddNodeStats(); @@ -1751,7 +1751,7 @@ void THive::Handle(TEvHive::TEvRequestHiveNodeStats::TPtr& ev) { } void THive::Handle(TEvHive::TEvRequestHiveStorageStats::TPtr& ev) { - THolder<TEvHive::TEvResponseHiveStorageStats> response = MakeHolder<TEvHive::TEvResponseHiveStorageStats>(); + THolder<TEvHive::TEvResponseHiveStorageStats> response = MakeHolder<TEvHive::TEvResponseHiveStorageStats>(); auto& record = response->Record; for (const auto& [name, pool] : StoragePools) { auto& pbPool = *record.AddPools(); @@ -2141,7 +2141,7 @@ const TVector<i64>& THive::GetTabletTypeAllowedMetricIds(TTabletTypes::EType typ } THolder<NKikimrBlobStorage::TEvControllerSelectGroups::TGroupParameters> THive::BuildGroupParametersForChannel(const TLeaderTabletInfo& tablet, ui32 channelId) { - THolder<NKikimrBlobStorage::TEvControllerSelectGroups::TGroupParameters> groupParameters = MakeHolder<NKikimrBlobStorage::TEvControllerSelectGroups::TGroupParameters>(); + THolder<NKikimrBlobStorage::TEvControllerSelectGroups::TGroupParameters> groupParameters = MakeHolder<NKikimrBlobStorage::TEvControllerSelectGroups::TGroupParameters>(); Y_VERIFY(channelId < tablet.BoundChannels.size()); const auto& binding = tablet.BoundChannels[channelId]; groupParameters->MutableStoragePoolSpecifier()->SetName(binding.GetStoragePoolName()); @@ -2236,7 +2236,7 @@ void THive::RequestPoolsInformation() { } if (!requests.empty()) { - THolder<TEvBlobStorage::TEvControllerSelectGroups> ev = MakeHolder<TEvBlobStorage::TEvControllerSelectGroups>(); + THolder<TEvBlobStorage::TEvControllerSelectGroups> ev = MakeHolder<TEvBlobStorage::TEvControllerSelectGroups>(); NKikimrBlobStorage::TEvControllerSelectGroups& record = ev->Record; record.SetReturnAllMatchingGroups(true); record.SetBlockUntilAllResourcesAreComplete(true); diff --git a/ydb/core/mind/hive/hive_ut.cpp b/ydb/core/mind/hive/hive_ut.cpp index 9bd7a500a3..0383d49a12 100644 --- a/ydb/core/mind/hive/hive_ut.cpp +++ b/ydb/core/mind/hive/hive_ut.cpp @@ -816,7 +816,7 @@ Y_UNIT_TEST_SUITE(THiveTest) { TTabletTypes::EType tabletType = TTabletTypes::Dummy; ui64 tabletId = SendCreateTestTablet(runtime, hiveTablet, testerTablet, MakeHolder<TEvHive::TEvCreateTablet>(testerTablet, 0, tabletType, BINDED_CHANNELS), 0, true); MakeSureTabletIsUp(runtime, tabletId, 0); - THolder<TEvHive::TEvDeleteOwnerTablets> deleteOwner = MakeHolder<TEvHive::TEvDeleteOwnerTablets>(testerTablet, 1); + THolder<TEvHive::TEvDeleteOwnerTablets> deleteOwner = MakeHolder<TEvHive::TEvDeleteOwnerTablets>(testerTablet, 1); TActorId senderB = runtime.AllocateEdgeActor(0); runtime.SendToPipe(hiveTablet, senderB, deleteOwner.Release(), 0, GetPipeConfigWithRetries()); TAutoPtr<IEventHandle> handle; @@ -954,7 +954,7 @@ Y_UNIT_TEST_SUITE(THiveTest) { } } while (true); - THolder<TEvHive::TEvCreateTablet> createHive = MakeHolder<TEvHive::TEvCreateTablet>(testerTablet, 0, TTabletTypes::Hive, BINDED_CHANNELS); + THolder<TEvHive::TEvCreateTablet> createHive = MakeHolder<TEvHive::TEvCreateTablet>(testerTablet, 0, TTabletTypes::Hive, BINDED_CHANNELS); createHive->Record.AddAllowedDomains(); createHive->Record.MutableAllowedDomains(0)->SetSchemeShard(subdomainKey.first); createHive->Record.MutableAllowedDomains(0)->SetPathId(subdomainKey.second); @@ -973,7 +973,7 @@ Y_UNIT_TEST_SUITE(THiveTest) { MakeSureTabletIsUp(runtime, subHiveTablet, 0); // sub hive good - THolder<TEvHive::TEvCreateTablet> createTablet = MakeHolder<TEvHive::TEvCreateTablet>(testerTablet, 1, TTabletTypes::Dummy, BINDED_CHANNELS); + THolder<TEvHive::TEvCreateTablet> createTablet = MakeHolder<TEvHive::TEvCreateTablet>(testerTablet, 1, TTabletTypes::Dummy, BINDED_CHANNELS); createTablet->Record.AddAllowedDomains(); createTablet->Record.MutableAllowedDomains(0)->SetSchemeShard(subdomainKey.first); createTablet->Record.MutableAllowedDomains(0)->SetPathId(subdomainKey.second); @@ -1016,7 +1016,7 @@ Y_UNIT_TEST_SUITE(THiveTest) { } } while (true); - THolder<TEvHive::TEvCreateTablet> createHive = MakeHolder<TEvHive::TEvCreateTablet>(testerTablet, 0, TTabletTypes::Hive, BINDED_CHANNELS); + THolder<TEvHive::TEvCreateTablet> createHive = MakeHolder<TEvHive::TEvCreateTablet>(testerTablet, 0, TTabletTypes::Hive, BINDED_CHANNELS); createHive->Record.AddAllowedDomains(); createHive->Record.MutableAllowedDomains(0)->SetSchemeShard(subdomainKey.first); createHive->Record.MutableAllowedDomains(0)->SetPathId(subdomainKey.second); @@ -1035,14 +1035,14 @@ Y_UNIT_TEST_SUITE(THiveTest) { MakeSureTabletIsUp(runtime, subHiveTablet, 0); // sub hive good - THolder<TEvHive::TEvCreateTablet> createTablet1 = MakeHolder<TEvHive::TEvCreateTablet>(testerTablet, 1, TTabletTypes::Dummy, BINDED_CHANNELS); + THolder<TEvHive::TEvCreateTablet> createTablet1 = MakeHolder<TEvHive::TEvCreateTablet>(testerTablet, 1, TTabletTypes::Dummy, BINDED_CHANNELS); createTablet1->Record.AddAllowedDomains(); createTablet1->Record.MutableAllowedDomains(0)->SetSchemeShard(subdomainKey.first); createTablet1->Record.MutableAllowedDomains(0)->SetPathId(subdomainKey.second); ui64 tabletId1 = SendCreateTestTablet(runtime, hiveTablet, testerTablet, std::move(createTablet1), 0, true); MakeSureTabletIsUp(runtime, tabletId1, 0); - THolder<TEvHive::TEvCreateTablet> createTablet2 = MakeHolder<TEvHive::TEvCreateTablet>(testerTablet, 2, TTabletTypes::Dummy, BINDED_CHANNELS); + THolder<TEvHive::TEvCreateTablet> createTablet2 = MakeHolder<TEvHive::TEvCreateTablet>(testerTablet, 2, TTabletTypes::Dummy, BINDED_CHANNELS); createTablet2->Record.AddAllowedDomains(); createTablet2->Record.MutableAllowedDomains(0)->SetSchemeShard(subdomainKey.first); createTablet2->Record.MutableAllowedDomains(0)->SetPathId(subdomainKey.second); @@ -1061,7 +1061,7 @@ Y_UNIT_TEST_SUITE(THiveTest) { UNIT_ASSERT_VALUES_EQUAL(createTabletReply->Record.GetForwardRequest().GetHiveTabletId(), hiveTablet); // trying to delete same tablet from sub domain hive - THolder<TEvHive::TEvDeleteTablet> deleteTablet1 = MakeHolder<TEvHive::TEvDeleteTablet>(testerTablet, 1, 0); + THolder<TEvHive::TEvDeleteTablet> deleteTablet1 = MakeHolder<TEvHive::TEvDeleteTablet>(testerTablet, 1, 0); deleteTablet1->Record.AddTabletID(tabletId1); runtime.SendToPipe(subHiveTablet, sender, deleteTablet1.Release(), 0, GetPipeConfigWithRetries()); @@ -1081,7 +1081,7 @@ Y_UNIT_TEST_SUITE(THiveTest) { UNIT_ASSERT_VALUES_EQUAL(createTabletReply->Record.GetForwardRequest().GetHiveTabletId(), subHiveTablet); // trying to delete same tablet from root hive - THolder<TEvHive::TEvDeleteTablet> deleteTablet2 = MakeHolder<TEvHive::TEvDeleteTablet>(testerTablet, 2, 0); + THolder<TEvHive::TEvDeleteTablet> deleteTablet2 = MakeHolder<TEvHive::TEvDeleteTablet>(testerTablet, 2, 0); deleteTablet2->Record.AddTabletID(tabletId2); runtime.SendToPipe(hiveTablet, sender, deleteTablet2.Release(), 0, GetPipeConfigWithRetries()); @@ -2890,7 +2890,7 @@ Y_UNIT_TEST_SUITE(THiveTest) { } for (int nodeIdx = 0; nodeIdx < NUM_NODES; ++nodeIdx) { TActorId senderLocal = runtime.AllocateEdgeActor(nodeIdx); - THolder<TEvHive::TEvTabletMetrics> ev = MakeHolder<TEvHive::TEvTabletMetrics>(); + THolder<TEvHive::TEvTabletMetrics> ev = MakeHolder<TEvHive::TEvTabletMetrics>(); ev->Record.MutableTotalResourceUsage()->SetCPU(999); // KIKIMR-9870 runtime.SendToPipe(hiveTablet, senderLocal, ev.Release(), nodeIdx, GetPipeConfigWithRetries()); TAutoPtr<IEventHandle> handle; @@ -2934,7 +2934,7 @@ Y_UNIT_TEST_SUITE(THiveTest) { { int i = 1; for (ui64 tabletId : tablets) { - THolder<TEvHive::TEvTabletMetrics> metrics = MakeHolder<TEvHive::TEvTabletMetrics>(); + THolder<TEvHive::TEvTabletMetrics> metrics = MakeHolder<TEvHive::TEvTabletMetrics>(); NKikimrHive::TTabletMetrics* metric = metrics->Record.AddTabletMetrics(); metric->SetTabletID(tabletId); metric->MutableResourceUsage()->SetNetwork(100000 * i); @@ -3221,7 +3221,7 @@ Y_UNIT_TEST_SUITE(THiveTest) { { std::array<int, NUM_NODES> nodeTablets = {}; { - THolder<TEvHive::TEvRequestHiveInfo> request = MakeHolder<TEvHive::TEvRequestHiveInfo>(); + THolder<TEvHive::TEvRequestHiveInfo> request = MakeHolder<TEvHive::TEvRequestHiveInfo>(); runtime.SendToPipe(hiveTablet, senderA, request.Release()); TAutoPtr<IEventHandle> handle; TEvHive::TEvResponseHiveInfo* response = runtime.GrabEdgeEventRethrow<TEvHive::TEvResponseHiveInfo>(handle); @@ -3241,7 +3241,7 @@ Y_UNIT_TEST_SUITE(THiveTest) { { std::array<int, NUM_NODES> nodeTablets = {}; { - THolder<TEvHive::TEvRequestHiveInfo> request = MakeHolder<TEvHive::TEvRequestHiveInfo>(); + THolder<TEvHive::TEvRequestHiveInfo> request = MakeHolder<TEvHive::TEvRequestHiveInfo>(); request->Record.SetReturnFollowers(true); runtime.SendToPipe(hiveTablet, senderA, request.Release()); TAutoPtr<IEventHandle> handle; @@ -3263,7 +3263,7 @@ Y_UNIT_TEST_SUITE(THiveTest) { // report metrics for leaders only { for (ui64 tabletId : tablets) { - THolder<TEvHive::TEvTabletMetrics> metrics = MakeHolder<TEvHive::TEvTabletMetrics>(); + THolder<TEvHive::TEvTabletMetrics> metrics = MakeHolder<TEvHive::TEvTabletMetrics>(); NKikimrHive::TTabletMetrics* metric = metrics->Record.AddTabletMetrics(); metric->SetTabletID(tabletId); metric->MutableResourceUsage()->SetCPU(5000); diff --git a/ydb/core/mind/hive/storage_pool_info.cpp b/ydb/core/mind/hive/storage_pool_info.cpp index 1e0efb2f3d..fafd6644de 100644 --- a/ydb/core/mind/hive/storage_pool_info.cpp +++ b/ydb/core/mind/hive/storage_pool_info.cpp @@ -157,7 +157,7 @@ void TStoragePoolInfo::Invalidate() { } THolder<TEvControllerSelectGroups::TGroupParameters> TStoragePoolInfo::BuildRefreshRequest() const { - THolder<TEvControllerSelectGroups::TGroupParameters> params = MakeHolder<TEvControllerSelectGroups::TGroupParameters>(); + THolder<TEvControllerSelectGroups::TGroupParameters> params = MakeHolder<TEvControllerSelectGroups::TGroupParameters>(); params->MutableStoragePoolSpecifier()->SetName(Name); return params; } diff --git a/ydb/core/mind/hive/tx__create_tablet.cpp b/ydb/core/mind/hive/tx__create_tablet.cpp index 8680578cd4..f3b27bfd9a 100644 --- a/ydb/core/mind/hive/tx__create_tablet.cpp +++ b/ydb/core/mind/hive/tx__create_tablet.cpp @@ -465,7 +465,7 @@ public: BLOG_D("THive::TTxCreateTablet::Complete TabletId: " << TabletId << " Status: " << NKikimrProto::EReplyStatus_Name(Status) << " State: " << ETabletStateName(State)); Y_VERIFY(!!Sender); - THolder<TEvHive::TEvCreateTabletReply> reply = MakeHolder<TEvHive::TEvCreateTabletReply>(Status, OwnerId, OwnerIdx, TabletId, Self->TabletID(), ErrorReason); + THolder<TEvHive::TEvCreateTabletReply> reply = MakeHolder<TEvHive::TEvCreateTabletReply>(Status, OwnerId, OwnerIdx, TabletId, Self->TabletID(), ErrorReason); if (ForwardRequest.HasHiveTabletId()) { reply->Record.MutableForwardRequest()->CopyFrom(ForwardRequest); } diff --git a/ydb/core/mind/hive/tx__delete_tablet.cpp b/ydb/core/mind/hive/tx__delete_tablet.cpp index 74b764177c..6d481e695f 100644 --- a/ydb/core/mind/hive/tx__delete_tablet.cpp +++ b/ydb/core/mind/hive/tx__delete_tablet.cpp @@ -104,7 +104,7 @@ public: void Complete(const TActorContext& ctx) override { BLOG_D("THive::TTxDeleteTablet::Complete(" << TabletIds << ")"); - THolder<TEvHive::TEvDeleteTabletReply> response = MakeHolder<TEvHive::TEvDeleteTabletReply>(Status, Self->TabletID(), Event->Get()->Record.GetTxId_Deprecated(), OwnerId, LocalIdxs); + THolder<TEvHive::TEvDeleteTabletReply> response = MakeHolder<TEvHive::TEvDeleteTabletReply>(Status, Self->TabletID(), Event->Get()->Record.GetTxId_Deprecated(), OwnerId, LocalIdxs); if (ForwardRequest.HasHiveTabletId()) { response->Record.MutableForwardRequest()->CopyFrom(ForwardRequest); } diff --git a/ydb/core/mind/hive/tx__disconnect_node.cpp b/ydb/core/mind/hive/tx__disconnect_node.cpp index 806ff42aef..0969a6e3b9 100644 --- a/ydb/core/mind/hive/tx__disconnect_node.cpp +++ b/ydb/core/mind/hive/tx__disconnect_node.cpp @@ -22,7 +22,7 @@ public: if (node != nullptr) { Self->ScheduleUnlockTabletExecution(*node); if (node->BecomeDisconnecting()) { - THolder<TEvPrivate::TEvProcessDisconnectNode> event = MakeHolder<TEvPrivate::TEvProcessDisconnectNode>(); + THolder<TEvPrivate::TEvProcessDisconnectNode> event = MakeHolder<TEvPrivate::TEvProcessDisconnectNode>(); event->NodeId = node->Id; event->Local = node->Local; event->StartTime = TActivationContext::Now(); diff --git a/ydb/core/mind/hive/tx__request_tablet_seq.cpp b/ydb/core/mind/hive/tx__request_tablet_seq.cpp index 41d05842cc..aa43f85ea4 100644 --- a/ydb/core/mind/hive/tx__request_tablet_seq.cpp +++ b/ydb/core/mind/hive/tx__request_tablet_seq.cpp @@ -58,7 +58,7 @@ public: BLOG_CRIT("Could not allocate sequence of " << Size << " elements for " << Owner); } else { BLOG_D("Respond with sequence " << Sequence << " to " << Owner); - THolder<TEvHive::TEvResponseTabletIdSequence> response = MakeHolder<TEvHive::TEvResponseTabletIdSequence>(); + THolder<TEvHive::TEvResponseTabletIdSequence> response = MakeHolder<TEvHive::TEvResponseTabletIdSequence>(); const auto& pbRecord(Event->Get()->Record); response->Record.MutableOwner()->CopyFrom(pbRecord.GetOwner()); response->Record.SetBeginId(Sequence.Begin); diff --git a/ydb/core/mind/local.cpp b/ydb/core/mind/local.cpp index 54ff6628f3..09fc15f76d 100644 --- a/ydb/core/mind/local.cpp +++ b/ydb/core/mind/local.cpp @@ -182,7 +182,7 @@ class TLocalNodeRegistrar : public TActorBootstrapped<TLocalNodeRegistrar> { }; HivePipeClient = ctx.RegisterWithSameMailbox(NTabletPipe::CreateClient(ctx.SelfID, HiveId, pipeConfig)); - THolder<TEvLocal::TEvRegisterNode> request = MakeHolder<TEvLocal::TEvRegisterNode>(HiveId); + THolder<TEvLocal::TEvRegisterNode> request = MakeHolder<TEvLocal::TEvRegisterNode>(HiveId); for (auto &domain: ServicedDomains) { *request->Record.AddServicedDomains() = NKikimrSubDomains::TDomainKey(domain); } @@ -1222,7 +1222,7 @@ class TDomainLocal : public TActorBootstrapped<TDomainLocal> { const ui32 domainId = domains.GetDomainUidByTabletId(rec.GetPathDescription().GetSelf().GetSchemeshardId()); const ui32 boardSSId = domains.GetDomain(domainId).DefaultSchemeBoardGroup; - THolder<IActor> subscriber(CreateSchemeBoardSubscriber(SelfId(), path, boardSSId, ESchemeBoardSubscriberDeletionPolicy::Majority)); + THolder<IActor> subscriber(CreateSchemeBoardSubscriber(SelfId(), path, boardSSId, ESchemeBoardSubscriberDeletionPolicy::Majority)); tenant.Subscriber = Register(subscriber.Release()); } else { LOG_WARN_S(ctx, NKikimrServices::LOCAL, diff --git a/ydb/core/mind/tenant_pool.cpp b/ydb/core/mind/tenant_pool.cpp index 38dbfae8c3..80236570b9 100644 --- a/ydb/core/mind/tenant_pool.cpp +++ b/ydb/core/mind/tenant_pool.cpp @@ -343,7 +343,7 @@ public: THolder<TEvTenantPool::TEvTenantPoolStatus> BuildStatusEvent(bool listStatic = false) { - THolder<TEvTenantPool::TEvTenantPoolStatus> ev = MakeHolder<TEvTenantPool::TEvTenantPoolStatus>(); + THolder<TEvTenantPool::TEvTenantPoolStatus> ev = MakeHolder<TEvTenantPool::TEvTenantPoolStatus>(); if (listStatic) { for (auto& pr : Config->StaticSlots) { NKikimrTenantPool::TSlotConfig& slotConfig = pr.second; @@ -652,7 +652,7 @@ public: auto slot = DynamicSlots[rec.GetSlotId()]; if (slot->ActiveAction) { - slot->PendingActions.emplace(ev.Release()); + slot->PendingActions.emplace(ev.Release()); return; } diff --git a/ydb/core/mind/tenant_slot_broker.cpp b/ydb/core/mind/tenant_slot_broker.cpp index b43ad3f66c..65f7a86328 100644 --- a/ydb/core/mind/tenant_slot_broker.cpp +++ b/ydb/core/mind/tenant_slot_broker.cpp @@ -1597,7 +1597,7 @@ void TTenantSlotBroker::ProcessTx(ITransaction *tx, const TActorContext &ctx) { Y_VERIFY(tx); - TxQueue.emplace_back(tx); + TxQueue.emplace_back(tx); ProcessNextTx(ctx); } diff --git a/ydb/core/mon/mon.cpp b/ydb/core/mon/mon.cpp index 0749e437c5..d4722266f3 100644 --- a/ydb/core/mon/mon.cpp +++ b/ydb/core/mon/mon.cpp @@ -151,7 +151,7 @@ namespace NActors { if (type.empty()) { type = "application/json"; } - Result.SetValue(MakeHolder<NMon::TEvHttpInfoRes>( + Result.SetValue(MakeHolder<NMon::TEvHttpInfoRes>( "HTTP/1.1 204 No Content\r\n" "Allow: OPTIONS, GET, POST\r\n" "Content-Type: " + type + "\r\n" @@ -172,7 +172,7 @@ namespace NActors { response << "Content-Length: " << body.Size() << "\r\n"; response << "\r\n"; response << body.Str(); - Result.SetValue(MakeHolder<NMon::TEvHttpInfoRes>(response.Str(), 0, NMon::IEvHttpInfoRes::EContentType::Custom)); + Result.SetValue(MakeHolder<NMon::TEvHttpInfoRes>(response.Str(), 0, NMon::IEvHttpInfoRes::EContentType::Custom)); Die(ctx); } @@ -189,7 +189,7 @@ namespace NActors { response << "Content-Length: " << body.Size() << "\r\n"; response << "\r\n"; response << body.Str(); - Result.SetValue(MakeHolder<NMon::TEvHttpInfoRes>(response.Str(), 0, NMon::IEvHttpInfoRes::EContentType::Custom)); + Result.SetValue(MakeHolder<NMon::TEvHttpInfoRes>(response.Str(), 0, NMon::IEvHttpInfoRes::EContentType::Custom)); Die(ctx); } diff --git a/ydb/core/persqueue/cache_eviction.h b/ydb/core/persqueue/cache_eviction.h index 115ffd4325..07ae210f85 100644 --- a/ydb/core/persqueue/cache_eviction.h +++ b/ydb/core/persqueue/cache_eviction.h @@ -70,7 +70,7 @@ namespace NPQ { THolder<TEvKeyValue::TEvRequest> MakeKvRequest() const { - THolder<TEvKeyValue::TEvRequest> request = MakeHolder<TEvKeyValue::TEvRequest>(); + THolder<TEvKeyValue::TEvRequest> request = MakeHolder<TEvKeyValue::TEvRequest>(); for (auto& blob : Blobs) { if (blob.Value.empty()) { // add reading command @@ -106,7 +106,7 @@ namespace NPQ { << ". Cropped " << cropped << " blobs of " << Blobs.size()); } - return MakeHolder<TEvPQ::TEvBlobResponse>(CookiePQ, std::move(Blobs), error); + return MakeHolder<TEvPQ::TEvBlobResponse>(CookiePQ, std::move(Blobs), error); } void Verify(const TRequestedBlob& blob) const { @@ -255,7 +255,7 @@ namespace NPQ { { ui32 fromCache = GetBlobs(ctx, kvReq); - THolder<TCacheL2Request> reqData = MakeHolder<TCacheL2Request>(TopicName); + THolder<TCacheL2Request> reqData = MakeHolder<TCacheL2Request>(TopicName); for (const auto& blob : kvReq.Blobs) { // Touching blobs in L2. We don't need data here @@ -266,14 +266,14 @@ namespace NPQ { reqData->MissedBlobs.push_back(key); } - THolder<TEvPqCache::TEvCacheL2Request> l2Request = MakeHolder<TEvPqCache::TEvCacheL2Request>(reqData.Release()); + THolder<TEvPqCache::TEvCacheL2Request> l2Request = MakeHolder<TEvPqCache::TEvCacheL2Request>(reqData.Release()); ctx.Send(MakePersQueueL2CacheID(), l2Request.Release()); // -> L2 return fromCache; } void SaveHeadBlobs(const TActorContext& ctx, const TKvRequest& kvReq) { - THolder<TCacheL2Request> reqData = MakeHolder<TCacheL2Request>(TopicName); + THolder<TCacheL2Request> reqData = MakeHolder<TCacheL2Request>(TopicName); for (const TRequestedBlob& reqBlob : kvReq.Blobs) { TBlobId blob(kvReq.Partition, reqBlob.Offset, reqBlob.PartNo, reqBlob.Count, reqBlob.InternalPartsCount); @@ -299,7 +299,7 @@ namespace NPQ { << " size " << reqBlob.Value.size() << " actorID " << ctx.SelfID); } - THolder<TEvPqCache::TEvCacheL2Request> l2Request = MakeHolder<TEvPqCache::TEvCacheL2Request>(reqData.Release()); + THolder<TEvPqCache::TEvCacheL2Request> l2Request = MakeHolder<TEvPqCache::TEvCacheL2Request>(reqData.Release()); ctx.Send(MakePersQueueL2CacheID(), l2Request.Release()); // -> L2 } @@ -307,7 +307,7 @@ namespace NPQ { { Y_VERIFY(store.size() == kvReq.Blobs.size()); - THolder<TCacheL2Request> reqData = MakeHolder<TCacheL2Request>(TopicName); + THolder<TCacheL2Request> reqData = MakeHolder<TCacheL2Request>(TopicName); bool haveSome = false; for (ui32 i = 0; i < kvReq.Blobs.size(); ++i) { @@ -339,7 +339,7 @@ namespace NPQ { } if (haveSome) { - THolder<TEvPqCache::TEvCacheL2Request> l2Request = MakeHolder<TEvPqCache::TEvCacheL2Request>(reqData.Release()); + THolder<TEvPqCache::TEvCacheL2Request> l2Request = MakeHolder<TEvPqCache::TEvCacheL2Request>(reqData.Release()); ctx.Send(MakePersQueueL2CacheID(), l2Request.Release()); // -> L2 } } @@ -371,12 +371,12 @@ namespace NPQ { RemoveEvicted(); if (L1Strategy) { - THolder<TCacheL2Request> reqData = MakeHolder<TCacheL2Request>(TopicName); + THolder<TCacheL2Request> reqData = MakeHolder<TCacheL2Request>(TopicName); TDeque<TBlobId> needTouch = L1Strategy->BlobsToTouch(); PrepareTouch(ctx, reqData, needTouch); - THolder<TEvPqCache::TEvCacheL2Request> l2Request = MakeHolder<TEvPqCache::TEvCacheL2Request>(reqData.Release()); + THolder<TEvPqCache::TEvCacheL2Request> l2Request = MakeHolder<TEvPqCache::TEvCacheL2Request>(reqData.Release()); ctx.Send(MakePersQueueL2CacheID(), l2Request.Release()); // -> L2 } } diff --git a/ydb/core/persqueue/mirrorer.cpp b/ydb/core/persqueue/mirrorer.cpp index 8229acb1e0..37aea95ad1 100644 --- a/ydb/core/persqueue/mirrorer.cpp +++ b/ydb/core/persqueue/mirrorer.cpp @@ -125,7 +125,7 @@ void TMirrorer::ProcessError(const TActorContext& ctx, const TString& msg) { MirrorerErrors.Inc(1); } - THolder<TEvPersQueue::TEvReportPartitionError> request = MakeHolder<TEvPersQueue::TEvReportPartitionError>(); + THolder<TEvPersQueue::TEvReportPartitionError> request = MakeHolder<TEvPersQueue::TEvReportPartitionError>(); auto& record = request->Record; record.SetTimestamp(ctx.Now().Seconds()); record.SetService(NKikimrServices::PQ_MIRRORER); @@ -311,7 +311,7 @@ void TMirrorer::TryToWrite(const TActorContext& ctx) { return; } - THolder<TEvPersQueue::TEvRequest> request = MakeHolder<TEvPersQueue::TEvRequest>(); + THolder<TEvPersQueue::TEvRequest> request = MakeHolder<TEvPersQueue::TEvRequest>(); auto req = request->Record.MutablePartitionRequest(); req->SetTopic(TopicName); req->SetPartition(Partition); @@ -349,7 +349,7 @@ void TMirrorer::HandleInitCredentials(TEvPQ::TEvInitCredentials::TPtr& /*ev*/, c void TMirrorer::RetryWrite(const TActorContext& ctx) { Y_VERIFY(WriteRequestInFlight); - THolder<TEvPersQueue::TEvRequest> request = MakeHolder<TEvPersQueue::TEvRequest>(); + THolder<TEvPersQueue::TEvRequest> request = MakeHolder<TEvPersQueue::TEvRequest>(); auto req = request->Record.MutablePartitionRequest(); req->CopyFrom(WriteRequestInFlight.value()); diff --git a/ydb/core/persqueue/partition.cpp b/ydb/core/persqueue/partition.cpp index 5d8af6b94c..cc8e2419cf 100644 --- a/ydb/core/persqueue/partition.cpp +++ b/ydb/core/persqueue/partition.cpp @@ -249,7 +249,7 @@ void TPartition::ReplyError(const TActorContext& ctx, const ui64 dst, NPersQueue void TPartition::ReplyOk(const TActorContext& ctx, const ui64 dst) { - THolder<TEvPQ::TEvProxyResponse> response = MakeHolder<TEvPQ::TEvProxyResponse>(dst); + THolder<TEvPQ::TEvProxyResponse> response = MakeHolder<TEvPQ::TEvProxyResponse>(dst); NKikimrClient::TResponse& resp = response->Response; resp.SetStatus(NMsgBusProxy::MSTATUS_OK); resp.SetErrorCode(NPersQueue::NErrorCode::OK); @@ -258,7 +258,7 @@ void TPartition::ReplyOk(const TActorContext& ctx, const ui64 dst) void TPartition::ReplyOwnerOk(const TActorContext& ctx, const ui64 dst, const TString& cookie) { - THolder<TEvPQ::TEvProxyResponse> response = MakeHolder<TEvPQ::TEvProxyResponse>(dst); + THolder<TEvPQ::TEvProxyResponse> response = MakeHolder<TEvPQ::TEvProxyResponse>(dst); NKikimrClient::TResponse& resp = response->Response; resp.SetStatus(NMsgBusProxy::MSTATUS_OK); resp.SetErrorCode(NPersQueue::NErrorCode::OK); @@ -274,7 +274,7 @@ void TPartition::ReplyWrite( Y_VERIFY(offset <= (ui64)Max<i64>(), "Offset is too big: %" PRIu64, offset); Y_VERIFY(seqNo <= (ui64)Max<i64>(), "SeqNo is too big: %" PRIu64, seqNo); - THolder<TEvPQ::TEvProxyResponse> response = MakeHolder<TEvPQ::TEvProxyResponse>(dst); + THolder<TEvPQ::TEvProxyResponse> response = MakeHolder<TEvPQ::TEvProxyResponse>(dst); NKikimrClient::TResponse& resp = response->Response; resp.SetStatus(NMsgBusProxy::MSTATUS_OK); resp.SetErrorCode(NPersQueue::NErrorCode::OK); @@ -301,7 +301,7 @@ void TPartition::ReplyWrite( void TPartition::ReplyGetClientOffsetOk(const TActorContext& ctx, const ui64 dst, const i64 offset, const TInstant writeTimestamp, const TInstant createTimestamp) { - THolder<TEvPQ::TEvProxyResponse> response = MakeHolder<TEvPQ::TEvProxyResponse>(dst); + THolder<TEvPQ::TEvProxyResponse> response = MakeHolder<TEvPQ::TEvProxyResponse>(dst); NKikimrClient::TResponse& resp = response->Response; resp.SetStatus(NMsgBusProxy::MSTATUS_OK); resp.SetErrorCode(NPersQueue::NErrorCode::OK); @@ -1035,7 +1035,7 @@ void TPartition::HandleWakeup(const TActorContext& ctx) { if (ManageWriteTimestampEstimate) WriteTimestampEstimate = now; - THolder <TEvKeyValue::TEvRequest> request = MakeHolder<TEvKeyValue::TEvRequest>(); + THolder <TEvKeyValue::TEvRequest> request = MakeHolder<TEvKeyValue::TEvRequest>(); bool haveChanges = DropOldStuff(request.Get(), false, ctx); if (DiskIsFull) { AddCheckDiskRequest(request.Get(), Config.GetPartitionConfig().GetNumChannels()); @@ -1732,7 +1732,7 @@ void TPartition::ProcessChangeOwnerRequest(TAutoPtr<TEvPQ::TEvChangeOwner> ev, c ProcessReserveRequests(ctx); } else { - it->second.WaitToChangeOwner.push_back(THolder<TEvPQ::TEvChangeOwner>(ev.Release())); + it->second.WaitToChangeOwner.push_back(THolder<TEvPQ::TEvChangeOwner>(ev.Release())); } } @@ -1743,7 +1743,7 @@ THashMap<TString, NKikimr::NPQ::TOwnerInfo>::iterator TPartition::DropOwner(THas UpdateWriteBufferIsFullState(ctx.Now()); Counters.Simple()[COUNTER_PQ_TABLET_RESERVED_BYTES_SIZE].Set(ReservedSize); for (auto& ev : it->second.WaitToChangeOwner) { //this request maybe could be done right now - WaitToChangeOwner.push_back(THolder<TEvPQ::TEvChangeOwner>(ev.Release())); + WaitToChangeOwner.push_back(THolder<TEvPQ::TEvChangeOwner>(ev.Release())); } auto jt = it; ++jt; @@ -2049,7 +2049,7 @@ void TPartition::HandleOnInit(TEvPQ::TEvPartitionStatus::TPtr& ev, const TActorC void TPartition::Handle(TEvPQ::TEvGetPartitionClientInfo::TPtr& ev, const TActorContext& ctx) { - THolder<TEvPersQueue::TEvPartitionClientInfoResponse> response = MakeHolder<TEvPersQueue::TEvPartitionClientInfoResponse>(); + THolder<TEvPersQueue::TEvPartitionClientInfoResponse> response = MakeHolder<TEvPersQueue::TEvPartitionClientInfoResponse>(); NKikimrPQ::TClientInfoResponse& result(response->Record); result.SetPartition(Partition); result.SetStartOffset(StartOffset); @@ -2290,7 +2290,7 @@ TReadAnswer TReadInfo::FormAnswer( const ui64 sizeLag ) { Y_UNUSED(partition); - THolder<TEvPQ::TEvProxyResponse> answer = MakeHolder<TEvPQ::TEvProxyResponse>(cookie); + THolder<TEvPQ::TEvProxyResponse> answer = MakeHolder<TEvPQ::TEvProxyResponse>(cookie); NKikimrClient::TResponse& res = answer->Response; const TEvPQ::TEvBlobResponse* response = &blobResponse; diff --git a/ydb/core/persqueue/pq_impl.cpp b/ydb/core/persqueue/pq_impl.cpp index 9b1fd80e46..9937dbe561 100644 --- a/ydb/core/persqueue/pq_impl.cpp +++ b/ydb/core/persqueue/pq_impl.cpp @@ -353,7 +353,7 @@ private: std::sort(Result.begin(), Result.end(), [](const typename T2::TPartResult& a, const typename T2::TPartResult& b){ return a.GetPartition() < b.GetPartition(); }); - THolder<T3> res = MakeHolder<T3>(); + THolder<T3> res = MakeHolder<T3>(); auto& resp = res->Record; resp.SetTabletId(TabletId); for (const auto& p : Result) { @@ -778,7 +778,7 @@ void TPersQueue::ReadState(const NKikimrClient::TKeyValueResponse::TReadResult& void TPersQueue::ReturnTabletState(const TActorContext& ctx, const TChangeNotification& req, NKikimrProto::EReplyStatus status) { - THolder<TEvPersQueue::TEvDropTabletReply> event = MakeHolder<TEvPersQueue::TEvDropTabletReply>(); + THolder<TEvPersQueue::TEvDropTabletReply> event = MakeHolder<TEvPersQueue::TEvDropTabletReply>(); event->Record.SetStatus(status); event->Record.SetTabletId(TabletID()); event->Record.SetTxId(req.TxId); @@ -1208,7 +1208,7 @@ void TPersQueue::Handle(TEvPersQueue::TEvDropTablet::TPtr& ev, const TActorConte void TPersQueue::Handle(TEvPersQueue::TEvOffsets::TPtr& ev, const TActorContext& ctx) { if (!ConfigInited) { - THolder<TEvPersQueue::TEvOffsetsResponse> res = MakeHolder<TEvPersQueue::TEvOffsetsResponse>(); + THolder<TEvPersQueue::TEvOffsetsResponse> res = MakeHolder<TEvPersQueue::TEvOffsetsResponse>(); auto& resp = res->Record; resp.SetTabletId(TabletID()); @@ -1224,7 +1224,7 @@ void TPersQueue::Handle(TEvPersQueue::TEvOffsets::TPtr& ev, const TActorContext& for (auto& p : Partitions) { if (!p.second.InitDone) continue; - THolder<TEvPQ::TEvPartitionOffsets> event = MakeHolder<TEvPQ::TEvPartitionOffsets>(ans, ev->Get()->Record.HasClientId() ? + THolder<TEvPQ::TEvPartitionOffsets> event = MakeHolder<TEvPQ::TEvPartitionOffsets>(ans, ev->Get()->Record.HasClientId() ? ev->Get()->Record.GetClientId() : ""); ctx.Send(p.second.Actor, event.Release()); } @@ -1251,7 +1251,7 @@ void TPersQueue::Handle(TEvPersQueue::TEvPartitionClientInfo::TPtr& ev, const TA if (it != Partitions.end()) { ctx.Send(it->second.Actor, new TEvPQ::TEvGetPartitionClientInfo(ev->Sender), 0, ev->Cookie); } else { - THolder<TEvPersQueue::TEvPartitionClientInfoResponse> clientInfo = MakeHolder<TEvPersQueue::TEvPartitionClientInfoResponse>(); + THolder<TEvPersQueue::TEvPartitionClientInfoResponse> clientInfo = MakeHolder<TEvPersQueue::TEvPartitionClientInfoResponse>(); clientInfo->Record.SetPartition(partition); ctx.Send(ev->Sender, clientInfo.Release(), 0, ev->Cookie); } @@ -1262,7 +1262,7 @@ void TPersQueue::Handle(TEvPersQueue::TEvPartitionClientInfo::TPtr& ev, const TA void TPersQueue::Handle(TEvPersQueue::TEvStatus::TPtr& ev, const TActorContext& ctx) { if (!ConfigInited) { - THolder<TEvPersQueue::TEvStatusResponse> res = MakeHolder<TEvPersQueue::TEvStatusResponse>(); + THolder<TEvPersQueue::TEvStatusResponse> res = MakeHolder<TEvPersQueue::TEvStatusResponse>(); auto& resp = res->Record; resp.SetTabletId(TabletID()); @@ -1279,7 +1279,7 @@ void TPersQueue::Handle(TEvPersQueue::TEvStatus::TPtr& ev, const TActorContext& for (auto& p : Partitions) { if (!p.second.InitDone) continue; - THolder<TEvPQ::TEvPartitionStatus> event = MakeHolder<TEvPQ::TEvPartitionStatus>(ans, ev->Get()->Record.HasClientId() ? ev->Get()->Record.GetClientId() : ""); + THolder<TEvPQ::TEvPartitionStatus> event = MakeHolder<TEvPQ::TEvPartitionStatus>(ans, ev->Get()->Record.HasClientId() ? ev->Get()->Record.GetClientId() : ""); ctx.Send(p.second.Actor, event.Release()); } } @@ -1303,7 +1303,7 @@ void TPersQueue::HandleGetMaxSeqNoRequest(const ui64 responseCookie, const TActo ids.reserve(cmd.SourceIdSize()); for (ui32 i = 0; i < cmd.SourceIdSize(); ++i) ids.push_back(cmd.GetSourceId(i)); - THolder<TEvPQ::TEvGetMaxSeqNoRequest> event = MakeHolder<TEvPQ::TEvGetMaxSeqNoRequest>(responseCookie, ids); + THolder<TEvPQ::TEvGetMaxSeqNoRequest> event = MakeHolder<TEvPQ::TEvGetMaxSeqNoRequest>(responseCookie, ids); ctx.Send(partActor, event.Release()); } @@ -1321,7 +1321,7 @@ void TPersQueue::HandleDeleteSessionRequest(const ui64 responseCookie, const TAc ReplyError(ctx, responseCookie, NPersQueue::NErrorCode::BAD_REQUEST, TStringBuilder() << "not sessionId in DeleteSession request: " << ToString(req).data()); } else { - THolder<TEvPQ::TEvSetClientInfo> event = MakeHolder<TEvPQ::TEvSetClientInfo>(responseCookie, cmd.GetClientId(), + THolder<TEvPQ::TEvSetClientInfo> event = MakeHolder<TEvPQ::TEvSetClientInfo>(responseCookie, cmd.GetClientId(), 0, cmd.GetSessionId(), 0, 0, TEvPQ::TEvSetClientInfo::ESCI_DROP_SESSION); ctx.Send(partActor, event.Release()); } @@ -1347,7 +1347,7 @@ void TPersQueue::HandleCreateSessionRequest(const ui64 responseCookie, const TAc TStringBuilder() << "not step in CreateSession request: " << ToString(req).data()); } else { InitResponseBuilder(responseCookie, 1, COUNTER_LATENCY_PQ_CREATE_SESSION); - THolder<TEvPQ::TEvSetClientInfo> event = MakeHolder<TEvPQ::TEvSetClientInfo>(responseCookie, cmd.GetClientId(), + THolder<TEvPQ::TEvSetClientInfo> event = MakeHolder<TEvPQ::TEvSetClientInfo>(responseCookie, cmd.GetClientId(), 0, cmd.GetSessionId(), cmd.GetGeneration(), cmd.GetStep(), TEvPQ::TEvSetClientInfo::ESCI_CREATE_SESSION); ctx.Send(partActor, event.Release()); } @@ -1370,7 +1370,7 @@ void TPersQueue::HandleSetClientOffsetRequest(const ui64 responseCookie, const T TStringBuilder() << "negative offset in SetClientOffset request: " << ToString(req).data()); } else { InitResponseBuilder(responseCookie, 1, COUNTER_LATENCY_PQ_SET_OFFSET); - THolder<TEvPQ::TEvSetClientInfo> event = MakeHolder<TEvPQ::TEvSetClientInfo>(responseCookie, cmd.GetClientId(), + THolder<TEvPQ::TEvSetClientInfo> event = MakeHolder<TEvPQ::TEvSetClientInfo>(responseCookie, cmd.GetClientId(), cmd.GetOffset(), cmd.HasSessionId() ? cmd.GetSessionId() : "", 0, 0); ctx.Send(partActor, event.Release()); @@ -1387,7 +1387,7 @@ void TPersQueue::HandleGetClientOffsetRequest(const ui64 responseCookie, const T TStringBuilder() << "no clientId in GetClientOffset request: " << ToString(req).data()); } else { InitResponseBuilder(responseCookie, 1, COUNTER_LATENCY_PQ_GET_OFFSET); - THolder<TEvPQ::TEvGetClientOffset> event = MakeHolder<TEvPQ::TEvGetClientOffset>(responseCookie, cmd.GetClientId()); + THolder<TEvPQ::TEvGetClientOffset> event = MakeHolder<TEvPQ::TEvGetClientOffset>(responseCookie, cmd.GetClientId()); ctx.Send(partActor, event.Release()); } } @@ -1398,7 +1398,7 @@ void TPersQueue::HandleUpdateWriteTimestampRequest(const ui64 responseCookie, co Y_VERIFY(req.HasCmdUpdateWriteTimestamp()); const auto& cmd = req.GetCmdUpdateWriteTimestamp(); InitResponseBuilder(responseCookie, 1, COUNTER_LATENCY_PQ_GET_OFFSET); - THolder<TEvPQ::TEvUpdateWriteTimestamp> event = MakeHolder<TEvPQ::TEvUpdateWriteTimestamp>(responseCookie, cmd.GetWriteTimeMS()); + THolder<TEvPQ::TEvUpdateWriteTimestamp> event = MakeHolder<TEvPQ::TEvUpdateWriteTimestamp>(responseCookie, cmd.GetWriteTimeMS()); ctx.Send(partActor, event.Release()); } @@ -1586,7 +1586,7 @@ void TPersQueue::HandleReserveBytesRequest(const ui64 responseCookie, const TAct } InitResponseBuilder(responseCookie, 1, COUNTER_LATENCY_PQ_RESERVE_BYTES); - THolder<TEvPQ::TEvReserveBytes> event = MakeHolder<TEvPQ::TEvReserveBytes>(responseCookie, req.GetCmdReserveBytes().GetSize(), + THolder<TEvPQ::TEvReserveBytes> event = MakeHolder<TEvPQ::TEvReserveBytes>(responseCookie, req.GetCmdReserveBytes().GetSize(), req.GetOwnerCookie(), req.GetMessageNo(), req.GetCmdReserveBytes().GetLastRequest()); ctx.Send(partActor, event.Release()); } @@ -1615,7 +1615,7 @@ void TPersQueue::HandleGetOwnershipRequest(const ui64 responseCookie, const TAct it->second = {partActor, owner, it->second.ServerActors}; InitResponseBuilder(responseCookie, 1, COUNTER_LATENCY_PQ_GET_OWNERSHIP); - THolder<TEvPQ::TEvChangeOwner> event = MakeHolder<TEvPQ::TEvChangeOwner>(responseCookie, owner, pipeClient, sender, req.GetCmdGetOwnership().GetForce()); + THolder<TEvPQ::TEvChangeOwner> event = MakeHolder<TEvPQ::TEvChangeOwner>(responseCookie, owner, pipeClient, sender, req.GetCmdGetOwnership().GetForce()); ctx.Send(partActor, event.Release()); } @@ -1958,7 +1958,7 @@ void TPersQueue::HandleDie(const TActorContext& ctx) for (const auto& p : ResponseProxy) { - THolder<TEvPQ::TEvError> ev = MakeHolder<TEvPQ::TEvError>(NPersQueue::NErrorCode::INITIALIZING, "tablet will be restarted right now", p.first); + THolder<TEvPQ::TEvError> ev = MakeHolder<TEvPQ::TEvError>(NPersQueue::NErrorCode::INITIALIZING, "tablet will be restarted right now", p.first); bool res = p.second->HandleError(ev.Get(), ctx); Y_VERIFY(res); } diff --git a/ydb/core/persqueue/pq_l2_cache.cpp b/ydb/core/persqueue/pq_l2_cache.cpp index 3c039333c5..e56642c39a 100644 --- a/ydb/core/persqueue/pq_l2_cache.cpp +++ b/ydb/core/persqueue/pq_l2_cache.cpp @@ -25,7 +25,7 @@ void TPersQueueCacheL2::Bootstrap(const TActorContext& ctx) void TPersQueueCacheL2::Handle(TEvPqCache::TEvCacheL2Request::TPtr& ev, const TActorContext& ctx) { - THolder<TCacheL2Request> request(ev->Get()->Data.Release()); + THolder<TCacheL2Request> request(ev->Get()->Data.Release()); TString topicName = request->TopicName; Y_VERIFY(topicName.size(), "PQ L2. Empty topic name in L2"); @@ -52,7 +52,7 @@ void TPersQueueCacheL2::SendResponses(const TActorContext& ctx, const THashMap<T THolder<TCacheL2Response>& resp = responses[evicted->GetOwner()]; if (!resp) { - resp = MakeHolder<TCacheL2Response>(); + resp = MakeHolder<TCacheL2Response>(); resp->TopicName = key.TopicName; } diff --git a/ydb/core/persqueue/read.h b/ydb/core/persqueue/read.h index 687b9b7163..d0bc79c692 100644 --- a/ydb/core/persqueue/read.h +++ b/ydb/core/persqueue/read.h @@ -245,7 +245,7 @@ namespace NPQ { Cache.SaveHeadBlobs(ctx, kvReq); } - THolder<TEvKeyValue::TEvResponse> response = MakeHolder<TEvKeyValue::TEvResponse>(); + THolder<TEvKeyValue::TEvResponse> response = MakeHolder<TEvKeyValue::TEvResponse>(); response->Record = std::move(ev->Get()->Record); response->Record.ClearCookie(); //cookie must not leak to Partition - it uses cookie for SetOffset requests @@ -287,7 +287,7 @@ namespace NPQ { ui64 cookie = SaveKvRequest(std::move(kvReq)); - THolder<TEvKeyValue::TEvRequest> request = MakeHolder<TEvKeyValue::TEvRequest>(); + THolder<TEvKeyValue::TEvRequest> request = MakeHolder<TEvKeyValue::TEvRequest>(); request->Record = std::move(ev->Get()->Record); request->Record.SetCookie(cookie); ctx.Send(Tablet, request.Release()); // -> KV @@ -295,7 +295,7 @@ namespace NPQ { void Handle(TEvPqCache::TEvCacheL2Response::TPtr& ev, const TActorContext& ctx) { - THolder<TCacheL2Response> resp(ev->Get()->Data.Release()); + THolder<TCacheL2Response> resp(ev->Get()->Data.Release()); Y_VERIFY(resp->TopicName == TopicName); for (TCacheBlobL2& blob : resp->Removed) @@ -354,7 +354,7 @@ namespace NPQ { if (now < CountersUpdateTime + TDuration::Seconds(UPDATE_TIMEOUT_S)) return; - THolder<TEvPQ::TEvTabletCacheCounters> event = MakeHolder<TEvPQ::TEvTabletCacheCounters>(); + THolder<TEvPQ::TEvTabletCacheCounters> event = MakeHolder<TEvPQ::TEvTabletCacheCounters>(); event->Counters.CacheSizeBytes = Cache.GetCounters().SizeBytes; event->Counters.CacheSizeBlobs = Cache.GetSize(); event->Counters.CachedOnRead = Cache.GetCounters().CachedOnRead; diff --git a/ydb/core/persqueue/read_balancer.cpp b/ydb/core/persqueue/read_balancer.cpp index f69f08b412..4eb9c7206d 100644 --- a/ydb/core/persqueue/read_balancer.cpp +++ b/ydb/core/persqueue/read_balancer.cpp @@ -303,7 +303,7 @@ void TPersQueueReadBalancer::HandleOnInit(TEvPersQueue::TEvUpdateBalancerConfig: void TPersQueueReadBalancer::Handle(TEvPersQueue::TEvGetPartitionIdForWrite::TPtr &ev, const TActorContext &ctx) { NextPartitionIdForWrite = (NextPartitionIdForWrite + 1) % TotalGroups; //TODO: change here when there will be more than 1 partition in partition_group. - THolder<TEvPersQueue::TEvGetPartitionIdForWriteResponse> response = MakeHolder<TEvPersQueue::TEvGetPartitionIdForWriteResponse>(); + THolder<TEvPersQueue::TEvGetPartitionIdForWriteResponse> response = MakeHolder<TEvPersQueue::TEvGetPartitionIdForWriteResponse>(); response->Record.SetPartitionId(NextPartitionIdForWrite); ctx.Send(ev->Sender, response.Release()); if (NextPartitionIdForWrite == StartPartitionIdForWrite) { // randomize next cycle diff --git a/ydb/core/quoter/quoter_service.cpp b/ydb/core/quoter/quoter_service.cpp index cc1a4f3197..b9a1b629f5 100644 --- a/ydb/core/quoter/quoter_service.cpp +++ b/ydb/core/quoter/quoter_service.cpp @@ -1038,7 +1038,7 @@ void TQuoterService::Handle(TEvQuota::TEvProxyUpdate::TPtr &ev) { } void TQuoterService::Handle(TEvTxProxySchemeCache::TEvNavigateKeySetResult::TPtr &ev) { - THolder<NSchemeCache::TSchemeCacheNavigate> navigate(ev->Get()->Request.Release()); + THolder<NSchemeCache::TSchemeCacheNavigate> navigate(ev->Get()->Request.Release()); Y_VERIFY(navigate->ResultSet.size() == 1); auto &navEntry = navigate->ResultSet.front(); diff --git a/ydb/core/sys_view/common/scan_actor_base_impl.h b/ydb/core/sys_view/common/scan_actor_base_impl.h index 1c121a3fea..298a8efbc0 100644 --- a/ydb/core/sys_view/common/scan_actor_base_impl.h +++ b/ydb/core/sys_view/common/scan_actor_base_impl.h @@ -221,7 +221,7 @@ private: void HandleNavigate(TEvTxProxySchemeCache::TEvNavigateKeySetResult::TPtr& ev) { using TNavigate = NSchemeCache::TSchemeCacheNavigate; - THolder<NSchemeCache::TSchemeCacheNavigate> request(ev->Get()->Request.Release()); + THolder<NSchemeCache::TSchemeCacheNavigate> request(ev->Get()->Request.Release()); Y_VERIFY(request->ResultSet.size() == 1); auto& entry = request->ResultSet.back(); diff --git a/ydb/core/sys_view/nodes/nodes.cpp b/ydb/core/sys_view/nodes/nodes.cpp index d05e027f8a..a2322de9f9 100644 --- a/ydb/core/sys_view/nodes/nodes.cpp +++ b/ydb/core/sys_view/nodes/nodes.cpp @@ -236,7 +236,7 @@ private: THolder<IActor> CreateNodesScan(const TActorId& ownerId, ui32 scanId, const TTableId& tableId, const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns) { - return MakeHolder<TNodesScan>(ownerId, scanId, tableId, tableRange, columns); + return MakeHolder<TNodesScan>(ownerId, scanId, tableId, tableRange, columns); } } // NSysView diff --git a/ydb/core/sys_view/partition_stats/partition_stats.cpp b/ydb/core/sys_view/partition_stats/partition_stats.cpp index f06c5cefd3..d6ea9ff73b 100644 --- a/ydb/core/sys_view/partition_stats/partition_stats.cpp +++ b/ydb/core/sys_view/partition_stats/partition_stats.cpp @@ -308,7 +308,7 @@ private: }; THolder<IActor> CreatePartitionStatsCollector(size_t batchSize, size_t pendingRequestsLimit) { - return MakeHolder<TPartitionStatsCollector>(batchSize, pendingRequestsLimit); + return MakeHolder<TPartitionStatsCollector>(batchSize, pendingRequestsLimit); } class TPartitionStatsScan : public TScanActorBase<TPartitionStatsScan> { @@ -550,7 +550,7 @@ private: THolder<IActor> CreatePartitionStatsScan(const TActorId& ownerId, ui32 scanId, const TTableId& tableId, const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns) { - return MakeHolder<TPartitionStatsScan>(ownerId, scanId, tableId, tableRange, columns); + return MakeHolder<TPartitionStatsScan>(ownerId, scanId, tableId, tableRange, columns); } } // NSysView diff --git a/ydb/core/sys_view/query_stats/query_metrics.cpp b/ydb/core/sys_view/query_stats/query_metrics.cpp index 2b14ff21cf..5f2acb5c23 100644 --- a/ydb/core/sys_view/query_stats/query_metrics.cpp +++ b/ydb/core/sys_view/query_stats/query_metrics.cpp @@ -166,7 +166,7 @@ private: THolder<IActor> CreateQueryMetricsScan(const TActorId& ownerId, ui32 scanId, const TTableId& tableId, const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns) { - return MakeHolder<TQueryMetricsScan>(ownerId, scanId, tableId, tableRange, columns); + return MakeHolder<TQueryMetricsScan>(ownerId, scanId, tableId, tableRange, columns); } } // NSysView diff --git a/ydb/core/sys_view/query_stats/query_stats.cpp b/ydb/core/sys_view/query_stats/query_stats.cpp index 7af70aa547..918c9b781e 100644 --- a/ydb/core/sys_view/query_stats/query_stats.cpp +++ b/ydb/core/sys_view/query_stats/query_stats.cpp @@ -510,32 +510,32 @@ THolder<IActor> CreateQueryStatsScan(const TActorId& ownerId, ui32 scanId, const const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns) { if (viewName == TopQueriesByDuration1MinuteName) { - return MakeHolder<TQueryStatsScan<TDurationGreater>>(ownerId, scanId, tableId, tableRange, columns, + return MakeHolder<TQueryStatsScan<TDurationGreater>>(ownerId, scanId, tableId, tableRange, columns, NKikimrSysView::TOP_DURATION_ONE_MINUTE, ONE_MINUTE_BUCKET_COUNT, ONE_MINUTE_BUCKET_SIZE); } else if (viewName == TopQueriesByDuration1HourName) { - return MakeHolder<TQueryStatsScan<TDurationGreater>>(ownerId, scanId, tableId, tableRange, columns, + return MakeHolder<TQueryStatsScan<TDurationGreater>>(ownerId, scanId, tableId, tableRange, columns, NKikimrSysView::TOP_DURATION_ONE_HOUR, ONE_HOUR_BUCKET_COUNT, ONE_HOUR_BUCKET_SIZE); } else if (viewName == TopQueriesByReadBytes1MinuteName) { - return MakeHolder<TQueryStatsScan<TReadBytesGreater>>(ownerId, scanId, tableId, tableRange, columns, + return MakeHolder<TQueryStatsScan<TReadBytesGreater>>(ownerId, scanId, tableId, tableRange, columns, NKikimrSysView::TOP_READ_BYTES_ONE_MINUTE, ONE_MINUTE_BUCKET_COUNT, ONE_MINUTE_BUCKET_SIZE); } else if (viewName == TopQueriesByReadBytes1HourName) { - return MakeHolder<TQueryStatsScan<TReadBytesGreater>>(ownerId, scanId, tableId, tableRange, columns, + return MakeHolder<TQueryStatsScan<TReadBytesGreater>>(ownerId, scanId, tableId, tableRange, columns, NKikimrSysView::TOP_READ_BYTES_ONE_HOUR, ONE_HOUR_BUCKET_COUNT, ONE_HOUR_BUCKET_SIZE); } else if (viewName == TopQueriesByCpuTime1MinuteName) { - return MakeHolder<TQueryStatsScan<TCpuTimeGreater>>(ownerId, scanId, tableId, tableRange, columns, + return MakeHolder<TQueryStatsScan<TCpuTimeGreater>>(ownerId, scanId, tableId, tableRange, columns, NKikimrSysView::TOP_CPU_TIME_ONE_MINUTE, ONE_MINUTE_BUCKET_COUNT, ONE_MINUTE_BUCKET_SIZE); } else if (viewName == TopQueriesByCpuTime1HourName) { - return MakeHolder<TQueryStatsScan<TCpuTimeGreater>>(ownerId, scanId, tableId, tableRange, columns, + return MakeHolder<TQueryStatsScan<TCpuTimeGreater>>(ownerId, scanId, tableId, tableRange, columns, NKikimrSysView::TOP_CPU_TIME_ONE_HOUR, ONE_HOUR_BUCKET_COUNT, ONE_HOUR_BUCKET_SIZE); } else if (viewName == TopQueriesByRequestUnits1MinuteName) { diff --git a/ydb/core/sys_view/storage/groups.cpp b/ydb/core/sys_view/storage/groups.cpp index 948fc0e5e9..dabd46f9dc 100644 --- a/ydb/core/sys_view/storage/groups.cpp +++ b/ydb/core/sys_view/storage/groups.cpp @@ -44,7 +44,7 @@ public: THolder<IActor> CreateGroupsScan(const TActorId& ownerId, ui32 scanId, const TTableId& tableId, const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns) { - return MakeHolder<TGroupsScan>(ownerId, scanId, tableId, tableRange, columns); + return MakeHolder<TGroupsScan>(ownerId, scanId, tableId, tableRange, columns); } } // NKikimr::NSysView diff --git a/ydb/core/sys_view/storage/pdisks.cpp b/ydb/core/sys_view/storage/pdisks.cpp index 586693bb0f..47f84ae9aa 100644 --- a/ydb/core/sys_view/storage/pdisks.cpp +++ b/ydb/core/sys_view/storage/pdisks.cpp @@ -47,7 +47,7 @@ public: THolder<IActor> CreatePDisksScan(const TActorId& ownerId, ui32 scanId, const TTableId& tableId, const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns) { - return MakeHolder<TPDisksScan>(ownerId, scanId, tableId, tableRange, columns); + return MakeHolder<TPDisksScan>(ownerId, scanId, tableId, tableRange, columns); } } // NKikimr::NSysView diff --git a/ydb/core/sys_view/storage/storage_pools.cpp b/ydb/core/sys_view/storage/storage_pools.cpp index 8b38c086e4..66896a6999 100644 --- a/ydb/core/sys_view/storage/storage_pools.cpp +++ b/ydb/core/sys_view/storage/storage_pools.cpp @@ -43,7 +43,7 @@ public: THolder<IActor> CreateStoragePoolsScan(const TActorId& ownerId, ui32 scanId, const TTableId& tableId, const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns) { - return MakeHolder<TStoragePoolsScan>(ownerId, scanId, tableId, tableRange, columns); + return MakeHolder<TStoragePoolsScan>(ownerId, scanId, tableId, tableRange, columns); } } // NKikimr::NSysView diff --git a/ydb/core/sys_view/storage/vslots.cpp b/ydb/core/sys_view/storage/vslots.cpp index 382d214a27..987eb2750d 100644 --- a/ydb/core/sys_view/storage/vslots.cpp +++ b/ydb/core/sys_view/storage/vslots.cpp @@ -45,7 +45,7 @@ public: THolder<IActor> CreateVSlotsScan(const TActorId& ownerId, ui32 scanId, const TTableId& tableId, const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns) { - return MakeHolder<TVSlotsScan>(ownerId, scanId, tableId, tableRange, columns); + return MakeHolder<TVSlotsScan>(ownerId, scanId, tableId, tableRange, columns); } } // NKikimr::NSysView diff --git a/ydb/core/sys_view/tablets/tablets.cpp b/ydb/core/sys_view/tablets/tablets.cpp index c6d2ce9012..88627748d8 100644 --- a/ydb/core/sys_view/tablets/tablets.cpp +++ b/ydb/core/sys_view/tablets/tablets.cpp @@ -360,7 +360,7 @@ private: THolder<IActor> CreateTabletsScan(const TActorId& ownerId, ui32 scanId, const TTableId& tableId, const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns) { - return MakeHolder<TTabletsScan>(ownerId, scanId, tableId, tableRange, columns); + return MakeHolder<TTabletsScan>(ownerId, scanId, tableId, tableRange, columns); } } // NKikimr::NSysView diff --git a/ydb/core/tablet/node_whiteboard.cpp b/ydb/core/tablet/node_whiteboard.cpp index 6dee3d1d9c..783758e99d 100644 --- a/ydb/core/tablet/node_whiteboard.cpp +++ b/ydb/core/tablet/node_whiteboard.cpp @@ -38,7 +38,7 @@ public: void Bootstrap(const TActorContext &ctx) { TIntrusivePtr<NMonitoring::TDynamicCounters> tabletsGroup = GetServiceCounters(AppData(ctx)->Counters, "tablets"); TIntrusivePtr<NMonitoring::TDynamicCounters> introspectionGroup = tabletsGroup->GetSubgroup("type", "introspection"); - TabletIntrospectionData.Reset(NTracing::CreateTraceCollection(introspectionGroup)); + TabletIntrospectionData.Reset(NTracing::CreateTraceCollection(introspectionGroup)); SystemStateInfo.SetNumberOfCpus(NSystemInfo::NumberOfCpus()); TString branch = GetTag(); @@ -705,7 +705,7 @@ protected: } void Handle(TEvWhiteboard::TEvTabletLookupRequest::TPtr &ev, const TActorContext &ctx) { - THolder<TEvWhiteboard::TEvTabletLookupResponse> response = MakeHolder<TEvWhiteboard::TEvTabletLookupResponse>(); + THolder<TEvWhiteboard::TEvTabletLookupResponse> response = MakeHolder<TEvWhiteboard::TEvTabletLookupResponse>(); auto& record = response->Record; TVector<ui64> tabletIDs; TabletIntrospectionData->GetTabletIDs(tabletIDs); @@ -717,7 +717,7 @@ protected: void Handle(TEvWhiteboard::TEvTraceLookupRequest::TPtr &ev, const TActorContext &ctx) { ui64 tabletID = ev->Get()->Record.GetTabletID(); - THolder<TEvWhiteboard::TEvTraceLookupResponse> response = MakeHolder<TEvWhiteboard::TEvTraceLookupResponse>(); + THolder<TEvWhiteboard::TEvTraceLookupResponse> response = MakeHolder<TEvWhiteboard::TEvTraceLookupResponse>(); auto& record = response->Record; TVector<NTracing::TTraceID> tabletTraces; TabletIntrospectionData->GetTraces(tabletID, tabletTraces); @@ -732,7 +732,7 @@ protected: ui64 tabletID = requestRecord.GetTabletID(); NTracing::TTraceID traceID = NTracing::TraceIDFromTraceID(requestRecord.GetTraceID()); - THolder<TEvWhiteboard::TEvTraceResponse> response = MakeHolder<TEvWhiteboard::TEvTraceResponse>(); + THolder<TEvWhiteboard::TEvTraceResponse> response = MakeHolder<TEvWhiteboard::TEvTraceResponse>(); auto& responseRecord = response->Record; auto trace = TabletIntrospectionData->GetTrace(tabletID, traceID); NTracing::TTraceInfo traceInfo = { @@ -760,7 +760,7 @@ protected: NTracing::TTraceID traceID = NTracing::TraceIDFromTraceID(requestRecord.GetTraceID()); TString signalID = requestRecord.GetSignalID(); - THolder<TEvWhiteboard::TEvSignalBodyResponse> response = MakeHolder<TEvWhiteboard::TEvSignalBodyResponse>(); + THolder<TEvWhiteboard::TEvSignalBodyResponse> response = MakeHolder<TEvWhiteboard::TEvSignalBodyResponse>(); auto& responseRecord = response->Record; auto trace = TabletIntrospectionData->GetTrace(tabletID, traceID); TStringStream str; @@ -786,7 +786,7 @@ protected: } void Handle(TEvPrivate::TEvUpdateRuntimeStats::TPtr &, const TActorContext &ctx) { - THolder<TEvWhiteboard::TEvSystemStateUpdate> systemStatsUpdate = MakeHolder<TEvWhiteboard::TEvSystemStateUpdate>(); + THolder<TEvWhiteboard::TEvSystemStateUpdate> systemStatsUpdate = MakeHolder<TEvWhiteboard::TEvSystemStateUpdate>(); TVector<double> loadAverage = GetLoadAverage(); for (double d : loadAverage) { systemStatsUpdate->Record.AddLoadAverage(d); diff --git a/ydb/core/tablet/tablet_counters.h b/ydb/core/tablet/tablet_counters.h index d55759f0f5..a8cc27e9ed 100644 --- a/ydb/core/tablet/tablet_counters.h +++ b/ydb/core/tablet/tablet_counters.h @@ -249,7 +249,7 @@ public: Y_VERIFY_DEBUG(IsSorted()); - Values = TArrayHolder<ui64>(new ui64[RangeCount]()); + Values = TArrayHolder<ui64>(new ui64[RangeCount]()); } void Clear() { diff --git a/ydb/core/tablet/tablet_counters_aggregator_ut.cpp b/ydb/core/tablet/tablet_counters_aggregator_ut.cpp index 49809918c1..707ffb977e 100644 --- a/ydb/core/tablet/tablet_counters_aggregator_ut.cpp +++ b/ydb/core/tablet/tablet_counters_aggregator_ut.cpp @@ -43,7 +43,7 @@ void TestHeavy(const ui32 v, ui32 numWorkers) { options.FinalEvents.emplace_back(TEvents::TSystem::Bootstrap, numWorkers); runtime.DispatchEvents(options); for (const auto& a : cc) { - THolder<TEvInterconnect::TEvNodesInfo> nodesInfo = MakeHolder<TEvInterconnect::TEvNodesInfo>(); + THolder<TEvInterconnect::TEvNodesInfo> nodesInfo = MakeHolder<TEvInterconnect::TEvNodesInfo>(); for (auto i = 1; i <= NODES; ++i) { nodesInfo->Nodes.emplace_back(TEvInterconnect::TNodeInfo(i, "::", "localhost", "localhost", 1234, TNodeLocation())); } @@ -51,7 +51,7 @@ void TestHeavy(const ui32 v, ui32 numWorkers) { } for (auto i = 1; i <= NODES; ++i) { - THolder<TEvTabletCounters::TEvTabletLabeledCountersResponse> response = MakeHolder<TEvTabletCounters::TEvTabletLabeledCountersResponse>(); + THolder<TEvTabletCounters::TEvTabletLabeledCountersResponse> response = MakeHolder<TEvTabletCounters::TEvTabletLabeledCountersResponse>(); for (auto k = 0; k < GROUPS; ++k) { char delim = (k % 2 == 0) ? '/' : '|'; auto& group1 = *response->Record.AddLabeledCountersByGroup(); @@ -109,7 +109,7 @@ Y_UNIT_TEST_SUITE(TTabletCountersAggregator) { options.FinalEvents.emplace_back(TEvents::TSystem::Bootstrap, 1); runtime.DispatchEvents(options); for (const auto& a : cc) { - THolder<TEvInterconnect::TEvNodesInfo> nodesInfo = MakeHolder<TEvInterconnect::TEvNodesInfo>(); + THolder<TEvInterconnect::TEvNodesInfo> nodesInfo = MakeHolder<TEvInterconnect::TEvNodesInfo>(); nodesInfo->Nodes.emplace_back(TEvInterconnect::TNodeInfo(1, "::", "localhost", "localhost", 1234, TNodeLocation())); nodesInfo->Nodes.emplace_back(TEvInterconnect::TNodeInfo(2, "::", "localhost", "localhost", 1234, TNodeLocation())); nodesInfo->Nodes.emplace_back(TEvInterconnect::TNodeInfo(3, "::", "localhost", "localhost", 1234, TNodeLocation())); @@ -117,7 +117,7 @@ Y_UNIT_TEST_SUITE(TTabletCountersAggregator) { } { - THolder<TEvTabletCounters::TEvTabletLabeledCountersResponse> response = MakeHolder<TEvTabletCounters::TEvTabletLabeledCountersResponse>(); + THolder<TEvTabletCounters::TEvTabletLabeledCountersResponse> response = MakeHolder<TEvTabletCounters::TEvTabletLabeledCountersResponse>(); auto& group1 = *response->Record.AddLabeledCountersByGroup(); group1.SetGroup("group1|group2"); group1.SetGroupNames("AAA|BBB"); @@ -131,7 +131,7 @@ Y_UNIT_TEST_SUITE(TTabletCountersAggregator) { } { - THolder<TEvTabletCounters::TEvTabletLabeledCountersResponse> response = MakeHolder<TEvTabletCounters::TEvTabletLabeledCountersResponse>(); + THolder<TEvTabletCounters::TEvTabletLabeledCountersResponse> response = MakeHolder<TEvTabletCounters::TEvTabletLabeledCountersResponse>(); response->Record.AddCounterNames("value1"); auto& group1 = *response->Record.AddLabeledCountersByGroup(); group1.SetGroup("group1|group2"); @@ -146,7 +146,7 @@ Y_UNIT_TEST_SUITE(TTabletCountersAggregator) { } { - THolder<TEvTabletCounters::TEvTabletLabeledCountersResponse> response = MakeHolder<TEvTabletCounters::TEvTabletLabeledCountersResponse>(); + THolder<TEvTabletCounters::TEvTabletLabeledCountersResponse> response = MakeHolder<TEvTabletCounters::TEvTabletLabeledCountersResponse>(); response->Record.AddCounterNames("value1"); auto& group1 = *response->Record.AddLabeledCountersByGroup(); group1.SetGroup("group1|group2"); @@ -207,7 +207,7 @@ Y_UNIT_TEST_SUITE(TTabletCountersAggregator) { options.FinalEvents.emplace_back(TEvents::TSystem::Bootstrap, 1); runtime.DispatchEvents(options); for (const auto& a : cc) { - THolder<TEvInterconnect::TEvNodesInfo> nodesInfo = MakeHolder<TEvInterconnect::TEvNodesInfo>(); + THolder<TEvInterconnect::TEvNodesInfo> nodesInfo = MakeHolder<TEvInterconnect::TEvNodesInfo>(); nodesInfo->Nodes.emplace_back(TEvInterconnect::TNodeInfo(1, "::", "localhost", "localhost", 1234, TNodeLocation())); nodesInfo->Nodes.emplace_back(TEvInterconnect::TNodeInfo(2, "::", "localhost", "localhost", 1234, TNodeLocation())); nodesInfo->Nodes.emplace_back(TEvInterconnect::TNodeInfo(3, "::", "localhost", "localhost", 1234, TNodeLocation())); @@ -215,7 +215,7 @@ Y_UNIT_TEST_SUITE(TTabletCountersAggregator) { } { - THolder<TEvTabletCounters::TEvTabletLabeledCountersResponse> response = MakeHolder<TEvTabletCounters::TEvTabletLabeledCountersResponse>(); + THolder<TEvTabletCounters::TEvTabletLabeledCountersResponse> response = MakeHolder<TEvTabletCounters::TEvTabletLabeledCountersResponse>(); auto& group1 = *response->Record.AddLabeledCountersByGroup(); group1.SetGroup("rt3.man--aba@caba--daba"); group1.SetGroupNames("topic"); @@ -229,7 +229,7 @@ Y_UNIT_TEST_SUITE(TTabletCountersAggregator) { } { - THolder<TEvTabletCounters::TEvTabletLabeledCountersResponse> response = MakeHolder<TEvTabletCounters::TEvTabletLabeledCountersResponse>(); + THolder<TEvTabletCounters::TEvTabletLabeledCountersResponse> response = MakeHolder<TEvTabletCounters::TEvTabletLabeledCountersResponse>(); response->Record.AddCounterNames("value1"); auto& group1 = *response->Record.AddLabeledCountersByGroup(); group1.SetGroup("cons@aaa/1/rt3.man--aba@caba--daba"); diff --git a/ydb/core/tablet/tablet_req_rebuildhistory.cpp b/ydb/core/tablet/tablet_req_rebuildhistory.cpp index 787cf1e80a..c0b4c0c2bc 100644 --- a/ydb/core/tablet/tablet_req_rebuildhistory.cpp +++ b/ydb/core/tablet/tablet_req_rebuildhistory.cpp @@ -221,7 +221,7 @@ class TTabletReqRebuildHistoryGraph : public TActorBootstrapped<TTabletReqRebuil BLOG_D("TTabletReqRebuildHistoryGraph::ProcessZeroEntry - generation " << gen); if (IntrospectionTrace) { - IntrospectionTrace->Attach(MakeHolder<NTracing::TOnProcessZeroEntry>(gen, Snapshot, Confirmed)); + IntrospectionTrace->Attach(MakeHolder<NTracing::TOnProcessZeroEntry>(gen, Snapshot, Confirmed)); } Y_VERIFY(logEntry.HasZeroConfirmed() && logEntry.HasZeroTailSz()); @@ -256,7 +256,7 @@ class TTabletReqRebuildHistoryGraph : public TActorBootstrapped<TTabletReqRebuil BLOG_CRIT("snapshot overrun in gen " << gen << " zero entry, declared prev gen " << prevGeneration << " while known snapshot is " << Snapshot.first << ":" << Snapshot.second); if (IntrospectionTrace) - IntrospectionTrace->Attach(MakeHolder<NTracing::TErrorRebuildGraph>(gen, 0)); + IntrospectionTrace->Attach(MakeHolder<NTracing::TErrorRebuildGraph>(gen, 0)); return false; } @@ -327,7 +327,7 @@ class TTabletReqRebuildHistoryGraph : public TActorBootstrapped<TTabletReqRebuil void ProcessLogEntry(const TLogoBlobID &id, NKikimrTabletBase::TTabletLogEntry &logEntry) { if (IntrospectionTrace) { - IntrospectionTrace->Attach(MakeHolder<NTracing::TOnProcessLogEntry>(id, Snapshot, Confirmed, logEntry)); + IntrospectionTrace->Attach(MakeHolder<NTracing::TOnProcessLogEntry>(id, Snapshot, Confirmed, logEntry)); } Y_VERIFY(logEntry.HasSnapshot() && logEntry.HasConfirmed()); @@ -381,7 +381,7 @@ class TTabletReqRebuildHistoryGraph : public TActorBootstrapped<TTabletReqRebuil SendToBSProxy(SelfId(), group, new TEvBlobStorage::TEvRange(tabletId, fromId, toId, mustRestoreFirst, TInstant::Max(), false, BlockedGen)); RangesToDiscover.insert(toId); if (IntrospectionTrace) { - IntrospectionTrace->Attach(MakeHolder<NTracing::TOnDiscoverRangeRequest>(group, fromId, toId)); + IntrospectionTrace->Attach(MakeHolder<NTracing::TOnDiscoverRangeRequest>(group, fromId, toId)); } if (lastGen) @@ -396,7 +396,7 @@ class TTabletReqRebuildHistoryGraph : public TActorBootstrapped<TTabletReqRebuil if (!logEntry.ParseFromString(logBody)) { BLOG_ERROR("TTabletReqRebuildHistoryGraph::ProcessKeyEntry logBody ParseFromString error, id# " << id); if (IntrospectionTrace) { - IntrospectionTrace->Attach(MakeHolder<NTracing::TErrorParsingFromString>(id)); + IntrospectionTrace->Attach(MakeHolder<NTracing::TErrorParsingFromString>(id)); } return ReplyAndDie(NKikimrProto::ERROR, "Log entry parse failed"); } @@ -447,7 +447,7 @@ class TTabletReqRebuildHistoryGraph : public TActorBootstrapped<TTabletReqRebuil void ApplyDiscoveryRange(TEvBlobStorage::TEvRangeResult *msg) { if (IntrospectionTrace) { - IntrospectionTrace->Attach(MakeHolder<NTracing::TOnApplyDiscoveryRange>(msg->GroupId, msg->From, msg->To)); + IntrospectionTrace->Attach(MakeHolder<NTracing::TOnApplyDiscoveryRange>(msg->GroupId, msg->From, msg->To)); } Y_VERIFY(RangesToDiscover.erase(msg->To)); for (TVector<TEvBlobStorage::TEvRangeResult::TResponse>::iterator it = msg->Responses.begin(), end = msg->Responses.end(); it != end; ++it) { @@ -478,7 +478,7 @@ class TTabletReqRebuildHistoryGraph : public TActorBootstrapped<TTabletReqRebuil ScanRefsToCheck(); if (IntrospectionTrace) { - IntrospectionTrace->Attach(MakeHolder<NTracing::TOnMakeHistory>(RefsToCheck)); + IntrospectionTrace->Attach(MakeHolder<NTracing::TOnMakeHistory>(RefsToCheck)); } if (RefsToCheckByGroup.empty()) return BuildHistory(); @@ -487,7 +487,7 @@ class TTabletReqRebuildHistoryGraph : public TActorBootstrapped<TTabletReqRebuil if (!SendRefsCheck(xpair.second, xpair.first)) { BLOG_ERROR("TTabletReqRebuildHistoryGraph::MakeHistory SendRefsCheck A error"); if (IntrospectionTrace) { - IntrospectionTrace->Attach(MakeHolder<NTracing::TErrorSendRefsCheck>()); + IntrospectionTrace->Attach(MakeHolder<NTracing::TErrorSendRefsCheck>()); } return ReplyAndDie(NKikimrProto::ERROR, "SendRefsCheck failed"); } @@ -568,7 +568,7 @@ class TTabletReqRebuildHistoryGraph : public TActorBootstrapped<TTabletReqRebuil void CheckReferences(TEvBlobStorage::TEvGetResult *msg) { if (IntrospectionTrace) { - IntrospectionTrace->Attach(MakeHolder<NTracing::TOnCheckRefsGetResult>(msg->ResponseSz)); + IntrospectionTrace->Attach(MakeHolder<NTracing::TOnCheckRefsGetResult>(msg->ResponseSz)); } Y_VERIFY_DEBUG(msg->Status == NKikimrProto::OK); @@ -587,7 +587,7 @@ class TTabletReqRebuildHistoryGraph : public TActorBootstrapped<TTabletReqRebuil BLOG_ERROR("TTabletReqRebuildHistoryGraph::CheckReferences - blob " << response.Id << " Status# " << NKikimrProto::EReplyStatus_Name(response.Status)); if (IntrospectionTrace) { - IntrospectionTrace->Attach(MakeHolder<NTracing::TErrorUnknownStatus>(response.Status, msg->ErrorReason)); + IntrospectionTrace->Attach(MakeHolder<NTracing::TErrorUnknownStatus>(response.Status, msg->ErrorReason)); } return ReplyAndDie(NKikimrProto::ERROR, msg->ErrorReason); } @@ -762,13 +762,13 @@ class TTabletReqRebuildHistoryGraph : public TActorBootstrapped<TTabletReqRebuil return (TString)sb; }()); if (IntrospectionTrace) { - IntrospectionTrace->Attach(MakeHolder<NTracing::TErrorRebuildGraph>(invalidLogEntry.first, invalidLogEntry.second)); + IntrospectionTrace->Attach(MakeHolder<NTracing::TErrorRebuildGraph>(invalidLogEntry.first, invalidLogEntry.second)); } return ReplyAndDie(NKikimrProto::ERROR, "Graph has missing log entries"); } if (IntrospectionTrace) { - IntrospectionTrace->Attach(MakeHolder<NTracing::TOnBuildHistoryGraph>(graph.Get())); + IntrospectionTrace->Attach(MakeHolder<NTracing::TOnBuildHistoryGraph>(graph.Get())); } Send(Owner, new TEvTabletBase::TEvRebuildGraphResult( @@ -794,13 +794,13 @@ class TTabletReqRebuildHistoryGraph : public TActorBootstrapped<TTabletReqRebuil BLOG_ERROR("TTabletReqRebuildHistoryGraph - Found entry beyond blocked generation" << " LastBlobID: " << msg->Latest.ToString() << ". Blocked: " << BlockedGen); if (IntrospectionTrace) { - IntrospectionTrace->Attach(MakeHolder<NTracing::TErrorEntryBeyondBlocked>(msg->Latest, BlockedGen)); + IntrospectionTrace->Attach(MakeHolder<NTracing::TErrorEntryBeyondBlocked>(msg->Latest, BlockedGen)); } return ReplyAndDie(NKikimrProto::ERROR, "Found entry beyond blocked generation"); } if (IntrospectionTrace) { - IntrospectionTrace->Attach(MakeHolder<NTracing::TOnProcessKeyEntry>(msg->Latest)); + IntrospectionTrace->Attach(MakeHolder<NTracing::TOnProcessKeyEntry>(msg->Latest)); } return ProcessKeyEntry(msg->Latest, msg->Buffer); @@ -811,7 +811,7 @@ class TTabletReqRebuildHistoryGraph : public TActorBootstrapped<TTabletReqRebuil BLOG_ERROR("TTabletReqRebuildHistoryGraph::Handle TEvFindLatestLogEntryResult" << " Status# " << NKikimrProto::EReplyStatus_Name(msg->Status)); if (IntrospectionTrace) { - IntrospectionTrace->Attach(MakeHolder<NTracing::TErrorUnknownStatus>(msg->Status, msg->ErrorReason)); + IntrospectionTrace->Attach(MakeHolder<NTracing::TErrorUnknownStatus>(msg->Status, msg->ErrorReason)); } return ReplyAndDie(NKikimrProto::ERROR, msg->ErrorReason); } @@ -831,7 +831,7 @@ class TTabletReqRebuildHistoryGraph : public TActorBootstrapped<TTabletReqRebuil << " Status# " << NKikimrProto::EReplyStatus_Name(msg->Status) << " Result# " << msg->Print(false)); if (IntrospectionTrace) { - IntrospectionTrace->Attach(MakeHolder<NTracing::TErrorUnknownStatus>(msg->Status, msg->ErrorReason)); + IntrospectionTrace->Attach(MakeHolder<NTracing::TErrorUnknownStatus>(msg->Status, msg->ErrorReason)); } return ReplyAndDie(NKikimrProto::ERROR, msg->ErrorReason); } @@ -855,7 +855,7 @@ class TTabletReqRebuildHistoryGraph : public TActorBootstrapped<TTabletReqRebuil << " Status# " << NKikimrProto::EReplyStatus_Name(msg->Status) << " Result# " << msg->Print(false)); if (IntrospectionTrace) { - IntrospectionTrace->Attach(MakeHolder<NTracing::TErrorUnknownStatus>(msg->Status, msg->ErrorReason)); + IntrospectionTrace->Attach(MakeHolder<NTracing::TErrorUnknownStatus>(msg->Status, msg->ErrorReason)); } return ReplyAndDie(NKikimrProto::ERROR, msg->ErrorReason); } @@ -877,7 +877,7 @@ public: void Bootstrap() { if (IntrospectionTrace) { - IntrospectionTrace->Attach(MakeHolder<NTracing::TRebuildGraphBootstrap>(BlockedGen)); + IntrospectionTrace->Attach(MakeHolder<NTracing::TRebuildGraphBootstrap>(BlockedGen)); } if (FollowerCookie == 0) diff --git a/ydb/core/tablet/tablet_req_writelog.cpp b/ydb/core/tablet/tablet_req_writelog.cpp index 3b66e03810..7c4d02c405 100644 --- a/ydb/core/tablet/tablet_req_writelog.cpp +++ b/ydb/core/tablet/tablet_req_writelog.cpp @@ -96,7 +96,7 @@ class TTabletReqWriteLog : public TActorBootstrapped<TTabletReqWriteLog> { ui64 cookie = RandomNumber<ui64>(); RequestCookies ^= cookie; - SendPutToGroup(ctx, x->GroupID, Info.Get(), MakeHolder<TEvBlobStorage::TEvPut>(id, buffer, TInstant::Max(), handleClass, CommitTactic), cookie); + SendPutToGroup(ctx, x->GroupID, Info.Get(), MakeHolder<TEvBlobStorage::TEvPut>(id, buffer, TInstant::Max(), handleClass, CommitTactic), cookie); } public: diff --git a/ydb/core/tablet/tablet_sys.cpp b/ydb/core/tablet/tablet_sys.cpp index 7bc0049896..44bfac7b2d 100644 --- a/ydb/core/tablet/tablet_sys.cpp +++ b/ydb/core/tablet/tablet_sys.cpp @@ -77,7 +77,7 @@ void TTablet::PromoteToCandidate(ui32 gen) { if (!UserTablet) UserTablet = SetupInfo->Apply(Info.Get(), SelfId()); if (IntrospectionTrace) { - IntrospectionTrace->Attach(MakeHolder<NTracing::TOnPromoteToCandidate>(StateStorageInfo.KnownGeneration)); + IntrospectionTrace->Attach(MakeHolder<NTracing::TOnPromoteToCandidate>(StateStorageInfo.KnownGeneration)); } // todo: handle 'proxy not found' case @@ -94,7 +94,7 @@ void TTablet::TabletBlockBlobStorage() { TActorId newActorId = Register(x); if (IntrospectionTrace) { - IntrospectionTrace->Attach(MakeHolder<NTracing::TOnTabletBlockBlobStorage>(newActorId, StateStorageInfo.KnownGeneration)); + IntrospectionTrace->Attach(MakeHolder<NTracing::TOnTabletBlockBlobStorage>(newActorId, StateStorageInfo.KnownGeneration)); } Become(&TThis::StateBlockBlobStorage); @@ -105,7 +105,7 @@ void TTablet::TabletRebuildGraph() { THolder<NTracing::ITrace> newTrace; NTracing::TTraceID rebuildGraphTraceID; if (IntrospectionTrace) { - newTrace = THolder<NTracing::ITrace>(IntrospectionTrace->CreateTrace(NTracing::ITrace::TypeReqRebuildHistoryGraph)); + newTrace = THolder<NTracing::ITrace>(IntrospectionTrace->CreateTrace(NTracing::ITrace::TypeReqRebuildHistoryGraph)); rebuildGraphTraceID = newTrace->GetSelfID(); } @@ -114,7 +114,7 @@ void TTablet::TabletRebuildGraph() { ); if (IntrospectionTrace) { - IntrospectionTrace->Attach(MakeHolder<NTracing::TOnTabletRebuildGraph>(RebuildGraphRequest, rebuildGraphTraceID)); + IntrospectionTrace->Attach(MakeHolder<NTracing::TOnTabletRebuildGraph>(RebuildGraphRequest, rebuildGraphTraceID)); } Become(&TThis::StateRebuildGraph); @@ -169,7 +169,7 @@ void TTablet::WriteZeroEntry(TEvTablet::TDependencyGraph *graph) { } if (IntrospectionTrace) { - IntrospectionTrace->Attach(MakeHolder<NTracing::TOnWriteZeroEntry>(snapshot, lastGeneration, confirmedStep, lastInGeneration)); + IntrospectionTrace->Attach(MakeHolder<NTracing::TOnWriteZeroEntry>(snapshot, lastGeneration, confirmedStep, lastInGeneration)); } // fill tail bitmask (beyond continuous confirmed range) (if any present) @@ -780,7 +780,7 @@ void TTablet::HandleStateStorageInfoResolve(TEvStateStorage::TEvInfo::TPtr &ev) if (IntrospectionTrace) { IntrospectionTrace->Attach( - MakeHolder<NTracing::TOnHandleStateStorageInfoResolve>( + MakeHolder<NTracing::TOnHandleStateStorageInfoResolve>( StateStorageInfo.KnownGeneration , StateStorageInfo.KnownStep , StateStorageInfo.SignatureSz)); @@ -833,7 +833,7 @@ void TTablet::HandleStateStorageInfoLock(TEvStateStorage::TEvInfo::TPtr &ev) { StateStorageInfo.Update(msg); if (IntrospectionTrace) { - IntrospectionTrace->Attach(MakeHolder<NTracing::TOnHandleStateStorageInfoLock>( + IntrospectionTrace->Attach(MakeHolder<NTracing::TOnHandleStateStorageInfoLock>( StateStorageInfo.KnownGeneration , StateStorageInfo.KnownStep , StateStorageInfo.SignatureSz)); @@ -943,7 +943,7 @@ void TTablet::HandleRebuildGraphResult(TEvTabletBase::TEvRebuildGraphResult::TPt TEvTabletBase::TEvRebuildGraphResult *msg = ev->Get(); if (IntrospectionTrace) { - IntrospectionTrace->Attach(MakeHolder<NTracing::TOnRebuildGraphResult>(msg->Trace.Get())); + IntrospectionTrace->Attach(MakeHolder<NTracing::TOnRebuildGraphResult>(msg->Trace.Get())); } TIntrusivePtr<TEvTablet::TDependencyGraph> graph; switch (msg->Status) { @@ -1735,7 +1735,7 @@ void TTablet::CancelTablet(TEvTablet::TEvTabletDead::EReason reason, const TStri const ui32 reportedGeneration = SuggestedGeneration ? SuggestedGeneration : StateStorageInfo.KnownGeneration; if (IntrospectionTrace) { - IntrospectionTrace->Attach(MakeHolder<NTracing::TOnCancelTablet>( + IntrospectionTrace->Attach(MakeHolder<NTracing::TOnCancelTablet>( this->TabletID() , Info->TabletType , reason @@ -1802,7 +1802,7 @@ void TTablet::LockedInitializationPath() { StateStorageInfo.KnownStep = 0; } if (IntrospectionTrace) { - IntrospectionTrace->Attach(MakeHolder<NTracing::TOnLockedInitializationPath>( + IntrospectionTrace->Attach(MakeHolder<NTracing::TOnLockedInitializationPath>( StateStorageInfo.KnownGeneration , StateStorageInfo.KnownStep , StateStorageInfo.SignatureSz)); @@ -1871,13 +1871,13 @@ void TTablet::BootstrapFollower() { BoostrapTime = AppData()->TimeProvider->Now(); bool enInt = AppData()->EnableIntrospection; if (enInt) { - IntrospectionTrace.Reset(NTracing::CreateTrace(NTracing::ITrace::TypeSysTabletBootstrap)); + IntrospectionTrace.Reset(NTracing::CreateTrace(NTracing::ITrace::TypeSysTabletBootstrap)); } StateStorageInfo.ProxyID = MakeStateStorageProxyID(StateStorageGroup()); Send(StateStorageInfo.ProxyID, new TEvStateStorage::TEvLookup(TabletID(), 0, TEvStateStorage::TProxyOptions(TEvStateStorage::TProxyOptions::SigAsync))); if (IntrospectionTrace) { - IntrospectionTrace->Attach(MakeHolder<NTracing::TOnTabletBootstrap>(SuggestedGeneration, false, StateStorageInfo.ProxyID)); + IntrospectionTrace->Attach(MakeHolder<NTracing::TOnTabletBootstrap>(SuggestedGeneration, false, StateStorageInfo.ProxyID)); } Become(&TThis::StateResolveLeader); @@ -1890,13 +1890,13 @@ void TTablet::Bootstrap() { BoostrapTime = AppData()->TimeProvider->Now(); bool enInt = AppData()->EnableIntrospection; if (enInt) { - IntrospectionTrace.Reset(NTracing::CreateTrace(NTracing::ITrace::TypeSysTabletBootstrap)); + IntrospectionTrace.Reset(NTracing::CreateTrace(NTracing::ITrace::TypeSysTabletBootstrap)); } ReportTabletStateChange(TTabletStateInfo::Created); // useless? StateStorageInfo.ProxyID = MakeStateStorageProxyID(StateStorageGroup()); Send(StateStorageInfo.ProxyID, new TEvStateStorage::TEvLookup(TabletID(), 0, TEvStateStorage::TProxyOptions(TEvStateStorage::TProxyOptions::SigAsync))); if (IntrospectionTrace) { - IntrospectionTrace->Attach(MakeHolder<NTracing::TOnTabletBootstrap>(SuggestedGeneration, true, StateStorageInfo.ProxyID)); + IntrospectionTrace->Attach(MakeHolder<NTracing::TOnTabletBootstrap>(SuggestedGeneration, true, StateStorageInfo.ProxyID)); } // todo: handle "proxy unknown" case (normal timeouts are handled by proxy) PipeConnectAcceptor->Detach(SelfId()); @@ -1905,7 +1905,7 @@ void TTablet::Bootstrap() { } void TTablet::ExternalWriteZeroEntry(TTabletStorageInfo *info, ui32 gen, TActorIdentity owner) { - THolder<NKikimrTabletBase::TTabletLogEntry> entry = MakeHolder<NKikimrTabletBase::TTabletLogEntry>(); + THolder<NKikimrTabletBase::TTabletLogEntry> entry = MakeHolder<NKikimrTabletBase::TTabletLogEntry>(); entry->SetSnapshot(MakeGenStepPair(0, 0)); entry->SetZeroConfirmed(MakeGenStepPair(0, 0)); entry->SetZeroTailSz(0); diff --git a/ydb/core/tablet/tablet_tracing_signals.cpp b/ydb/core/tablet/tablet_tracing_signals.cpp index deae99f4e6..9d1923f822 100644 --- a/ydb/core/tablet/tablet_tracing_signals.cpp +++ b/ydb/core/tablet/tablet_tracing_signals.cpp @@ -793,7 +793,7 @@ TOnRebuildGraphResult::TOnRebuildGraphResult(const TString& serializedSignal) void TOnRebuildGraphResult::OutText(TStringStream& str, TTimestampData& tsData, const TString& prefix) const { str << prefix << TimeStamp(tsData) << " RebuildGraph result received. Here's the trace:" << Endl; str << prefix << "{" << Endl; - THolder<ITrace> trace(CreateTrace(PbSignal.GetSerializedTrace())); + THolder<ITrace> trace(CreateTrace(PbSignal.GetSerializedTrace())); trace->OutText(str, tsData, " "); str << prefix << "}" << Endl; } @@ -826,7 +826,7 @@ void TOnRebuildGraphResult::OutHtmlBody( ) const { Y_UNUSED(getMyId); Y_UNUSED(signalAddress); - THolder<ITrace> trace(CreateTrace(PbSignal.GetSerializedTrace())); + THolder<ITrace> trace(CreateTrace(PbSignal.GetSerializedTrace())); if (signalAddress.size()) { // cuttent signal is not the target trace->OutSignalHtmlBody(str, tsInfo, getMyId, signalAddress); diff --git a/ydb/core/tablet_flat/flat_bio_actor.cpp b/ydb/core/tablet_flat/flat_bio_actor.cpp index 2735ca421a..6a866fb395 100644 --- a/ydb/core/tablet_flat/flat_bio_actor.cpp +++ b/ydb/core/tablet_flat/flat_bio_actor.cpp @@ -95,7 +95,7 @@ void TBlockIO::Dispatch() noexcept while (auto more = PagesToBlobsConverter->Grow(NBlockIO::BlockSize)) { auto group = NPageCollection::TLargeGlobId::InvalidGroup; - TArrayHolder<TEvGet::TQuery> query(new TEvGet::TQuery[+more]); + TArrayHolder<TEvGet::TQuery> query(new TEvGet::TQuery[+more]); ui32 lastBlob = Max<ui32>(); for (const auto on : xrange(+more)) { diff --git a/ydb/core/tablet_flat/flat_comp_create.cpp b/ydb/core/tablet_flat/flat_comp_create.cpp index a919ab3816..d46a1f63e7 100644 --- a/ydb/core/tablet_flat/flat_comp_create.cpp +++ b/ydb/core/tablet_flat/flat_comp_create.cpp @@ -12,7 +12,7 @@ namespace NTable{ ITimeProvider* time, TString taskNameSuffix) { - return MakeHolder<NCompGen::TGenCompactionStrategy>( + return MakeHolder<NCompGen::TGenCompactionStrategy>( table, backend, broker, time, std::move(taskNameSuffix)); } @@ -24,7 +24,7 @@ namespace NTable{ ITimeProvider* time, TString taskNameSuffix) { - return MakeHolder<NCompShard::TShardedCompactionStrategy>( + return MakeHolder<NCompShard::TShardedCompactionStrategy>( table, backend, broker, logger, time, std::move(taskNameSuffix)); } diff --git a/ydb/core/tablet_flat/flat_comp_shard.cpp b/ydb/core/tablet_flat/flat_comp_shard.cpp index 9c80806f72..a3a58f923e 100644 --- a/ydb/core/tablet_flat/flat_comp_shard.cpp +++ b/ydb/core/tablet_flat/flat_comp_shard.cpp @@ -755,7 +755,7 @@ namespace NCompShard { last->LastInclusive); } - return MakeHolder<TUnderlayMask>(std::move(rowScheme), std::move(results)); + return MakeHolder<TUnderlayMask>(std::move(rowScheme), std::move(results)); } TSplitKeys::TSplitKeys(TIntrusiveConstPtr<TRowScheme> rowScheme, TSplitKeys::TKeysVec keys) @@ -1086,7 +1086,7 @@ namespace NCompShard { shard = shard->Next()->Node(); } Y_VERIFY(splitKeys, "Unexpected lack of split keys"); - params->SplitKeys = MakeHolder<TSplitKeys>(TableInfo.RowScheme, std::move(splitKeys)); + params->SplitKeys = MakeHolder<TSplitKeys>(TableInfo.RowScheme, std::move(splitKeys)); } MemCompactionId = Backend->BeginCompaction(std::move(params)); @@ -2578,7 +2578,7 @@ namespace NCompShard { } if (edges) { - params->SplitKeys = MakeHolder<TSplitKeys>(TableInfo.RowScheme, std::move(edges)); + params->SplitKeys = MakeHolder<TSplitKeys>(TableInfo.RowScheme, std::move(edges)); } shard->Task.CompactionId = Backend->BeginCompaction(std::move(params)); @@ -2626,7 +2626,7 @@ namespace NCompShard { shard = shard->Next()->Node(); } Y_VERIFY(splitKeys, "Unexpected lack of split keys"); - params->SplitKeys = MakeHolder<TSplitKeys>(TableInfo.RowScheme, std::move(splitKeys)); + params->SplitKeys = MakeHolder<TSplitKeys>(TableInfo.RowScheme, std::move(splitKeys)); } ForcedCompactionTask.CompactionId = Backend->BeginCompaction(std::move(params)); diff --git a/ydb/core/tablet_flat/flat_cxx_database.h b/ydb/core/tablet_flat/flat_cxx_database.h index 640dae99e8..27a260bcb2 100644 --- a/ydb/core/tablet_flat/flat_cxx_database.h +++ b/ydb/core/tablet_flat/flat_cxx_database.h @@ -1044,7 +1044,7 @@ struct Schema { if (!Precharger<typename TableType::Precharge>::Precharge(database, TableId, {}, {}, columns, IteratorType::Direction)) { return nullptr; } - return THolder<IteratorType>(database.IterateRangeGeneric<IteratorType>(TableId, NTable::TKeyRange{ }, columns).Release()); + return THolder<IteratorType>(database.IterateRangeGeneric<IteratorType>(TableId, NTable::TKeyRange{ }, columns).Release()); } static bool Precharge(TToughDb& database, NTable::TTagsRef columns) { @@ -1091,7 +1091,7 @@ struct Schema { range.MinInclusive = true; range.MaxKey = maxKey; range.MaxInclusive = true; - return THolder<IteratorType>(database.IterateRangeGeneric<IteratorType>(TableId, range, columns).Release()); + return THolder<IteratorType>(database.IterateRangeGeneric<IteratorType>(TableId, range, columns).Release()); } static bool Precharge(TToughDb& database, const KeyValuesType& keyValues, NTable::TTagsRef columns) { @@ -1138,7 +1138,7 @@ struct Schema { range.MinInclusive = true; range.MaxKey = { }; range.MaxInclusive = true; - return THolder<IteratorType>(database.IterateRangeGeneric<IteratorType>(TableId, range, columns).Release()); + return THolder<IteratorType>(database.IterateRangeGeneric<IteratorType>(TableId, range, columns).Release()); } static bool Precharge(TToughDb& database, const KeyValuesType& keyValues, NTable::TTagsRef columns) { @@ -1184,7 +1184,7 @@ struct Schema { range.MinInclusive = true; range.MaxKey = maxKey; range.MaxInclusive = true; - return THolder<IteratorType>(database.IterateRangeGeneric<IteratorType>(TableId, range, columns).Release()); + return THolder<IteratorType>(database.IterateRangeGeneric<IteratorType>(TableId, range, columns).Release()); } static bool Precharge(TToughDb& database, const KeyValuesType& keyValues, NTable::TTagsRef columns) { @@ -1239,7 +1239,7 @@ struct Schema { range.MinInclusive = true; range.MaxKey = maxKey; range.MaxInclusive = true; - return THolder<IteratorType>(database.IterateRangeGeneric<IteratorType>(TableId, range, columns).Release()); + return THolder<IteratorType>(database.IterateRangeGeneric<IteratorType>(TableId, range, columns).Release()); } static bool Precharge(TToughDb& database, @@ -1274,7 +1274,7 @@ struct Schema { static THolder<NTable::TTableIt> MakeIterator(TToughDb& database, const KeyValuesType& keyValues, NTable::TTagsRef columns) { TTupleToRawTypeValue<KeyValuesType, KeyColumnsType> key(keyValues); - return THolder<NTable::TTableIt>(database.IterateExact(TableId, key, columns).Release()); + return THolder<NTable::TTableIt>(database.IterateExact(TableId, key, columns).Release()); } static bool Precharge(TToughDb& database, const KeyValuesType& keyValues, NTable::TTagsRef columns) { diff --git a/ydb/core/tablet_flat/flat_executor.cpp b/ydb/core/tablet_flat/flat_executor.cpp index 1880de2ad5..59afc46215 100644 --- a/ydb/core/tablet_flat/flat_executor.cpp +++ b/ydb/core/tablet_flat/flat_executor.cpp @@ -322,8 +322,8 @@ void TExecutor::ActivateFollower(const TActorContext &ctx) { Y_VERIFY(!CompactionLogic); if (!Counters) { - Counters = MakeHolder<TExecutorCounters>(); - CountersBaseline = MakeHolder<TExecutorCounters>(); + Counters = MakeHolder<TExecutorCounters>(); + CountersBaseline = MakeHolder<TExecutorCounters>(); Counters->RememberCurrentStateAsBaseline(*CountersBaseline); } @@ -361,7 +361,7 @@ void TExecutor::Active(const TActorContext &ctx) { auto loadedState = BootLogic->ExtractState(); BootLogic.Destroy(); - Counters = MakeHolder<TExecutorCounters>(); + Counters = MakeHolder<TExecutorCounters>(); CommitManager = loadedState->CommitManager; Database = loadedState->Database; @@ -375,9 +375,9 @@ void TExecutor::Active(const TActorContext &ctx) { CommitManager->Start(this, Owner->Tablet(), &Step0, Counters.Get()); - CompactionLogic = THolder<TCompactionLogic>(new TCompactionLogic(Logger.Get(), Broker.Get(), this, loadedState->Comp, - Sprintf("tablet-%" PRIu64, Owner->TabletID()))); - CountersBaseline = MakeHolder<TExecutorCounters>(); + CompactionLogic = THolder<TCompactionLogic>(new TCompactionLogic(Logger.Get(), Broker.Get(), this, loadedState->Comp, + Sprintf("tablet-%" PRIu64, Owner->TabletID()))); + CountersBaseline = MakeHolder<TExecutorCounters>(); Counters->RememberCurrentStateAsBaseline(*CountersBaseline); LogicRedo->InstallCounters(Counters.Get(), nullptr); @@ -385,7 +385,7 @@ void TExecutor::Active(const TActorContext &ctx) { CounterCacheStaging = new NMonitoring::TCounterForPtr; CounterCacheMemTable = new NMonitoring::TCounterForPtr; - ResourceMetrics = MakeHolder<NMetrics::TResourceMetrics>(Owner->TabletID(), 0, Launcher); + ResourceMetrics = MakeHolder<NMetrics::TResourceMetrics>(Owner->TabletID(), 0, Launcher); PendingBlobQueue.Config.TabletID = Owner->TabletID(); PendingBlobQueue.Config.Generation = Generation(); @@ -3813,7 +3813,7 @@ const NTable::TScheme& TExecutor::Scheme() const noexcept { void TExecutor::RegisterExternalTabletCounters(TAutoPtr<TTabletCountersBase> appCounters) { AppCounters = appCounters; - AppCountersBaseline = MakeHolder<TTabletCountersBase>(); + AppCountersBaseline = MakeHolder<TTabletCountersBase>(); AppCounters->RememberCurrentStateAsBaseline(*AppCountersBaseline); if (LogicRedo) { diff --git a/ydb/core/tablet_flat/flat_executor_gclogic.cpp b/ydb/core/tablet_flat/flat_executor_gclogic.cpp index d8de6b563a..bded66353e 100644 --- a/ydb/core/tablet_flat/flat_executor_gclogic.cpp +++ b/ydb/core/tablet_flat/flat_executor_gclogic.cpp @@ -340,7 +340,7 @@ void TExecutorGCLogic::TChannelInfo::SendCollectGarbageEntry( ValidateGCVector(tabletid, channel, "Keep", keep); ValidateGCVector(tabletid, channel, "DoNotKeep", notKeep); THolder<TEvBlobStorage::TEvCollectGarbage> ev = - MakeHolder<TEvBlobStorage::TEvCollectGarbage>( + MakeHolder<TEvBlobStorage::TEvCollectGarbage>( tabletid, generation, GcCounter, channel, true, diff --git a/ydb/core/tablet_flat/flat_load_blob_queue.cpp b/ydb/core/tablet_flat/flat_load_blob_queue.cpp index 53695f3e89..3c97b4a535 100644 --- a/ydb/core/tablet_flat/flat_load_blob_queue.cpp +++ b/ydb/core/tablet_flat/flat_load_blob_queue.cpp @@ -108,7 +108,7 @@ bool TLoadBlobQueue::SendRequests(const TActorId& sender) { << "sending TEvGet batch " << batchSize << " bytes, " << ActiveBytesInFly << " total, blobs: " << TDumpLogoBlobs{ newBlobs }); - TArrayHolder<TEvBlobStorage::TEvGet::TQuery> query(new TEvBlobStorage::TEvGet::TQuery[newBlobs.size()]); + TArrayHolder<TEvBlobStorage::TEvGet::TQuery> query(new TEvBlobStorage::TEvGet::TQuery[newBlobs.size()]); for (size_t i = 0; i < newBlobs.size(); ++i) { query[i].Set(newBlobs[i]); } diff --git a/ydb/core/tablet_flat/flat_part_iter_multi.h b/ydb/core/tablet_flat/flat_part_iter_multi.h index d815f5830b..b26d83b378 100644 --- a/ydb/core/tablet_flat/flat_part_iter_multi.h +++ b/ydb/core/tablet_flat/flat_part_iter_multi.h @@ -1536,7 +1536,7 @@ namespace NTable { CurrentIt = std::move(it->second); Cache.erase(it); } else { - CurrentIt = MakeHolder<TPartSimpleIt>(part, Tags, Nulls, Env); + CurrentIt = MakeHolder<TPartSimpleIt>(part, Tags, Nulls, Env); } CurrentIt->SetBounds(Current->Slice); } diff --git a/ydb/core/tablet_flat/flat_range_cache.cpp b/ydb/core/tablet_flat/flat_range_cache.cpp index 9b0c65d8d1..dbac2c7981 100644 --- a/ydb/core/tablet_flat/flat_range_cache.cpp +++ b/ydb/core/tablet_flat/flat_range_cache.cpp @@ -152,7 +152,7 @@ void TKeyRangeCache::CollectGarbage() { } if (Pool->TotalUsed() < Pool->TotalGarbage() / 2) { - THolder<TSpecialMemoryPool> newPool = MakeHolder<TSpecialMemoryPool>(); + THolder<TSpecialMemoryPool> newPool = MakeHolder<TSpecialMemoryPool>(); newPool->Reserve(Pool->TotalUsed()); for (auto& constEntry : Entries) { auto& entry = const_cast<TKeyRangeEntryLRU&>(constEntry); diff --git a/ydb/core/tablet_flat/flat_scan_actor.h b/ydb/core/tablet_flat/flat_scan_actor.h index ceee0f3d16..5cbf2797a0 100644 --- a/ydb/core/tablet_flat/flat_scan_actor.h +++ b/ydb/core/tablet_flat/flat_scan_actor.h @@ -458,7 +458,7 @@ namespace NOps { if (stat.ElapsedCycles() >= MaxCyclesPerIteration) { // Yield to allow other actors to use this thread if (!ContinueInFly) { - SendToSelf(MakeHolder<TEvContinue>()); + SendToSelf(MakeHolder<TEvContinue>()); ContinueInFly = true; } yield = true; diff --git a/ydb/core/testlib/actors/test_runtime.cpp b/ydb/core/testlib/actors/test_runtime.cpp index c452c0fb2a..63f0436bff 100644 --- a/ydb/core/testlib/actors/test_runtime.cpp +++ b/ydb/core/testlib/actors/test_runtime.cpp @@ -32,7 +32,7 @@ namespace NActors { void TTestActorRuntime::Initialize() { SetScheduledEventFilter(&TTestActorRuntime::DefaultScheduledFilterFunc); - NodeFactory = MakeHolder<TNodeFactory>(); + NodeFactory = MakeHolder<TNodeFactory>(); InitNodes(); } diff --git a/ydb/core/testlib/basics/helpers.cpp b/ydb/core/testlib/basics/helpers.cpp index 1fc1b84eeb..259e4f9da9 100644 --- a/ydb/core/testlib/basics/helpers.cpp +++ b/ydb/core/testlib/basics/helpers.cpp @@ -80,7 +80,7 @@ namespace NKikimr { Runtime.BlockOutputForActor(pDiskServiceId); Runtime.BlockOutputForActor(actorId); - auto factory = CreateStrandingDecoratorFactory(&Runtime, []{ return MakeHolder<TPDiskReplyChecker>(); }); + auto factory = CreateStrandingDecoratorFactory(&Runtime, []{ return MakeHolder<TPDiskReplyChecker>(); }); IActor* wrappedActor = factory->Wrap(actorId, true, TVector<TActorId>()); TActorId wrappedActorId = Runtime.Register(wrappedActor, nodeIndex, poolId, TMailboxType::Revolving); Runtime.RegisterService(pDiskServiceId, wrappedActorId, nodeIndex); diff --git a/ydb/core/testlib/test_client.cpp b/ydb/core/testlib/test_client.cpp index 036305db82..d4907c26f1 100644 --- a/ydb/core/testlib/test_client.cpp +++ b/ydb/core/testlib/test_client.cpp @@ -166,7 +166,7 @@ namespace Tests { app.CompactionConfig = Settings->CompactionConfig; app.FeatureFlags = Settings->FeatureFlags; - Runtime = MakeHolder<TTestBasicRuntime>(StaticNodes() + DynamicNodes(), Settings->UseRealThreads); + Runtime = MakeHolder<TTestBasicRuntime>(StaticNodes() + DynamicNodes(), Settings->UseRealThreads); if (!Settings->UseRealThreads) Runtime->SetRegistrationObserverFunc([](TTestActorRuntimeBase& runtime, const TActorId&, const TActorId& actorId) { diff --git a/ydb/core/tracing/tablet_info.cpp b/ydb/core/tracing/tablet_info.cpp index a63abf02c1..6eb99ffc60 100644 --- a/ydb/core/tracing/tablet_info.cpp +++ b/ydb/core/tracing/tablet_info.cpp @@ -152,7 +152,7 @@ public: void Handle(TEvWhiteboard::TEvTabletLookupResponse::TPtr& ev, const TActorContext& ctx) { ui64 nodeId = ev.Get()->Cookie; - TracedTablets[nodeId] = THolder<TReplyStatus>(new TReplyStatus({ TReplyStatus::OK, THolder<TEvWhiteboard::TEvTabletLookupResponse>(ev->Release()) })); + TracedTablets[nodeId] = THolder<TReplyStatus>(new TReplyStatus({ TReplyStatus::OK, THolder<TEvWhiteboard::TEvTabletLookupResponse>(ev->Release()) })); NodeTabletInfoReceived(ctx); } @@ -165,7 +165,7 @@ public: void BadResponseReceived(ui32 nodeId, const TActorContext& ctx, TReplyStatus::EStatus status) { if (TracedTablets[nodeId] == nullptr) { - TracedTablets[nodeId] = THolder<TReplyStatus>(new TReplyStatus({ status, nullptr })); + TracedTablets[nodeId] = THolder<TReplyStatus>(new TReplyStatus({ status, nullptr })); NodeTabletInfoReceived(ctx); } } @@ -181,7 +181,7 @@ public: void HandleTimeout(const TActorContext &ctx) { for (auto& nodeTabletTracesPair : TracedTablets) { if (!nodeTabletTracesPair.second) { - nodeTabletTracesPair.second = THolder<TReplyStatus>(new TReplyStatus({ TReplyStatus::TIMEOUT, nullptr })); + nodeTabletTracesPair.second = THolder<TReplyStatus>(new TReplyStatus({ TReplyStatus::TIMEOUT, nullptr })); } } ReplyAndDie(ctx); @@ -316,7 +316,7 @@ public: void SendRequest(ui32 nodeId, const TActorContext& ctx) { TActorId whiteboardServiceId = MakeNodeWhiteboardServiceId(nodeId); - THolder<TEvWhiteboard::TEvTraceLookupRequest> request = MakeHolder<TEvWhiteboard::TEvTraceLookupRequest>(); + THolder<TEvWhiteboard::TEvTraceLookupRequest> request = MakeHolder<TEvWhiteboard::TEvTraceLookupRequest>(); auto& record = request->Record; record.SetTabletID(TabletId); ctx.Send(whiteboardServiceId, request.Release(), IEventHandle::FlagTrackDelivery, nodeId); @@ -335,7 +335,7 @@ public: void Handle(TEvWhiteboard::TEvTraceLookupResponse::TPtr& ev, const TActorContext& ctx) { ui64 nodeId = ev.Get()->Cookie; - TabletTraces[nodeId] = THolder<TReplyStatus>(new TReplyStatus({ TReplyStatus::OK, THolder<TEvWhiteboard::TEvTraceLookupResponse>(ev->Release()) })); + TabletTraces[nodeId] = THolder<TReplyStatus>(new TReplyStatus({ TReplyStatus::OK, THolder<TEvWhiteboard::TEvTraceLookupResponse>(ev->Release()) })); NodeTabletInfoReceived(ctx); } @@ -348,7 +348,7 @@ public: void BadResponseReceived(ui32 nodeId, const TActorContext& ctx, TReplyStatus::EStatus status) { if (TabletTraces[nodeId] == nullptr) { - TabletTraces[nodeId] = THolder<TReplyStatus>(new TReplyStatus({ status, nullptr })); + TabletTraces[nodeId] = THolder<TReplyStatus>(new TReplyStatus({ status, nullptr })); NodeTabletInfoReceived(ctx); } } @@ -462,7 +462,7 @@ public: void HandleTimeout(const TActorContext &ctx) { for (auto& nodeTabletTracesPair : TabletTraces) { if (!nodeTabletTracesPair.second) { - nodeTabletTracesPair.second = THolder<TReplyStatus>(new TReplyStatus({ TReplyStatus::TIMEOUT, nullptr })); + nodeTabletTracesPair.second = THolder<TReplyStatus>(new TReplyStatus({ TReplyStatus::TIMEOUT, nullptr })); } } ReplyAndDie(ctx); @@ -491,7 +491,7 @@ public: void Bootstrap(const TActorContext& ctx) { TActorId whiteboardServiceId = MakeNodeWhiteboardServiceId(TraceInfo.NodeId); - THolder<TEvWhiteboard::TEvTraceRequest> request = MakeHolder<TEvWhiteboard::TEvTraceRequest>(); + THolder<TEvWhiteboard::TEvTraceRequest> request = MakeHolder<TEvWhiteboard::TEvTraceRequest>(); auto& record = request->Record; record.SetTabletID(TraceInfo.TabletId); NTracing::TraceIDFromTraceID(TraceInfo.TraceId, record.MutableTraceID()); @@ -568,7 +568,7 @@ public: void Bootstrap(const TActorContext& ctx) { TActorId whiteboardServiceId = MakeNodeWhiteboardServiceId(TraceInfo.NodeId); - THolder<TEvWhiteboard::TEvSignalBodyRequest> request = MakeHolder<TEvWhiteboard::TEvSignalBodyRequest>(); + THolder<TEvWhiteboard::TEvSignalBodyRequest> request = MakeHolder<TEvWhiteboard::TEvSignalBodyRequest>(); auto& record = request->Record; record.SetTabletID(TraceInfo.TabletId); NTracing::TraceIDFromTraceID(TraceInfo.TraceId, record.MutableTraceID()); diff --git a/ydb/core/tracing/trace.cpp b/ydb/core/tracing/trace.cpp index 30f85a963b..e243c047d7 100644 --- a/ydb/core/tracing/trace.cpp +++ b/ydb/core/tracing/trace.cpp @@ -72,7 +72,7 @@ void TTrace::OutHtml(TStringStream& str, const TTimestampInfo& tsInfo, std::func ui32 i = 0; TTimestampData tsData(tsInfo, TInstant::MicroSeconds(SelfID.CreationTime)); for (auto& serializedSignal : Signals) { - THolder<ITraceSignal> signal(signalFactory.Create(serializedSignal)); + THolder<ITraceSignal> signal(signalFactory.Create(serializedSignal)); if (signal) { signal->OutHtmlHeader( str, @@ -99,7 +99,7 @@ void TTrace::OutText(TStringStream& str, TTimestampInfo& tsInfo, const TString& TSignalFactory& signalFactory = TSignalFactory::Instance(); TTimestampData tsData(tsInfo, TInstant::MicroSeconds(SelfID.CreationTime)); for (auto& serializedSignal : Signals) { - THolder<ITraceSignal> signal(signalFactory.Create(serializedSignal)); + THolder<ITraceSignal> signal(signalFactory.Create(serializedSignal)); if (signal) { signal->OutText( str, @@ -167,7 +167,7 @@ void TTrace::OutSignalHtmlBody(TStringStream& str } signalAddress.pop_front(); TSignalFactory& signalFactory = TSignalFactory::Instance(); - THolder<ITraceSignal> signal(signalFactory.Create(*signalIterator)); + THolder<ITraceSignal> signal(signalFactory.Create(*signalIterator)); if (signal) { signal->OutHtmlBody( str, diff --git a/ydb/core/tx/datashard/alter_table_unit.cpp b/ydb/core/tx/datashard/alter_table_unit.cpp index a8abe3a926..78786adae7 100644 --- a/ydb/core/tx/datashard/alter_table_unit.cpp +++ b/ydb/core/tx/datashard/alter_table_unit.cpp @@ -87,7 +87,7 @@ public: THolder<TExecutionUnit> CreateAlterMoveShadowUnit(TDataShard& dataShard, TPipeline& pipeline) { - return THolder(new TAlterMoveShadowUnit(dataShard, pipeline)); + return THolder(new TAlterMoveShadowUnit(dataShard, pipeline)); } //////////////////////////////////////////////////////////////////////////////// @@ -165,7 +165,7 @@ void TAlterTableUnit::Complete(TOperation::TPtr, THolder<TExecutionUnit> CreateAlterTableUnit(TDataShard &dataShard, TPipeline &pipeline) { - return THolder(new TAlterTableUnit(dataShard, pipeline)); + return THolder(new TAlterTableUnit(dataShard, pipeline)); } } // namespace NDataShard diff --git a/ydb/core/tx/datashard/build_and_wait_dependencies_unit.cpp b/ydb/core/tx/datashard/build_and_wait_dependencies_unit.cpp index a6d860b7cb..7eb786866a 100644 --- a/ydb/core/tx/datashard/build_and_wait_dependencies_unit.cpp +++ b/ydb/core/tx/datashard/build_and_wait_dependencies_unit.cpp @@ -176,7 +176,7 @@ void TBuildAndWaitDependenciesUnit::Complete(TOperation::TPtr, THolder<TExecutionUnit> CreateBuildAndWaitDependenciesUnit(TDataShard &dataShard, TPipeline &pipeline) { - return THolder(new TBuildAndWaitDependenciesUnit(dataShard, pipeline)); + return THolder(new TBuildAndWaitDependenciesUnit(dataShard, pipeline)); } } // namespace NDataShard diff --git a/ydb/core/tx/datashard/build_data_tx_out_rs_unit.cpp b/ydb/core/tx/datashard/build_data_tx_out_rs_unit.cpp index 611c48d160..cd8d3dab69 100644 --- a/ydb/core/tx/datashard/build_data_tx_out_rs_unit.cpp +++ b/ydb/core/tx/datashard/build_data_tx_out_rs_unit.cpp @@ -123,7 +123,7 @@ void TBuildDataTxOutRSUnit::Complete(TOperation::TPtr, THolder<TExecutionUnit> CreateBuildDataTxOutRSUnit(TDataShard &dataShard, TPipeline &pipeline) { - return THolder(new TBuildDataTxOutRSUnit(dataShard, pipeline)); + return THolder(new TBuildDataTxOutRSUnit(dataShard, pipeline)); } } // namespace NDataShard diff --git a/ydb/core/tx/datashard/build_kqp_data_tx_out_rs_unit.cpp b/ydb/core/tx/datashard/build_kqp_data_tx_out_rs_unit.cpp index b4dd1949e6..50a3c1f401 100644 --- a/ydb/core/tx/datashard/build_kqp_data_tx_out_rs_unit.cpp +++ b/ydb/core/tx/datashard/build_kqp_data_tx_out_rs_unit.cpp @@ -152,7 +152,7 @@ EExecutionStatus TBuildKqpDataTxOutRSUnit::OnTabletNotReady(TActiveTransaction& } THolder<TExecutionUnit> CreateBuildKqpDataTxOutRSUnit(TDataShard& dataShard, TPipeline& pipeline) { - return THolder(new TBuildKqpDataTxOutRSUnit(dataShard, pipeline)); + return THolder(new TBuildKqpDataTxOutRSUnit(dataShard, pipeline)); } } // namespace NDataShard diff --git a/ydb/core/tx/datashard/build_scheme_tx_out_rs_unit.cpp b/ydb/core/tx/datashard/build_scheme_tx_out_rs_unit.cpp index a36292c0ee..7f63253157 100644 --- a/ydb/core/tx/datashard/build_scheme_tx_out_rs_unit.cpp +++ b/ydb/core/tx/datashard/build_scheme_tx_out_rs_unit.cpp @@ -139,7 +139,7 @@ void TBuildSchemeTxOutRSUnit::Complete(TOperation::TPtr, THolder<TExecutionUnit> CreateBuildSchemeTxOutRSUnit(TDataShard &dataShard, TPipeline &pipeline) { - return MakeHolder<TBuildSchemeTxOutRSUnit>(dataShard, pipeline); + return MakeHolder<TBuildSchemeTxOutRSUnit>(dataShard, pipeline); } } // namespace NDataShard diff --git a/ydb/core/tx/datashard/check_data_tx_unit.cpp b/ydb/core/tx/datashard/check_data_tx_unit.cpp index 6b83ea814a..deb9f1f903 100644 --- a/ydb/core/tx/datashard/check_data_tx_unit.cpp +++ b/ydb/core/tx/datashard/check_data_tx_unit.cpp @@ -318,7 +318,7 @@ void TCheckDataTxUnit::Complete(TOperation::TPtr, THolder<TExecutionUnit> CreateCheckDataTxUnit(TDataShard &dataShard, TPipeline &pipeline) { - return THolder(new TCheckDataTxUnit(dataShard, pipeline)); + return THolder(new TCheckDataTxUnit(dataShard, pipeline)); } } // namespace NDataShard diff --git a/ydb/core/tx/datashard/check_scheme_tx_unit.cpp b/ydb/core/tx/datashard/check_scheme_tx_unit.cpp index 3d49532946..bbba1c6d95 100644 --- a/ydb/core/tx/datashard/check_scheme_tx_unit.cpp +++ b/ydb/core/tx/datashard/check_scheme_tx_unit.cpp @@ -719,7 +719,7 @@ void TCheckSchemeTxUnit::Complete(TOperation::TPtr, THolder<TExecutionUnit> CreateCheckSchemeTxUnit(TDataShard &dataShard, TPipeline &pipeline) { - return THolder(new TCheckSchemeTxUnit(dataShard, pipeline)); + return THolder(new TCheckSchemeTxUnit(dataShard, pipeline)); } } // namespace NDataShard diff --git a/ydb/core/tx/datashard/check_snapshot_tx_unit.cpp b/ydb/core/tx/datashard/check_snapshot_tx_unit.cpp index e3d197a736..cdba2783f0 100644 --- a/ydb/core/tx/datashard/check_snapshot_tx_unit.cpp +++ b/ydb/core/tx/datashard/check_snapshot_tx_unit.cpp @@ -165,7 +165,7 @@ THolder<TExecutionUnit> CreateCheckSnapshotTxUnit( TDataShard& dataShard, TPipeline& pipeline) { - return THolder(new TCheckSnapshotTxUnit(dataShard, pipeline)); + return THolder(new TCheckSnapshotTxUnit(dataShard, pipeline)); } } // namespace NDataShard diff --git a/ydb/core/tx/datashard/complete_data_tx_unit.cpp b/ydb/core/tx/datashard/complete_data_tx_unit.cpp index fe69abe3af..c086fa7011 100644 --- a/ydb/core/tx/datashard/complete_data_tx_unit.cpp +++ b/ydb/core/tx/datashard/complete_data_tx_unit.cpp @@ -122,7 +122,7 @@ void TCompleteOperationUnit::Complete(TOperation::TPtr op, THolder<TExecutionUnit> CreateCompleteOperationUnit(TDataShard &dataShard, TPipeline &pipeline) { - return THolder(new TCompleteOperationUnit(dataShard, pipeline)); + return THolder(new TCompleteOperationUnit(dataShard, pipeline)); } } // namespace NDataShard diff --git a/ydb/core/tx/datashard/completed_operations_unit.cpp b/ydb/core/tx/datashard/completed_operations_unit.cpp index bf944e09cd..eddc70a13e 100644 --- a/ydb/core/tx/datashard/completed_operations_unit.cpp +++ b/ydb/core/tx/datashard/completed_operations_unit.cpp @@ -53,7 +53,7 @@ void TCompletedOperationsUnit::Complete(TOperation::TPtr, THolder<TExecutionUnit> CreateCompletedOperationsUnit(TDataShard &dataShard, TPipeline &pipeline) { - return THolder(new TCompletedOperationsUnit(dataShard, pipeline)); + return THolder(new TCompletedOperationsUnit(dataShard, pipeline)); } } // namespace NDataShard diff --git a/ydb/core/tx/datashard/create_persistent_snapshot_unit.cpp b/ydb/core/tx/datashard/create_persistent_snapshot_unit.cpp index 6c12e5c6c6..6adc13e4ad 100644 --- a/ydb/core/tx/datashard/create_persistent_snapshot_unit.cpp +++ b/ydb/core/tx/datashard/create_persistent_snapshot_unit.cpp @@ -60,7 +60,7 @@ THolder<TExecutionUnit> CreateCreatePersistentSnapshotUnit( TDataShard& dataShard, TPipeline& pipeline) { - return THolder(new TCreatePersistentSnapshotUnit(dataShard, pipeline)); + return THolder(new TCreatePersistentSnapshotUnit(dataShard, pipeline)); } } // namespace NDataShard diff --git a/ydb/core/tx/datashard/create_table_unit.cpp b/ydb/core/tx/datashard/create_table_unit.cpp index bdfe857543..85f38d456a 100644 --- a/ydb/core/tx/datashard/create_table_unit.cpp +++ b/ydb/core/tx/datashard/create_table_unit.cpp @@ -98,7 +98,7 @@ void TCreateTableUnit::Complete(TOperation::TPtr, const TActorContext &ctx) THolder<TExecutionUnit> CreateCreateTableUnit(TDataShard &dataShard, TPipeline &pipeline) { - return THolder(new TCreateTableUnit(dataShard, pipeline)); + return THolder(new TCreateTableUnit(dataShard, pipeline)); } } // namespace NDataShard diff --git a/ydb/core/tx/datashard/create_volatile_snapshot_unit.cpp b/ydb/core/tx/datashard/create_volatile_snapshot_unit.cpp index c06839ebae..9de1520481 100644 --- a/ydb/core/tx/datashard/create_volatile_snapshot_unit.cpp +++ b/ydb/core/tx/datashard/create_volatile_snapshot_unit.cpp @@ -69,7 +69,7 @@ THolder<TExecutionUnit> CreateCreateVolatileSnapshotUnit( TDataShard& dataShard, TPipeline& pipeline) { - return THolder(new TCreateVolatileSnapshotUnit(dataShard, pipeline)); + return THolder(new TCreateVolatileSnapshotUnit(dataShard, pipeline)); } } // namespace NDataShard diff --git a/ydb/core/tx/datashard/datashard.cpp b/ydb/core/tx/datashard/datashard.cpp index fcc8b0b7a8..d86568b4a1 100644 --- a/ydb/core/tx/datashard/datashard.cpp +++ b/ydb/core/tx/datashard/datashard.cpp @@ -643,7 +643,7 @@ void TDataShard::NotifySchemeshard(const TActorContext& ctx, ui64 txId) { } THolder<TEvDataShard::TEvSchemaChanged> event = - THolder(new TEvDataShard::TEvSchemaChanged(ctx.SelfID, TabletID(), State, op->TxId, op->PlanStep, Generation())); + THolder(new TEvDataShard::TEvSchemaChanged(ctx.SelfID, TabletID(), State, op->TxId, op->PlanStep, Generation())); switch (op->Type) { case TSchemaOperation::ETypeBackup: @@ -659,7 +659,7 @@ void TDataShard::NotifySchemeshard(const TActorContext& ctx, ui64 txId) { break; } - SendViaSchemeshardPipe(ctx, op->TabletId, THolder(event.Release())); + SendViaSchemeshardPipe(ctx, op->TabletId, THolder(event.Release())); } bool TDataShard::CheckMediatorAuthorisation(ui64 mediatorId) { @@ -1468,10 +1468,10 @@ bool TDataShard::CheckDataTxRejectAndReply(TEvDataShard::TEvProposeTransaction* if (reject) { THolder<TEvDataShard::TEvProposeTransactionResult> result = - THolder(new TEvDataShard::TEvProposeTransactionResult(msg->GetTxKind(), + THolder(new TEvDataShard::TEvProposeTransactionResult(msg->GetTxKind(), TabletID(), msg->GetTxId(), - rejectStatus)); + rejectStatus)); result->AddError(NKikimrTxDataShard::TError::WRONG_SHARD_STATE, rejectReason); LOG_NOTICE_S(ctx, NKikimrServices::TX_DATASHARD, rejectReason); @@ -1529,10 +1529,10 @@ void TDataShard::Handle(TEvDataShard::TEvProposeTransaction::TPtr &ev, const TAc } THolder<TEvDataShard::TEvProposeTransactionResult> result - = THolder(new TEvDataShard::TEvProposeTransactionResult(ev->Get()->GetTxKind(), + = THolder(new TEvDataShard::TEvProposeTransactionResult(ev->Get()->GetTxKind(), TabletID(), ev->Get()->GetTxId(), - NKikimrTxDataShard::TEvProposeTransactionResult::ERROR)); + NKikimrTxDataShard::TEvProposeTransactionResult::ERROR)); result->AddError(NKikimrTxDataShard::TError::BAD_TX_KIND, "Unknown kind of transaction"); ctx.Send(ev->Get()->GetSource(), result.Release()); IncCounter(COUNTER_PREPARE_ERROR); @@ -1565,8 +1565,8 @@ void TDataShard::HandleAsFollower(TEvDataShard::TEvProposeTransaction::TPtr &ev, if (TxInFly() > GetMaxTxInFly()) { THolder<TEvDataShard::TEvProposeTransactionResult> result = - THolder(new TEvDataShard::TEvProposeTransactionResult(ev->Get()->GetTxKind(), TabletID(), - ev->Get()->GetTxId(), NKikimrTxDataShard::TEvProposeTransactionResult::OVERLOADED)); + THolder(new TEvDataShard::TEvProposeTransactionResult(ev->Get()->GetTxKind(), TabletID(), + ev->Get()->GetTxId(), NKikimrTxDataShard::TEvProposeTransactionResult::OVERLOADED)); ctx.Send(ev->Get()->GetSource(), result.Release()); IncCounter(COUNTER_PREPARE_OVERLOADED); IncCounter(COUNTER_PREPARE_COMPLETE); @@ -1579,10 +1579,10 @@ void TDataShard::HandleAsFollower(TEvDataShard::TEvProposeTransaction::TPtr &ev, } THolder<TEvDataShard::TEvProposeTransactionResult> result - = THolder(new TEvDataShard::TEvProposeTransactionResult(ev->Get()->GetTxKind(), + = THolder(new TEvDataShard::TEvProposeTransactionResult(ev->Get()->GetTxKind(), TabletID(), ev->Get()->GetTxId(), - NKikimrTxDataShard::TEvProposeTransactionResult::ERROR)); + NKikimrTxDataShard::TEvProposeTransactionResult::ERROR)); result->AddError(NKikimrTxDataShard::TError::BAD_TX_KIND, "Unsupported transaction kind"); ctx.Send(ev->Get()->GetSource(), result.Release()); IncCounter(COUNTER_PREPARE_ERROR); diff --git a/ydb/core/tx/datashard/datashard__plan_step.cpp b/ydb/core/tx/datashard/datashard__plan_step.cpp index 18d5d85070..6399598865 100644 --- a/ydb/core/tx/datashard/datashard__plan_step.cpp +++ b/ydb/core/tx/datashard/datashard__plan_step.cpp @@ -74,14 +74,14 @@ void TDataShard::TTxPlanStep::Complete(const TActorContext &ctx) { for (auto& kv : TxByAck) { THolder<TEvTxProcessing::TEvPlanStepAck> ack = - MakeHolder<TEvTxProcessing::TEvPlanStepAck>(Self->TabletID(), step, kv.second.begin(), kv.second.end()); + MakeHolder<TEvTxProcessing::TEvPlanStepAck>(Self->TabletID(), step, kv.second.begin(), kv.second.end()); LOG_DEBUG_S(ctx, NKikimrServices::TX_DATASHARD, "Sending '" << ack->ToString()); ctx.Send(kv.first, ack.Release()); // Ack to Tx coordinator } THolder<TEvTxProcessing::TEvPlanStepAccepted> accepted = - MakeHolder<TEvTxProcessing::TEvPlanStepAccepted>(Self->TabletID(), step); + MakeHolder<TEvTxProcessing::TEvPlanStepAccepted>(Self->TabletID(), step); LOG_DEBUG_S(ctx, NKikimrServices::TX_DATASHARD, "Sending '" << accepted->ToString()); ctx.Send(Ev->Sender, accepted.Release()); // Reply to the mediator diff --git a/ydb/core/tx/datashard/datashard__readset.cpp b/ydb/core/tx/datashard/datashard__readset.cpp index 0f88d0f821..c935025b80 100644 --- a/ydb/core/tx/datashard/datashard__readset.cpp +++ b/ydb/core/tx/datashard/datashard__readset.cpp @@ -40,8 +40,8 @@ namespace NDataShard { } THolder<IEventHandle> TDataShard::TTxReadSet::MakeAck(const TActorContext& ctx) { - return THolder(new IEventHandle(Ev->Sender, ctx.SelfID, - new TEvTxProcessing::TEvReadSetAck(*Ev->Get(), Self->TabletID()))); + return THolder(new IEventHandle(Ev->Sender, ctx.SelfID, + new TEvTxProcessing::TEvReadSetAck(*Ev->Get(), Self->TabletID()))); } void TDataShard::TTxReadSet::Complete(const TActorContext &ctx) { diff --git a/ydb/core/tx/datashard/datashard_active_transaction.cpp b/ydb/core/tx/datashard/datashard_active_transaction.cpp index 20e86aafdb..0226bd42e2 100644 --- a/ydb/core/tx/datashard/datashard_active_transaction.cpp +++ b/ydb/core/tx/datashard/datashard_active_transaction.cpp @@ -726,7 +726,7 @@ public: }; THolder<TExecutionUnit> CreateFinalizeDataTxPlanUnit(TDataShard &dataShard, TPipeline &pipeline) { - return THolder(new TFinalizeDataTxPlanUnit(dataShard, pipeline)); + return THolder(new TFinalizeDataTxPlanUnit(dataShard, pipeline)); } void TActiveTransaction::BuildExecutionPlan(bool loaded) diff --git a/ydb/core/tx/datashard/datashard_impl.h b/ydb/core/tx/datashard/datashard_impl.h index 266a1f3f28..11313474f8 100644 --- a/ydb/core/tx/datashard/datashard_impl.h +++ b/ydb/core/tx/datashard/datashard_impl.h @@ -1506,7 +1506,7 @@ private: info.PipeToOwner = ctx.Register(NTabletPipe::CreateClient(ctx.SelfID, ownerTabletId, clientConfig)); } - THolder<TEvDataShard::TEvReturnBorrowedPart> ev = MakeHolder<TEvDataShard::TEvReturnBorrowedPart>(MyTabletID, partMetaVec); + THolder<TEvDataShard::TEvReturnBorrowedPart> ev = MakeHolder<TEvDataShard::TEvReturnBorrowedPart>(MyTabletID, partMetaVec); NTabletPipe::SendData(ctx, info.PipeToOwner, ev.Release()); } @@ -1587,7 +1587,7 @@ private: NTabletPipe::TClientConfig clientConfig; PipesToDstShards[dstTabletId] = ctx.Register(NTabletPipe::CreateClient(ctx.SelfID, dstTabletId, clientConfig)); - THolder<TEvDataShard::TEvSplitTransferSnapshot> ev = MakeHolder<TEvDataShard::TEvSplitTransferSnapshot>(0); + THolder<TEvDataShard::TEvSplitTransferSnapshot> ev = MakeHolder<TEvDataShard::TEvSplitTransferSnapshot>(0); ev->Record.CopyFrom(*DataToSend[dstTabletId]); ev->Record.SetSrcTabletGeneration(Self->Generation()); diff --git a/ydb/core/tx/datashard/datashard_pipeline.cpp b/ydb/core/tx/datashard/datashard_pipeline.cpp index 434506e2f2..3498162c17 100644 --- a/ydb/core/tx/datashard/datashard_pipeline.cpp +++ b/ydb/core/tx/datashard/datashard_pipeline.cpp @@ -615,7 +615,7 @@ bool TPipeline::SaveInReadSet(const TEvTxProcessing::TEvReadSet &rs, // it will be added at load. if (op->HasLoadedInRSFlag()) op->AddInReadSet(rs.Record); - op->AddDelayedAck(THolder(ack.Release())); + op->AddDelayedAck(THolder(ack.Release())); op->AddDelayedInReadSet(rs.Record); AddCandidateOp(op); diff --git a/ydb/core/tx/datashard/datashard_ut_common.cpp b/ydb/core/tx/datashard/datashard_ut_common.cpp index df73a5d72e..d754f7ad0e 100644 --- a/ydb/core/tx/datashard/datashard_ut_common.cpp +++ b/ydb/core/tx/datashard/datashard_ut_common.cpp @@ -741,7 +741,7 @@ ui64 TFakeMiniKQLProxy::Plan(ui64 stepId, const TMap<ui64, TFakeProxyTx::TPtr>& UNIT_ASSERT_VALUES_EQUAL(tx->ShardsCount(), 1); TString txBody; ui32 shard = tx->GetShardProgram(0, txBody); - THolder<TEvDataShard::TEvProposeTransaction> event = MakeHolder<TEvDataShard::TEvProposeTransaction>( + THolder<TEvDataShard::TEvProposeTransaction> event = MakeHolder<TEvDataShard::TEvProposeTransaction>( NKikimrTxDataShard::TX_KIND_DATA, Tester.Sender, txId, txBody, tx->TxFlags()); immEvents.emplace_back(std::make_pair(shard, std::move(event))); results.insert(std::make_pair(shard, txId)); diff --git a/ydb/core/tx/datashard/datashard_ut_order.cpp b/ydb/core/tx/datashard/datashard_ut_order.cpp index dc2c881f07..32472dce59 100644 --- a/ydb/core/tx/datashard/datashard_ut_order.cpp +++ b/ydb/core/tx/datashard/datashard_ut_order.cpp @@ -53,7 +53,7 @@ public: } #if 0 TActiveTransaction MakeActiveTx(ui64 step, ui64 txId, const TString& txBody) { - THolder<NMiniKQL::IEngineFlatHost> host = MakeHolder<NMiniKQL::TEngineHost>(DB); + THolder<NMiniKQL::IEngineFlatHost> host = MakeHolder<NMiniKQL::TEngineHost>(DB); THolder<NMiniKQL::IEngineFlat> engine = CreateEngineFlat( NMiniKQL::TEngineFlatSettings(NMiniKQL::IEngineFlat::EProtocol::V1, FunctionRegistry.Get(), *RandomProvider, *TimeProvider, host.Get())); diff --git a/ydb/core/tx/datashard/direct_tx_unit.cpp b/ydb/core/tx/datashard/direct_tx_unit.cpp index 323c4ff910..1284b1f6ad 100644 --- a/ydb/core/tx/datashard/direct_tx_unit.cpp +++ b/ydb/core/tx/datashard/direct_tx_unit.cpp @@ -64,7 +64,7 @@ public: }; // TDirectOpUnit THolder<TExecutionUnit> CreateDirectOpUnit(TDataShard& self, TPipeline& pipeline) { - return THolder(new TDirectOpUnit(self, pipeline)); + return THolder(new TDirectOpUnit(self, pipeline)); } } // NDataShard diff --git a/ydb/core/tx/datashard/drop_index_notice_unit.cpp b/ydb/core/tx/datashard/drop_index_notice_unit.cpp index 40a9f0961f..4311069958 100644 --- a/ydb/core/tx/datashard/drop_index_notice_unit.cpp +++ b/ydb/core/tx/datashard/drop_index_notice_unit.cpp @@ -71,7 +71,7 @@ THolder<TExecutionUnit> CreateDropIndexNoticeUnit( TDataShard& dataShard, TPipeline& pipeline) { - return THolder(new TDropIndexNoticeUnit(dataShard, pipeline)); + return THolder(new TDropIndexNoticeUnit(dataShard, pipeline)); } } // namespace NDataShard diff --git a/ydb/core/tx/datashard/drop_persistent_snapshot_unit.cpp b/ydb/core/tx/datashard/drop_persistent_snapshot_unit.cpp index 96bb8f7988..baa55e4f5c 100644 --- a/ydb/core/tx/datashard/drop_persistent_snapshot_unit.cpp +++ b/ydb/core/tx/datashard/drop_persistent_snapshot_unit.cpp @@ -54,7 +54,7 @@ THolder<TExecutionUnit> CreateDropPersistentSnapshotUnit( TDataShard& dataShard, TPipeline& pipeline) { - return THolder(new TDropPersistentSnapshotUnit(dataShard, pipeline)); + return THolder(new TDropPersistentSnapshotUnit(dataShard, pipeline)); } } // namespace NDataShard diff --git a/ydb/core/tx/datashard/drop_table_unit.cpp b/ydb/core/tx/datashard/drop_table_unit.cpp index 44189a5eb1..8d8cfb960d 100644 --- a/ydb/core/tx/datashard/drop_table_unit.cpp +++ b/ydb/core/tx/datashard/drop_table_unit.cpp @@ -106,7 +106,7 @@ void TDropTableUnit::Complete(TOperation::TPtr, THolder<TExecutionUnit> CreateDropTableUnit(TDataShard &dataShard, TPipeline &pipeline) { - return THolder(new TDropTableUnit(dataShard, pipeline)); + return THolder(new TDropTableUnit(dataShard, pipeline)); } } // namespace NDataShard diff --git a/ydb/core/tx/datashard/drop_volatile_snapshot_unit.cpp b/ydb/core/tx/datashard/drop_volatile_snapshot_unit.cpp index 43f2b45889..bb45748c8d 100644 --- a/ydb/core/tx/datashard/drop_volatile_snapshot_unit.cpp +++ b/ydb/core/tx/datashard/drop_volatile_snapshot_unit.cpp @@ -54,7 +54,7 @@ THolder<TExecutionUnit> CreateDropVolatileSnapshotUnit( TDataShard& dataShard, TPipeline& pipeline) { - return THolder(new TDropVolatileSnapshotUnit(dataShard, pipeline)); + return THolder(new TDropVolatileSnapshotUnit(dataShard, pipeline)); } } // namespace NDataShard diff --git a/ydb/core/tx/datashard/execute_data_tx_unit.cpp b/ydb/core/tx/datashard/execute_data_tx_unit.cpp index ccd88aa41f..b32f635cc0 100644 --- a/ydb/core/tx/datashard/execute_data_tx_unit.cpp +++ b/ydb/core/tx/datashard/execute_data_tx_unit.cpp @@ -289,7 +289,7 @@ void TExecuteDataTxUnit::Complete(TOperation::TPtr, const TActorContext&) { } THolder<TExecutionUnit> CreateExecuteDataTxUnit(TDataShard& dataShard, TPipeline& pipeline) { - return THolder(new TExecuteDataTxUnit(dataShard, pipeline)); + return THolder(new TExecuteDataTxUnit(dataShard, pipeline)); } } // namespace NDataShard diff --git a/ydb/core/tx/datashard/execute_kqp_data_tx_unit.cpp b/ydb/core/tx/datashard/execute_kqp_data_tx_unit.cpp index 2f3f9e4d7a..70e7be3662 100644 --- a/ydb/core/tx/datashard/execute_kqp_data_tx_unit.cpp +++ b/ydb/core/tx/datashard/execute_kqp_data_tx_unit.cpp @@ -238,7 +238,7 @@ EExecutionStatus TExecuteKqpDataTxUnit::OnTabletNotReady(TActiveTransaction& tx, void TExecuteKqpDataTxUnit::Complete(TOperation::TPtr, const TActorContext&) {} THolder<TExecutionUnit> CreateExecuteKqpDataTxUnit(TDataShard& dataShard, TPipeline& pipeline) { - return THolder(new TExecuteKqpDataTxUnit(dataShard, pipeline)); + return THolder(new TExecuteKqpDataTxUnit(dataShard, pipeline)); } } // namespace NDataShard diff --git a/ydb/core/tx/datashard/execute_kqp_scan_tx_unit.cpp b/ydb/core/tx/datashard/execute_kqp_scan_tx_unit.cpp index d1e2419589..1362a5149f 100644 --- a/ydb/core/tx/datashard/execute_kqp_scan_tx_unit.cpp +++ b/ydb/core/tx/datashard/execute_kqp_scan_tx_unit.cpp @@ -49,7 +49,7 @@ public: }; THolder<TExecutionUnit> CreateExecuteKqpScanTxUnit(TDataShard& dataShard, TPipeline& pipeline) { - return MakeHolder<TExecuteKqpScanTxUnit>(dataShard, pipeline); + return MakeHolder<TExecuteKqpScanTxUnit>(dataShard, pipeline); } } // namespace NDataShard diff --git a/ydb/core/tx/datashard/finalize_build_index_unit.cpp b/ydb/core/tx/datashard/finalize_build_index_unit.cpp index 75e0a8d9c8..6f8a17ec50 100644 --- a/ydb/core/tx/datashard/finalize_build_index_unit.cpp +++ b/ydb/core/tx/datashard/finalize_build_index_unit.cpp @@ -67,7 +67,7 @@ THolder<TExecutionUnit> CreateFinalizeBuildIndexUnit( TDataShard& dataShard, TPipeline& pipeline) { - return THolder(new TFinalizeBuildIndexUnit(dataShard, pipeline)); + return THolder(new TFinalizeBuildIndexUnit(dataShard, pipeline)); } } // namespace NDataShard diff --git a/ydb/core/tx/datashard/finish_propose_unit.cpp b/ydb/core/tx/datashard/finish_propose_unit.cpp index e2bfcedfb8..de0e9e4ad2 100644 --- a/ydb/core/tx/datashard/finish_propose_unit.cpp +++ b/ydb/core/tx/datashard/finish_propose_unit.cpp @@ -218,7 +218,7 @@ TString TFinishProposeUnit::PrintErrors(const NKikimrTxDataShard::TEvProposeTran THolder<TExecutionUnit> CreateFinishProposeUnit(TDataShard &dataShard, TPipeline &pipeline) { - return THolder(new TFinishProposeUnit(dataShard, pipeline)); + return THolder(new TFinishProposeUnit(dataShard, pipeline)); } } // namespace NDataShard diff --git a/ydb/core/tx/datashard/initiate_build_index_unit.cpp b/ydb/core/tx/datashard/initiate_build_index_unit.cpp index dd45a18f72..f52034aeea 100644 --- a/ydb/core/tx/datashard/initiate_build_index_unit.cpp +++ b/ydb/core/tx/datashard/initiate_build_index_unit.cpp @@ -84,7 +84,7 @@ THolder<TExecutionUnit> CreateInitiateBuildIndexUnit( TDataShard& dataShard, TPipeline& pipeline) { - return THolder(new TInitiateBuildIndexUnit(dataShard, pipeline)); + return THolder(new TInitiateBuildIndexUnit(dataShard, pipeline)); } } // namespace NDataShard diff --git a/ydb/core/tx/datashard/load_and_wait_in_rs_unit.cpp b/ydb/core/tx/datashard/load_and_wait_in_rs_unit.cpp index 2b5882881a..40be05e79e 100644 --- a/ydb/core/tx/datashard/load_and_wait_in_rs_unit.cpp +++ b/ydb/core/tx/datashard/load_and_wait_in_rs_unit.cpp @@ -82,7 +82,7 @@ void TLoadAndWaitInRSUnit::Complete(TOperation::TPtr, THolder<TExecutionUnit> CreateLoadAndWaitInRSUnit(TDataShard &dataShard, TPipeline &pipeline) { - return THolder(new TLoadAndWaitInRSUnit(dataShard, pipeline)); + return THolder(new TLoadAndWaitInRSUnit(dataShard, pipeline)); } } // namespace NDataShard diff --git a/ydb/core/tx/datashard/load_tx_details_unit.cpp b/ydb/core/tx/datashard/load_tx_details_unit.cpp index cf63f201d2..6916d8b0d5 100644 --- a/ydb/core/tx/datashard/load_tx_details_unit.cpp +++ b/ydb/core/tx/datashard/load_tx_details_unit.cpp @@ -56,7 +56,7 @@ void TLoadTxDetailsUnit::Complete(TOperation::TPtr, THolder<TExecutionUnit> CreateLoadTxDetailsUnit(TDataShard &dataShard, TPipeline &pipeline) { - return MakeHolder<TLoadTxDetailsUnit>(dataShard, pipeline); + return MakeHolder<TLoadTxDetailsUnit>(dataShard, pipeline); } } // namespace NDataShard diff --git a/ydb/core/tx/datashard/make_scan_snapshot_unit.cpp b/ydb/core/tx/datashard/make_scan_snapshot_unit.cpp index 7304739fb2..1ec465fea7 100644 --- a/ydb/core/tx/datashard/make_scan_snapshot_unit.cpp +++ b/ydb/core/tx/datashard/make_scan_snapshot_unit.cpp @@ -81,7 +81,7 @@ void TMakeScanSnapshotUnit::Complete(TOperation::TPtr, THolder<TExecutionUnit> CreateMakeScanSnapshotUnit(TDataShard &dataShard, TPipeline &pipeline) { - return THolder(new TMakeScanSnapshotUnit(dataShard, pipeline)); + return THolder(new TMakeScanSnapshotUnit(dataShard, pipeline)); } } // namespace NDataShard diff --git a/ydb/core/tx/datashard/make_snapshot_unit.cpp b/ydb/core/tx/datashard/make_snapshot_unit.cpp index 32840930b3..8532f04d29 100644 --- a/ydb/core/tx/datashard/make_snapshot_unit.cpp +++ b/ydb/core/tx/datashard/make_snapshot_unit.cpp @@ -81,7 +81,7 @@ void TMakeSnapshotUnit::Complete(TOperation::TPtr, THolder<TExecutionUnit> CreateMakeSnapshotUnit(TDataShard &dataShard, TPipeline &pipeline) { - return THolder(new TMakeSnapshotUnit(dataShard, pipeline)); + return THolder(new TMakeSnapshotUnit(dataShard, pipeline)); } } // namespace NDataShard diff --git a/ydb/core/tx/datashard/operation.h b/ydb/core/tx/datashard/operation.h index 42f866668d..0f4b713e91 100644 --- a/ydb/core/tx/datashard/operation.h +++ b/ydb/core/tx/datashard/operation.h @@ -780,7 +780,7 @@ protected: TOutputOpData &OutputDataRef() { if (!OutputData) - OutputData = MakeHolder<TOutputOpData>(); + OutputData = MakeHolder<TOutputOpData>(); return *OutputData; } void ClearOutputData() { OutputData = nullptr; } @@ -788,7 +788,7 @@ protected: TInputOpData &InputDataRef() { if (!InputData) - InputData = MakeHolder<TInputOpData>(); + InputData = MakeHolder<TInputOpData>(); return *InputData; } void ClearInputData() { InputData = nullptr; } diff --git a/ydb/core/tx/datashard/plan_queue_unit.cpp b/ydb/core/tx/datashard/plan_queue_unit.cpp index 51f1eadc03..052444c76a 100644 --- a/ydb/core/tx/datashard/plan_queue_unit.cpp +++ b/ydb/core/tx/datashard/plan_queue_unit.cpp @@ -113,7 +113,7 @@ void TPlanQueueUnit::Complete(TOperation::TPtr, THolder<TExecutionUnit> CreatePlanQueueUnit(TDataShard &dataShard, TPipeline &pipeline) { - return THolder(new TPlanQueueUnit(dataShard, pipeline)); + return THolder(new TPlanQueueUnit(dataShard, pipeline)); } } // namespace NDataShard diff --git a/ydb/core/tx/datashard/prepare_data_tx_in_rs_unit.cpp b/ydb/core/tx/datashard/prepare_data_tx_in_rs_unit.cpp index 4bf449cb7d..840863e00a 100644 --- a/ydb/core/tx/datashard/prepare_data_tx_in_rs_unit.cpp +++ b/ydb/core/tx/datashard/prepare_data_tx_in_rs_unit.cpp @@ -108,7 +108,7 @@ void TPrepareDataTxInRSUnit::Complete(TOperation::TPtr, THolder<TExecutionUnit> CreatePrepareDataTxInRSUnit(TDataShard &dataShard, TPipeline &pipeline) { - return THolder(new TPrepareDataTxInRSUnit(dataShard, pipeline)); + return THolder(new TPrepareDataTxInRSUnit(dataShard, pipeline)); } } // namespace NDataShard diff --git a/ydb/core/tx/datashard/prepare_kqp_data_tx_in_rs_unit.cpp b/ydb/core/tx/datashard/prepare_kqp_data_tx_in_rs_unit.cpp index 23fee98179..05ab71fc36 100644 --- a/ydb/core/tx/datashard/prepare_kqp_data_tx_in_rs_unit.cpp +++ b/ydb/core/tx/datashard/prepare_kqp_data_tx_in_rs_unit.cpp @@ -69,7 +69,7 @@ EExecutionStatus TPrepareKqpDataTxInRSUnit::Execute(TOperation::TPtr op, TTransa void TPrepareKqpDataTxInRSUnit::Complete(TOperation::TPtr, const TActorContext &) {} THolder<TExecutionUnit> CreatePrepareKqpDataTxInRSUnit(TDataShard &dataShard, TPipeline &pipeline) { - return THolder(new TPrepareKqpDataTxInRSUnit(dataShard, pipeline)); + return THolder(new TPrepareKqpDataTxInRSUnit(dataShard, pipeline)); } } // namespace NDataShard diff --git a/ydb/core/tx/datashard/prepare_scheme_tx_in_rs_unit.cpp b/ydb/core/tx/datashard/prepare_scheme_tx_in_rs_unit.cpp index daf60d3012..cc2cfeb5f1 100644 --- a/ydb/core/tx/datashard/prepare_scheme_tx_in_rs_unit.cpp +++ b/ydb/core/tx/datashard/prepare_scheme_tx_in_rs_unit.cpp @@ -60,7 +60,7 @@ void TPrepareSchemeTxInRSUnit::Complete(TOperation::TPtr, THolder<TExecutionUnit> CreatePrepareSchemeTxInRSUnit(TDataShard &dataShard, TPipeline &pipeline) { - return THolder(new TPrepareSchemeTxInRSUnit(dataShard, pipeline)); + return THolder(new TPrepareSchemeTxInRSUnit(dataShard, pipeline)); } } // namespace NDataShard diff --git a/ydb/core/tx/datashard/protect_scheme_echoes_unit.cpp b/ydb/core/tx/datashard/protect_scheme_echoes_unit.cpp index 7358e8046b..5f554208a3 100644 --- a/ydb/core/tx/datashard/protect_scheme_echoes_unit.cpp +++ b/ydb/core/tx/datashard/protect_scheme_echoes_unit.cpp @@ -47,7 +47,7 @@ public: }; THolder<TExecutionUnit> CreateProtectSchemeEchoesUnit(TDataShard &dataShard, TPipeline &pipeline) { - return THolder(new TProtectSchemeEchoesUnit(dataShard, pipeline)); + return THolder(new TProtectSchemeEchoesUnit(dataShard, pipeline)); } } // namespace NlatterDataShard diff --git a/ydb/core/tx/datashard/read_table_scan_unit.cpp b/ydb/core/tx/datashard/read_table_scan_unit.cpp index 579f18f090..c020c6c6ab 100644 --- a/ydb/core/tx/datashard/read_table_scan_unit.cpp +++ b/ydb/core/tx/datashard/read_table_scan_unit.cpp @@ -234,7 +234,7 @@ void TReadTableScanUnit::Complete(TOperation::TPtr, THolder<TExecutionUnit> CreateReadTableScanUnit(TDataShard &dataShard, TPipeline &pipeline) { - return THolder(new TReadTableScanUnit(dataShard, pipeline)); + return THolder(new TReadTableScanUnit(dataShard, pipeline)); } } // namespace NDataShard diff --git a/ydb/core/tx/datashard/receive_snapshot_unit.cpp b/ydb/core/tx/datashard/receive_snapshot_unit.cpp index 4e5d608a75..26f92f65f4 100644 --- a/ydb/core/tx/datashard/receive_snapshot_unit.cpp +++ b/ydb/core/tx/datashard/receive_snapshot_unit.cpp @@ -118,7 +118,7 @@ void TReceiveSnapshotUnit::Complete(TOperation::TPtr, THolder<TExecutionUnit> CreateReceiveSnapshotUnit(TDataShard &dataShard, TPipeline &pipeline) { - return MakeHolder<TReceiveSnapshotUnit>(dataShard, pipeline); + return MakeHolder<TReceiveSnapshotUnit>(dataShard, pipeline); } } // namespace NDataShard diff --git a/ydb/core/tx/datashard/store_and_send_out_rs_unit.cpp b/ydb/core/tx/datashard/store_and_send_out_rs_unit.cpp index e133e02818..a648b765fd 100644 --- a/ydb/core/tx/datashard/store_and_send_out_rs_unit.cpp +++ b/ydb/core/tx/datashard/store_and_send_out_rs_unit.cpp @@ -88,7 +88,7 @@ void TStoreAndSendOutRSUnit::Complete(TOperation::TPtr op, THolder<TExecutionUnit> CreateStoreAndSendOutRSUnit(TDataShard &dataShard, TPipeline &pipeline) { - return THolder(new TStoreAndSendOutRSUnit(dataShard, pipeline)); + return THolder(new TStoreAndSendOutRSUnit(dataShard, pipeline)); } } // namespace NDataShard diff --git a/ydb/core/tx/datashard/store_data_tx_unit.cpp b/ydb/core/tx/datashard/store_data_tx_unit.cpp index 47d1114366..8498e5c8b6 100644 --- a/ydb/core/tx/datashard/store_data_tx_unit.cpp +++ b/ydb/core/tx/datashard/store_data_tx_unit.cpp @@ -65,7 +65,7 @@ void TStoreDataTxUnit::Complete(TOperation::TPtr op, THolder<TExecutionUnit> CreateStoreDataTxUnit(TDataShard &dataShard, TPipeline &pipeline) { - return MakeHolder<TStoreDataTxUnit>(dataShard, pipeline); + return MakeHolder<TStoreDataTxUnit>(dataShard, pipeline); } } // namespace NDataShard diff --git a/ydb/core/tx/datashard/store_scheme_tx_unit.cpp b/ydb/core/tx/datashard/store_scheme_tx_unit.cpp index 65625b6970..6b1d8af9ed 100644 --- a/ydb/core/tx/datashard/store_scheme_tx_unit.cpp +++ b/ydb/core/tx/datashard/store_scheme_tx_unit.cpp @@ -98,7 +98,7 @@ void TStoreSchemeTxUnit::Complete(TOperation::TPtr op, THolder<TExecutionUnit> CreateStoreSchemeTxUnit(TDataShard &dataShard, TPipeline &pipeline) { - return THolder(new TStoreSchemeTxUnit(dataShard, pipeline)); + return THolder(new TStoreSchemeTxUnit(dataShard, pipeline)); } } // namespace NDataShard diff --git a/ydb/core/tx/datashard/store_snapshot_tx_unit.cpp b/ydb/core/tx/datashard/store_snapshot_tx_unit.cpp index f608a69829..810ac51209 100644 --- a/ydb/core/tx/datashard/store_snapshot_tx_unit.cpp +++ b/ydb/core/tx/datashard/store_snapshot_tx_unit.cpp @@ -36,7 +36,7 @@ THolder<TExecutionUnit> CreateStoreSnapshotTxUnit( TDataShard& dataShard, TPipeline& pipeline) { - return THolder(new TStoreSnapshotTxUnit(dataShard, pipeline)); + return THolder(new TStoreSnapshotTxUnit(dataShard, pipeline)); } } // namespace NDataShard diff --git a/ydb/core/tx/datashard/wait_for_plan_unit.cpp b/ydb/core/tx/datashard/wait_for_plan_unit.cpp index d5b814f635..c1e81106a1 100644 --- a/ydb/core/tx/datashard/wait_for_plan_unit.cpp +++ b/ydb/core/tx/datashard/wait_for_plan_unit.cpp @@ -51,7 +51,7 @@ void TWaitForPlanUnit::Complete(TOperation::TPtr, THolder<TExecutionUnit> CreateWaitForPlanUnit(TDataShard &dataShard, TPipeline &pipeline) { - return MakeHolder<TWaitForPlanUnit>(dataShard, pipeline); + return MakeHolder<TWaitForPlanUnit>(dataShard, pipeline); } } // namespace NDataShard diff --git a/ydb/core/tx/datashard/wait_for_stream_clearance_unit.cpp b/ydb/core/tx/datashard/wait_for_stream_clearance_unit.cpp index df3ba038f0..db91ceb7fc 100644 --- a/ydb/core/tx/datashard/wait_for_stream_clearance_unit.cpp +++ b/ydb/core/tx/datashard/wait_for_stream_clearance_unit.cpp @@ -211,7 +211,7 @@ void TWaitForStreamClearanceUnit::Complete(TOperation::TPtr, THolder<TExecutionUnit> CreateWaitForStreamClearanceUnit(TDataShard &dataShard, TPipeline &pipeline) { - return THolder(new TWaitForStreamClearanceUnit(dataShard, pipeline)); + return THolder(new TWaitForStreamClearanceUnit(dataShard, pipeline)); } } // namespace NDataShard diff --git a/ydb/core/tx/scheme_board/cache.cpp b/ydb/core/tx/scheme_board/cache.cpp index ef41907df7..8e778a4a1d 100644 --- a/ydb/core/tx/scheme_board/cache.cpp +++ b/ydb/core/tx/scheme_board/cache.cpp @@ -2341,7 +2341,7 @@ class TSchemeCache: public TMonitorableActor<TSchemeCache> { return false; } - Register(CreateDbResolver(SelfId(), ev->Sender, THolder(request.Release()), it->second)); + Register(CreateDbResolver(SelfId(), ev->Sender, THolder(request.Release()), it->second)); return true; } diff --git a/ydb/core/tx/scheme_board/populator.cpp b/ydb/core/tx/scheme_board/populator.cpp index ebf6e67ef3..f860bb88cb 100644 --- a/ydb/core/tx/scheme_board/populator.cpp +++ b/ydb/core/tx/scheme_board/populator.cpp @@ -654,9 +654,9 @@ class TPopulator: public TMonitorableActor<TPopulator> { auto it = Descriptions.find(pathId); if (it == Descriptions.end()) { - update = MakeHolder<TSchemeBoardEvents::TEvUpdateBuilder>(Owner, Generation, pathId); + update = MakeHolder<TSchemeBoardEvents::TEvUpdateBuilder>(Owner, Generation, pathId); } else { - update = MakeHolder<TSchemeBoardEvents::TEvUpdateBuilder>(Owner, Generation, it->second.Record); + update = MakeHolder<TSchemeBoardEvents::TEvUpdateBuilder>(Owner, Generation, it->second.Record); update->SetDescribeSchemeResult(it->second); } diff --git a/ydb/core/tx/scheme_board/replica.cpp b/ydb/core/tx/scheme_board/replica.cpp index 39c2bb932e..638656e91d 100644 --- a/ydb/core/tx/scheme_board/replica.cpp +++ b/ydb/core/tx/scheme_board/replica.cpp @@ -403,12 +403,12 @@ public: if (!PathId) { Y_VERIFY(isDeletion); - notify = MakeHolder<TSchemeBoardEvents::TEvNotifyBuilder>(Path, isDeletion); + notify = MakeHolder<TSchemeBoardEvents::TEvNotifyBuilder>(Path, isDeletion); } else if (!Path) { Y_VERIFY(isDeletion); - notify = MakeHolder<TSchemeBoardEvents::TEvNotifyBuilder>(PathId, isDeletion); + notify = MakeHolder<TSchemeBoardEvents::TEvNotifyBuilder>(PathId, isDeletion); } else { - notify = MakeHolder<TSchemeBoardEvents::TEvNotifyBuilder>(Path, PathId, isDeletion); + notify = MakeHolder<TSchemeBoardEvents::TEvNotifyBuilder>(Path, PathId, isDeletion); } if (!isDeletion) { diff --git a/ydb/core/tx/scheme_board/subscriber.cpp b/ydb/core/tx/scheme_board/subscriber.cpp index 5a3f1cdd98..97173d81ad 100644 --- a/ydb/core/tx/scheme_board/subscriber.cpp +++ b/ydb/core/tx/scheme_board/subscriber.cpp @@ -607,11 +607,11 @@ class TSubscriber: public TMonitorableActor<TDerived> { Y_VERIFY(path || pathId); if (!pathId) { - notify = MakeHolder<TNotify>(path, std::forward<Args>(args)...); + notify = MakeHolder<TNotify>(path, std::forward<Args>(args)...); } else if (!path) { - notify = MakeHolder<TNotify>(pathId, std::forward<Args>(args)...); + notify = MakeHolder<TNotify>(pathId, std::forward<Args>(args)...); } else { - notify = MakeHolder<TNotify>(path, pathId, std::forward<Args>(args)...); + notify = MakeHolder<TNotify>(path, pathId, std::forward<Args>(args)...); } return notify; diff --git a/ydb/core/tx/schemeshard/schemeshard__operation.cpp b/ydb/core/tx/schemeshard/schemeshard__operation.cpp index d1e25ed7f1..daf1218bcf 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation.cpp @@ -432,7 +432,7 @@ struct TSchemeShard::TTxOperationPlanStep: public NTabletFlatExecutor::TTransact } TOperationContext context{Self, txc, ctx, OnComplete, MemChanges, DbChanges}; - THolder<TEvPrivate::TEvOperationPlan> msg = MakeHolder<TEvPrivate::TEvOperationPlan>(ui64(step), ui64(txId)); + THolder<TEvPrivate::TEvOperationPlan> msg = MakeHolder<TEvPrivate::TEvOperationPlan>(ui64(step), ui64(txId)); TEvPrivate::TEvOperationPlan::TPtr personalEv = (TEventHandle<TEvPrivate::TEvOperationPlan>*) new IEventHandle( context.SS->SelfId(), context.SS->SelfId(), msg.Release()); diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_alter_bsv.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_alter_bsv.cpp index 9e947711f5..27455e4627 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_alter_bsv.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_alter_bsv.cpp @@ -39,13 +39,13 @@ class TAlterBlockStoreVolume: public TSubOperation { switch(state) { case TTxState::Waiting: case TTxState::CreateParts: - return THolder(new TCreateParts(OperationId)); + return THolder(new TCreateParts(OperationId)); case TTxState::ConfigureParts: - return THolder(new NBSVState::TConfigureParts(OperationId)); + return THolder(new NBSVState::TConfigureParts(OperationId)); case TTxState::Propose: - return THolder(new NBSVState::TPropose(OperationId)); + return THolder(new NBSVState::TPropose(OperationId)); case TTxState::Done: - return THolder(new TDone(OperationId)); + return THolder(new TDone(OperationId)); default: return nullptr; } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_alter_extsubdomain.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_alter_extsubdomain.cpp index 2a208ea567..463f3bb3cf 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_alter_extsubdomain.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_alter_extsubdomain.cpp @@ -64,13 +64,13 @@ class TAlterExtSubDomain: public TSubOperation { switch(state) { case TTxState::Waiting: case TTxState::CreateParts: - return THolder(new TCreateParts(OperationId)); + return THolder(new TCreateParts(OperationId)); case TTxState::ConfigureParts: - return THolder(new NSubDomainState::TConfigureParts(OperationId)); + return THolder(new NSubDomainState::TConfigureParts(OperationId)); case TTxState::Propose: - return THolder(new NSubDomainState::TPropose(OperationId)); + return THolder(new NSubDomainState::TPropose(OperationId)); case TTxState::Done: - return THolder(new TDone(OperationId)); + return THolder(new TDone(OperationId)); default: return nullptr; } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_alter_index.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_alter_index.cpp index da730e90d1..10688f0991 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_alter_index.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_alter_index.cpp @@ -91,9 +91,9 @@ class TAlterTableIndex: public TSubOperation { TSubOperationState::TPtr SelectStateFunc(TTxState::ETxState state) { switch(state) { case TTxState::Propose: - return THolder(new TPropose(OperationId)); + return THolder(new TPropose(OperationId)); case TTxState::Done: - return THolder(new TDone(OperationId)); + return THolder(new TDone(OperationId)); default: return nullptr; } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_alter_kesus.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_alter_kesus.cpp index 9b274e1e9c..38e5f74777 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_alter_kesus.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_alter_kesus.cpp @@ -238,9 +238,9 @@ class TAlterKesus: public TSubOperation { switch(state) { case TTxState::Waiting: case TTxState::ConfigureParts: - return THolder(new TConfigureParts(OperationId)); + return THolder(new TConfigureParts(OperationId)); case TTxState::Propose: - return THolder(new TPropose(OperationId)); + return THolder(new TPropose(OperationId)); default: return nullptr; } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_alter_pq.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_alter_pq.cpp index 640bd72fdb..f7a47459b9 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_alter_pq.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_alter_pq.cpp @@ -39,13 +39,13 @@ class TAlterPQ: public TSubOperation { switch(state) { case TTxState::Waiting: case TTxState::CreateParts: - return THolder(new TCreateParts(OperationId)); + return THolder(new TCreateParts(OperationId)); case TTxState::ConfigureParts: - return THolder(new NPQState::TConfigureParts(OperationId)); + return THolder(new NPQState::TConfigureParts(OperationId)); case TTxState::Propose: - return THolder(new NPQState::TPropose(OperationId)); + return THolder(new NPQState::TPropose(OperationId)); case TTxState::Done: - return THolder(new TDone(OperationId)); + return THolder(new TDone(OperationId)); default: return nullptr; } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_alter_solomon.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_alter_solomon.cpp index f8c80077fd..1c17ee6095 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_alter_solomon.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_alter_solomon.cpp @@ -161,13 +161,13 @@ class TAlterSolomon: public TSubOperation { switch(state) { case TTxState::Waiting: case TTxState::CreateParts: - return MakeHolder<TCreateParts>(OperationId); + return MakeHolder<TCreateParts>(OperationId); case TTxState::ConfigureParts: - return MakeHolder<TConfigureParts>(OperationId); + return MakeHolder<TConfigureParts>(OperationId); case TTxState::Propose: - return MakeHolder<TPropose>(OperationId); + return MakeHolder<TPropose>(OperationId); case TTxState::Done: - return MakeHolder<TDone>(OperationId); + return MakeHolder<TDone>(OperationId); default: return nullptr; } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_alter_subdomain.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_alter_subdomain.cpp index a3cf2a6321..dc1208bbb9 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_alter_subdomain.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_alter_subdomain.cpp @@ -64,13 +64,13 @@ class TAlterSubDomain: public TSubOperation { switch(state) { case TTxState::Waiting: case TTxState::CreateParts: - return THolder(new TCreateParts(OperationId)); + return THolder(new TCreateParts(OperationId)); case TTxState::ConfigureParts: - return THolder(new NSubDomainState::TConfigureParts(OperationId)); + return THolder(new NSubDomainState::TConfigureParts(OperationId)); case TTxState::Propose: - return THolder(new NSubDomainState::TPropose(OperationId)); + return THolder(new NSubDomainState::TPropose(OperationId)); case TTxState::Done: - return THolder(new TDone(OperationId)); + return THolder(new TDone(OperationId)); default: return nullptr; } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_alter_table.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_alter_table.cpp index 9269a6eef0..b6c0b6c8b2 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_alter_table.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_alter_table.cpp @@ -273,7 +273,7 @@ public: auto seqNo = context.SS->StartRound(*txState); TString txBody = context.SS->FillAlterTableTxBody(txState->TargetPathId, idx, seqNo); THolder<TEvDataShard::TEvProposeTransaction> event = - MakeHolder<TEvDataShard::TEvProposeTransaction>(NKikimrTxDataShard::TX_KIND_SCHEME, + MakeHolder<TEvDataShard::TEvProposeTransaction>(NKikimrTxDataShard::TX_KIND_SCHEME, ui64(ssId), //owner schemeshard tablet id context.Ctx.SelfID, ui64(OperationId.GetTxId()), @@ -423,15 +423,15 @@ private: switch(state) { case TTxState::Waiting: case TTxState::CreateParts: - return THolder(new TCreateParts(OperationId)); + return THolder(new TCreateParts(OperationId)); case TTxState::ConfigureParts: - return THolder(new TConfigureParts(OperationId)); + return THolder(new TConfigureParts(OperationId)); case TTxState::Propose: - return THolder(new TPropose(OperationId)); + return THolder(new TPropose(OperationId)); case TTxState::ProposedWaitParts: - return THolder(new NTableState::TProposedWaitParts(OperationId)); + return THolder(new NTableState::TProposedWaitParts(OperationId)); case TTxState::Done: - return THolder(new TDone(OperationId)); + return THolder(new TDone(OperationId)); default: return nullptr; } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_backup_restore_common.h b/ydb/core/tx/schemeshard/schemeshard__operation_backup_restore_common.h index 10e41aed6b..640f5f1356 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_backup_restore_common.h +++ b/ydb/core/tx/schemeshard/schemeshard__operation_backup_restore_common.h @@ -496,7 +496,7 @@ class TBackupRestoreOperationBase: public TSubOperation { switch(state) { case TTxState::Waiting: case TTxState::CreateParts: - return THolder(new TCreateParts(OperationId)); + return THolder(new TCreateParts(OperationId)); case TTxState::ConfigureParts: return THolder(new TConfigurePart<TKind>(TxType, OperationId)); case TTxState::Propose: @@ -506,7 +506,7 @@ class TBackupRestoreOperationBase: public TSubOperation { case TTxState::Aborting: return THolder(new TAborting<TKind, TEvCancel>(TxType, OperationId)); case TTxState::Done: - return THolder(new TDone(OperationId)); + return THolder(new TDone(OperationId)); default: return nullptr; } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_common.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_common.cpp index 137792c801..5a88636ffa 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_common.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_common.cpp @@ -204,7 +204,7 @@ void NTableState::AckAllSchemaChanges(const TOperationId &operationId, TTxState << ", at schemeshard: " << ssId); THolder<TEvDataShard::TEvSchemaChangedResult> event = - THolder(new TEvDataShard::TEvSchemaChangedResult()); + THolder(new TEvDataShard::TEvSchemaChangedResult()); event->Record.SetTxId(ui64(operationId.GetTxId())); context.OnComplete.Send(ackTo, std::move(event), ui64(shardIdx.GetLocalId())); diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_common.h b/ydb/core/tx/schemeshard/schemeshard__operation_common.h index 497c7822d7..5a3da32cad 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_common.h +++ b/ydb/core/tx/schemeshard/schemeshard__operation_common.h @@ -667,7 +667,7 @@ public: } } - THolder<TEvHive::TEvCreateTablet> ev = MakeHolder<TEvHive::TEvCreateTablet>(ui64(shardIdx.GetOwnerId()), ui64(shardIdx.GetLocalId()), shard.TabletType, shard.BindedChannels); + THolder<TEvHive::TEvCreateTablet> ev = MakeHolder<TEvHive::TEvCreateTablet>(ui64(shardIdx.GetOwnerId()), ui64(shardIdx.GetLocalId()), shard.TabletType, shard.BindedChannels); TPathId domainId = context.SS->ResolveDomainId(targetPath); @@ -734,7 +734,7 @@ public: auto& adoptedShard = context.SS->AdoptedShards[shardIdx]; auto& shard = context.SS->ShardInfos[shardIdx]; - THolder<TEvHive::TEvAdoptTablet> ev = MakeHolder<TEvHive::TEvAdoptTablet>( + THolder<TEvHive::TEvAdoptTablet> ev = MakeHolder<TEvHive::TEvAdoptTablet>( ui64(shard.TabletID), adoptedShard.PrevOwner, ui64(adoptedShard.PrevShardIdx), shard.TabletType, diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_copy_table.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_copy_table.cpp index cd28a92261..f504c34ef5 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_copy_table.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_copy_table.cpp @@ -102,13 +102,13 @@ public: Y_PROTOBUF_SUPPRESS_NODISCARD newShardTx.SerializeToString(&txBody); THolder<TEvDataShard::TEvProposeTransaction> dstEvent = - THolder(new TEvDataShard::TEvProposeTransaction(NKikimrTxDataShard::TX_KIND_SCHEME, + THolder(new TEvDataShard::TEvProposeTransaction(NKikimrTxDataShard::TX_KIND_SCHEME, context.SS->TabletID(), subDomainPathId, context.Ctx.SelfID, ui64(OperationId.GetTxId()), txBody, - context.SS->SelectProcessingPrarams(txState->TargetPathId))); + context.SS->SelectProcessingPrarams(txState->TargetPathId))); context.OnComplete.BindMsgToPipe(OperationId, dstDatashardId, dstShardIdx, dstEvent.Release()); // Send "SendParts" transaction to source datashard @@ -122,12 +122,12 @@ public: txBody.clear(); Y_PROTOBUF_SUPPRESS_NODISCARD oldShardTx.SerializeToString(&txBody); THolder<TEvDataShard::TEvProposeTransaction> srcEvent = - THolder(new TEvDataShard::TEvProposeTransaction(NKikimrTxDataShard::TX_KIND_SCHEME, + THolder(new TEvDataShard::TEvProposeTransaction(NKikimrTxDataShard::TX_KIND_SCHEME, context.SS->TabletID(), context.Ctx.SelfID, ui64(OperationId.GetTxId()), txBody, - context.SS->SelectProcessingPrarams(txState->TargetPathId))); + context.SS->SelectProcessingPrarams(txState->TargetPathId))); context.OnComplete.BindMsgToPipe(OperationId, srcDatashardId, srcShardIdx, srcEvent.Release()); } @@ -259,15 +259,15 @@ class TCopyTable: public TSubOperation { switch(state) { case TTxState::Waiting: case TTxState::CreateParts: - return THolder(new TCreateParts(OperationId)); + return THolder(new TCreateParts(OperationId)); case TTxState::ConfigureParts: - return THolder(new TConfigureParts(OperationId)); + return THolder(new TConfigureParts(OperationId)); case TTxState::Propose: - return THolder(new TPropose(OperationId)); + return THolder(new TPropose(OperationId)); case TTxState::ProposedWaitParts: - return THolder(new NTableState::TProposedWaitParts(OperationId)); + return THolder(new NTableState::TProposedWaitParts(OperationId)); case TTxState::Done: - return THolder(new TDone(OperationId)); + return THolder(new TDone(OperationId)); default: return nullptr; } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_backup.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_backup.cpp index 011a8a8d5c..4c0c967af0 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_create_backup.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_create_backup.cpp @@ -37,12 +37,12 @@ struct TBackup { TString txBody = context.SS->FillBackupTxBody(txState.TargetPathId, backup, i, seqNo); THolder<TEvDataShard::TEvProposeTransaction> event = - THolder(new TEvDataShard::TEvProposeTransaction(NKikimrTxDataShard::TX_KIND_SCHEME, + THolder(new TEvDataShard::TEvProposeTransaction(NKikimrTxDataShard::TX_KIND_SCHEME, context.SS->TabletID(), context.Ctx.SelfID, ui64(opId.GetTxId()), txBody, - processingParams)); + processingParams)); context.OnComplete.BindMsgToPipe(opId, datashardId, idx, event.Release()); diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_bsv.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_bsv.cpp index e31ee9f893..b32fb7d969 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_create_bsv.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_create_bsv.cpp @@ -173,13 +173,13 @@ class TCreateBlockStoreVolume: public TSubOperation { switch(state) { case TTxState::Waiting: case TTxState::CreateParts: - return MakeHolder<TCreateParts>(OperationId); + return MakeHolder<TCreateParts>(OperationId); case TTxState::ConfigureParts: - return MakeHolder<NBSVState::TConfigureParts>(OperationId); + return MakeHolder<NBSVState::TConfigureParts>(OperationId); case TTxState::Propose: - return MakeHolder<NBSVState::TPropose>(OperationId); + return MakeHolder<NBSVState::TPropose>(OperationId); case TTxState::Done: - return MakeHolder<TDone>(OperationId); + return MakeHolder<TDone>(OperationId); default: return nullptr; } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_extsubdomain.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_extsubdomain.cpp index 8c29ab5dc4..9b6b9a4960 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_create_extsubdomain.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_create_extsubdomain.cpp @@ -35,9 +35,9 @@ class TCreateExtSubDomain: public TSubOperation { switch(state) { case TTxState::Waiting: case TTxState::Propose: - return THolder(new NSubDomainState::TPropose(OperationId)); + return THolder(new NSubDomainState::TPropose(OperationId)); case TTxState::Done: - return THolder(new TDone(OperationId)); + return THolder(new TDone(OperationId)); default: return nullptr; } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_index.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_index.cpp index 9a512bc5ef..4713823eef 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_create_index.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_create_index.cpp @@ -93,9 +93,9 @@ class TCreateTableIndex: public TSubOperation { TSubOperationState::TPtr SelectStateFunc(TTxState::ETxState state) { switch(state) { case TTxState::Propose: - return THolder(new TPropose(OperationId)); + return THolder(new TPropose(OperationId)); case TTxState::Done: - return THolder(new TDone(OperationId)); + return THolder(new TDone(OperationId)); default: return nullptr; } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_kesus.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_kesus.cpp index 43f5a97dc4..c974b72c31 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_create_kesus.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_create_kesus.cpp @@ -278,13 +278,13 @@ class TCreateKesus: public TSubOperation { switch(state) { case TTxState::Waiting: case TTxState::CreateParts: - return THolder(new TCreateParts(OperationId)); + return THolder(new TCreateParts(OperationId)); case TTxState::ConfigureParts: - return THolder(new TConfigureParts(OperationId)); + return THolder(new TConfigureParts(OperationId)); case TTxState::Propose: - return THolder(new TPropose(OperationId)); + return THolder(new TPropose(OperationId)); case TTxState::Done: - return THolder(new TDone(OperationId)); + return THolder(new TDone(OperationId)); default: return nullptr; } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_lock.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_lock.cpp index ac85feeb1d..16ff55eaa6 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_create_lock.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_create_lock.cpp @@ -36,7 +36,7 @@ class TCreateLockForIndexBuild: public TSubOperation { switch(state) { case TTxState::Waiting: case TTxState::Done: - return THolder(new TDone(OperationId)); + return THolder(new TDone(OperationId)); default: return nullptr; } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_pq.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_pq.cpp index a53709231b..992fd3175c 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_create_pq.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_create_pq.cpp @@ -246,13 +246,13 @@ class TCreatePQ: public TSubOperation { switch(state) { case TTxState::Waiting: case TTxState::CreateParts: - return THolder(new TCreateParts(OperationId)); + return THolder(new TCreateParts(OperationId)); case TTxState::ConfigureParts: - return THolder(new NPQState::TConfigureParts(OperationId)); + return THolder(new NPQState::TConfigureParts(OperationId)); case TTxState::Propose: - return THolder(new NPQState::TPropose(OperationId)); + return THolder(new NPQState::TPropose(OperationId)); case TTxState::Done: - return THolder(new TDone(OperationId)); + return THolder(new TDone(OperationId)); default: return nullptr; } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_rtmr.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_rtmr.cpp index 0bd21e4673..648fcd3c4d 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_create_rtmr.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_create_rtmr.cpp @@ -196,13 +196,13 @@ class TCreateRTMR: public TSubOperation { switch(state) { case TTxState::Waiting: case TTxState::CreateParts: - return THolder(new TCreateParts(OperationId)); + return THolder(new TCreateParts(OperationId)); case TTxState::ConfigureParts: - return THolder(new TConfigureParts(OperationId)); + return THolder(new TConfigureParts(OperationId)); case TTxState::Propose: - return THolder(new TPropose(OperationId)); + return THolder(new TPropose(OperationId)); case TTxState::Done: - return THolder(new TDone(OperationId)); + return THolder(new TDone(OperationId)); default: return nullptr; } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_solomon.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_solomon.cpp index bab15c368f..a821169854 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_create_solomon.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_create_solomon.cpp @@ -231,13 +231,13 @@ class TCreateSolomon: public TSubOperation { switch(state) { case TTxState::Waiting: case TTxState::CreateParts: - return THolder(new TCreateParts(OperationId)); + return THolder(new TCreateParts(OperationId)); case TTxState::ConfigureParts: - return THolder(new TConfigureParts(OperationId)); + return THolder(new TConfigureParts(OperationId)); case TTxState::Propose: - return THolder(new TPropose(OperationId)); + return THolder(new TPropose(OperationId)); case TTxState::Done: - return THolder(new TDone(OperationId)); + return THolder(new TDone(OperationId)); default: return nullptr; } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_subdomain.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_subdomain.cpp index 1a37749630..b46d7015cc 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_create_subdomain.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_create_subdomain.cpp @@ -62,13 +62,13 @@ class TCreateSubDomain: public TSubOperation { switch(state) { case TTxState::Waiting: case TTxState::CreateParts: - return THolder(new TCreateParts(OperationId)); + return THolder(new TCreateParts(OperationId)); case TTxState::ConfigureParts: - return THolder(new NSubDomainState::TConfigureParts(OperationId)); + return THolder(new NSubDomainState::TConfigureParts(OperationId)); case TTxState::Propose: - return THolder(new NSubDomainState::TPropose(OperationId)); + return THolder(new NSubDomainState::TPropose(OperationId)); case TTxState::Done: - return THolder(new TDone(OperationId)); + return THolder(new TDone(OperationId)); default: return nullptr; } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_table.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_table.cpp index af61c68389..5004522529 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_create_table.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_create_table.cpp @@ -194,13 +194,13 @@ public: Y_PROTOBUF_SUPPRESS_NODISCARD tx.SerializeToString(&txBody); THolder<TEvDataShard::TEvProposeTransaction> event = - THolder(new TEvDataShard::TEvProposeTransaction(NKikimrTxDataShard::TX_KIND_SCHEME, + THolder(new TEvDataShard::TEvProposeTransaction(NKikimrTxDataShard::TX_KIND_SCHEME, context.SS->TabletID(), subDomainPathId, context.Ctx.SelfID, ui64(OperationId.GetTxId()), txBody, - context.SS->SelectProcessingPrarams(txState->TargetPathId))); + context.SS->SelectProcessingPrarams(txState->TargetPathId))); LOG_DEBUG_S(context.Ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, DebugHint() << " ProgressState" @@ -350,15 +350,15 @@ class TCreateTable: public TSubOperation { switch(state) { case TTxState::Waiting: case TTxState::CreateParts: - return THolder(new TCreateParts(OperationId)); + return THolder(new TCreateParts(OperationId)); case TTxState::ConfigureParts: - return THolder(new TConfigureParts(OperationId)); + return THolder(new TConfigureParts(OperationId)); case TTxState::Propose: - return THolder(new TPropose(OperationId)); + return THolder(new TPropose(OperationId)); case TTxState::ProposedWaitParts: - return THolder(new NTableState::TProposedWaitParts(OperationId)); + return THolder(new NTableState::TProposedWaitParts(OperationId)); case TTxState::Done: - return THolder(new TDone(OperationId)); + return THolder(new TDone(OperationId)); default: return nullptr; } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_drop_bsv.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_drop_bsv.cpp index 304849c9dd..e6f0322026 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_drop_bsv.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_drop_bsv.cpp @@ -164,9 +164,9 @@ class TDropBlockStoreVolume: public TSubOperation { switch(state) { case TTxState::Waiting: case TTxState::DeleteParts: - return THolder(new TDeleteParts(OperationId)); + return THolder(new TDeleteParts(OperationId)); case TTxState::Propose: - return THolder(new TPropose(OperationId)); + return THolder(new TPropose(OperationId)); default: return nullptr; } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_drop_extsubdomain.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_drop_extsubdomain.cpp index c5d7518832..c33f76ca93 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_drop_extsubdomain.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_drop_extsubdomain.cpp @@ -237,13 +237,13 @@ class TDropExtSubdomain: public TSubOperation { switch(state) { case TTxState::Waiting: case TTxState::Propose: - return THolder(new TPropose(OperationId)); + return THolder(new TPropose(OperationId)); case TTxState::DeleteExternalShards: - return THolder(new TDeleteExternalShards(OperationId)); + return THolder(new TDeleteExternalShards(OperationId)); case TTxState::DeletePrivateShards: - return THolder(new TDeletePrivateShards(OperationId)); + return THolder(new TDeletePrivateShards(OperationId)); case TTxState::Done: - return THolder(new TDone(OperationId)); + return THolder(new TDone(OperationId)); default: return nullptr; } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_drop_index.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_drop_index.cpp index 6929d5ad45..a84868b77b 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_drop_index.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_drop_index.cpp @@ -113,12 +113,12 @@ public: auto datashardId = context.SS->ShardInfos[idx].TabletID; THolder<TEvDataShard::TEvProposeTransaction> event = - THolder(new TEvDataShard::TEvProposeTransaction(NKikimrTxDataShard::TX_KIND_SCHEME, + THolder(new TEvDataShard::TEvProposeTransaction(NKikimrTxDataShard::TX_KIND_SCHEME, context.SS->TabletID(), context.Ctx.SelfID, ui64(OperationId.GetTxId()), txBody, - context.SS->SelectProcessingPrarams(txState->TargetPathId))); + context.SS->SelectProcessingPrarams(txState->TargetPathId))); context.OnComplete.BindMsgToPipe(OperationId, datashardId, idx, event.Release()); } @@ -243,13 +243,13 @@ private: switch(state) { case TTxState::Waiting: case TTxState::ConfigureParts: - return THolder(new TConfigureParts(OperationId)); + return THolder(new TConfigureParts(OperationId)); case TTxState::Propose: - return THolder(new TPropose(OperationId)); + return THolder(new TPropose(OperationId)); case TTxState::ProposedWaitParts: - return THolder(new NTableState::TProposedWaitParts(OperationId)); + return THolder(new NTableState::TProposedWaitParts(OperationId)); case TTxState::Done: - return THolder(new TDone(OperationId)); + return THolder(new TDone(OperationId)); default: return nullptr; } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_drop_indexed_table.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_drop_indexed_table.cpp index 7d1c73dbc8..7064fabe1e 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_drop_indexed_table.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_drop_indexed_table.cpp @@ -282,7 +282,7 @@ class TDropTableIndex: public TSubOperation { case TTxState::DeletePathBarrier: return THolder(new TDeletePathBarrier(OperationId)); case TTxState::Done: - return THolder(new TDone(OperationId)); + return THolder(new TDone(OperationId)); default: return nullptr; } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_drop_kesus.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_drop_kesus.cpp index 19ebaa7904..ad42e96de5 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_drop_kesus.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_drop_kesus.cpp @@ -159,9 +159,9 @@ class TDropKesus: public TSubOperation { switch(state) { case TTxState::Waiting: case TTxState::DeleteParts: - return THolder(new TDeleteParts(OperationId)); + return THolder(new TDeleteParts(OperationId)); case TTxState::Propose: - return THolder(new TPropose(OperationId)); + return THolder(new TPropose(OperationId)); default: return nullptr; } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_drop_lock.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_drop_lock.cpp index 1629485586..6fc10d0495 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_drop_lock.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_drop_lock.cpp @@ -35,7 +35,7 @@ class TDropLock: public TSubOperation { switch(state) { case TTxState::Waiting: case TTxState::Done: - return MakeHolder<TDone>(OperationId); + return MakeHolder<TDone>(OperationId); default: return nullptr; } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_drop_pq.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_drop_pq.cpp index a303a98e4c..c338b4c358 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_drop_pq.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_drop_pq.cpp @@ -294,11 +294,11 @@ class TDropPQ: public TSubOperation { switch(state) { case TTxState::Waiting: case TTxState::DropParts: - return THolder(new TDropParts(OperationId)); + return THolder(new TDropParts(OperationId)); case TTxState::DeleteParts: - return THolder(new TDeleteParts(OperationId)); + return THolder(new TDeleteParts(OperationId)); case TTxState::Propose: - return THolder(new TPropose(OperationId)); + return THolder(new TPropose(OperationId)); case TTxState::Done: return THolder(new TDone(OperationId)); default: diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_drop_solomon.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_drop_solomon.cpp index a873437119..bdd9f953d4 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_drop_solomon.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_drop_solomon.cpp @@ -143,9 +143,9 @@ class TDropSolomon: public TSubOperation { switch(state) { case TTxState::Waiting: case TTxState::Propose: - return THolder(new TPropose(OperationId)); + return THolder(new TPropose(OperationId)); case TTxState::ProposedDeleteParts: - return THolder(new TDeleteParts(OperationId)); + return THolder(new TDeleteParts(OperationId)); default: return nullptr; } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_drop_subdomain.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_drop_subdomain.cpp index bbdb4b6d8c..832fd1df70 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_drop_subdomain.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_drop_subdomain.cpp @@ -138,9 +138,9 @@ class TDropSubdomain: public TSubOperation { switch(state) { case TTxState::Waiting: case TTxState::Propose: - return THolder(new TPropose(OperationId)); + return THolder(new TPropose(OperationId)); case TTxState::ProposedDeleteParts: - return THolder(new TDeleteParts(OperationId)); + return THolder(new TDeleteParts(OperationId)); default: return nullptr; } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_drop_table.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_drop_table.cpp index 98abc9f77c..45730be409 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_drop_table.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_drop_table.cpp @@ -131,7 +131,7 @@ public: auto datashardId = context.SS->ShardInfos[idx].TabletID; THolder<TEvDataShard::TEvProposeTransaction> event = - MakeHolder<TEvDataShard::TEvProposeTransaction>(NKikimrTxDataShard::TX_KIND_SCHEME, + MakeHolder<TEvDataShard::TEvProposeTransaction>(NKikimrTxDataShard::TX_KIND_SCHEME, context.SS->TabletID(), context.Ctx.SelfID, ui64(OperationId.GetTxId()), @@ -413,7 +413,7 @@ public: << " repeated message, ack it anyway" << " at tablet: " << ssId); - THolder<TEvDataShard::TEvSchemaChangedResult> event = MakeHolder<TEvDataShard::TEvSchemaChangedResult>(); + THolder<TEvDataShard::TEvSchemaChangedResult> event = MakeHolder<TEvDataShard::TEvSchemaChangedResult>(); event->Record.SetTxId(ui64(OperationId.GetTxId())); context.OnComplete.Send(ackTo, std::move(event)); @@ -478,7 +478,7 @@ private: switch(state) { case TTxState::Waiting: case TTxState::DropParts: - return MakeHolder<TDropParts>(OperationId); + return MakeHolder<TDropParts>(OperationId); case TTxState::Propose: return MakeHolder<TPropose>(OperationId, AfterPropose); case TTxState::WaitShadowPathPublication: @@ -486,10 +486,10 @@ private: case TTxState::DeletePathBarrier: return MakeHolder<TDeleteTableBarrier>(OperationId); case TTxState::ProposedWaitParts: - return MakeHolder<NTableState::TProposedWaitParts>(OperationId); + return MakeHolder<NTableState::TProposedWaitParts>(OperationId); case TTxState::Done: case TTxState::ProposedDeleteParts: - return MakeHolder<TProposedDeletePart>(OperationId); + return MakeHolder<TProposedDeletePart>(OperationId); default: return nullptr; } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_drop_unsafe.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_drop_unsafe.cpp index 0e778f8f83..a1a9f2ccfd 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_drop_unsafe.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_drop_unsafe.cpp @@ -146,9 +146,9 @@ class TDropForceUnsafe: public TSubOperation { switch(state) { case TTxState::Waiting: case TTxState::Propose: - return MakeHolder<TPropose>(OperationId); + return MakeHolder<TPropose>(OperationId); case TTxState::ProposedDeleteParts: - return MakeHolder<TProposedDeletePart>(OperationId); + return MakeHolder<TProposedDeletePart>(OperationId); default: return nullptr; } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_finalize_build_index.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_finalize_build_index.cpp index 5656cbce7e..fe4d116416 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_finalize_build_index.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_finalize_build_index.cpp @@ -92,12 +92,12 @@ public: THolder<TEvDataShard::TEvProposeTransaction> event = - THolder(new TEvDataShard::TEvProposeTransaction(NKikimrTxDataShard::TX_KIND_SCHEME, + THolder(new TEvDataShard::TEvProposeTransaction(NKikimrTxDataShard::TX_KIND_SCHEME, context.SS->TabletID(), context.Ctx.SelfID, ui64(OperationId.GetTxId()), txBody, - context.SS->SelectProcessingPrarams(txState->TargetPathId))); + context.SS->SelectProcessingPrarams(txState->TargetPathId))); context.OnComplete.BindMsgToPipe(OperationId, datashardId, shardIdx, event.Release()); } @@ -279,15 +279,15 @@ class TFinalizeBuildIndex: public TSubOperation { switch(state) { case TTxState::Waiting: case TTxState::CreateParts: - return THolder(new TCreateTxShards(OperationId)); + return THolder(new TCreateTxShards(OperationId)); case TTxState::ConfigureParts: - return THolder(new TConfigureParts(OperationId)); + return THolder(new TConfigureParts(OperationId)); case TTxState::Propose: - return THolder(new TPropose(OperationId)); + return THolder(new TPropose(OperationId)); case TTxState::ProposedWaitParts: - return THolder(new NTableState::TProposedWaitParts(OperationId)); + return THolder(new NTableState::TProposedWaitParts(OperationId)); case TTxState::Done: - return THolder(new TDone(OperationId)); + return THolder(new TDone(OperationId)); default: return nullptr; } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_initiate_build_index.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_initiate_build_index.cpp index 8540ea83b3..f8d5ca96c6 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_initiate_build_index.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_initiate_build_index.cpp @@ -115,12 +115,12 @@ public: THolder<TEvDataShard::TEvProposeTransaction> event = - THolder(new TEvDataShard::TEvProposeTransaction(NKikimrTxDataShard::TX_KIND_SCHEME, + THolder(new TEvDataShard::TEvProposeTransaction(NKikimrTxDataShard::TX_KIND_SCHEME, context.SS->TabletID(), context.Ctx.SelfID, ui64(OperationId.GetTxId()), txBody, - context.SS->SelectProcessingPrarams(txState->TargetPathId))); + context.SS->SelectProcessingPrarams(txState->TargetPathId))); context.OnComplete.BindMsgToPipe(OperationId, datashardId, shardIdx, event.Release()); } @@ -293,15 +293,15 @@ class TInitializeBuildIndex: public TSubOperation { switch(state) { case TTxState::Waiting: case TTxState::CreateParts: - return THolder(new TCreateTxShards(OperationId)); + return THolder(new TCreateTxShards(OperationId)); case TTxState::ConfigureParts: - return THolder(new TConfigureParts(OperationId)); + return THolder(new TConfigureParts(OperationId)); case TTxState::Propose: - return THolder(new TPropose(OperationId)); + return THolder(new TPropose(OperationId)); case TTxState::ProposedWaitParts: - return THolder(new NTableState::TProposedWaitParts(OperationId)); + return THolder(new NTableState::TProposedWaitParts(OperationId)); case TTxState::Done: - return THolder(new TDone(OperationId)); + return THolder(new TDone(OperationId)); default: return nullptr; } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_mkdir.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_mkdir.cpp index ca0343e33a..a2afe4741a 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_mkdir.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_mkdir.cpp @@ -94,9 +94,9 @@ class TMkDir: public TSubOperation { switch(state) { case TTxState::Waiting: case TTxState::Propose: - return THolder(new TPropose(OperationId)); + return THolder(new TPropose(OperationId)); case TTxState::Done: - return THolder(new TDone(OperationId)); + return THolder(new TDone(OperationId)); default: return nullptr; } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_split_merge.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_split_merge.cpp index a3d82644a1..645d7f37e1 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_split_merge.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_split_merge.cpp @@ -149,10 +149,10 @@ public: Y_VERIFY(txState->SplitDescription); THolder<TEvDataShard::TEvInitSplitMergeDestination> event = - THolder(new TEvDataShard::TEvInitSplitMergeDestination(ui64(OperationId.GetTxId()), context.SS->TabletID(), + THolder(new TEvDataShard::TEvInitSplitMergeDestination(ui64(OperationId.GetTxId()), context.SS->TabletID(), subDomainPathId, splitDescForShard, - context.SS->SelectProcessingPrarams(txState->TargetPathId))); + context.SS->SelectProcessingPrarams(txState->TargetPathId))); // Add a new-style CreateTable with correct per-shard settings // WARNING: legacy datashard will ignore this and use the schema @@ -326,7 +326,7 @@ public: << " at tablet " << context.SS->TabletID()); THolder<TEvDataShard::TEvSplit> event = - THolder(new TEvDataShard::TEvSplit(ui64(OperationId.GetTxId()))); + THolder(new TEvDataShard::TEvSplit(ui64(OperationId.GetTxId()))); Y_VERIFY(txState->SplitDescription); event->Record.MutableSplitDescription()->CopyFrom(*txState->SplitDescription); @@ -441,7 +441,7 @@ public: "Notify src datashard %" PRIu64 " on partitioning changed splitOp# %" PRIu64 " at tablet %" PRIu64, datashardId, OperationId.GetTxId(), context.SS->TabletID()); - THolder<TEvDataShard::TEvSplitPartitioningChanged> event = MakeHolder<TEvDataShard::TEvSplitPartitioningChanged>(ui64(OperationId.GetTxId())); + THolder<TEvDataShard::TEvSplitPartitioningChanged> event = MakeHolder<TEvDataShard::TEvSplitPartitioningChanged>(ui64(OperationId.GetTxId())); context.OnComplete.BindMsgToPipe(OperationId, datashardId, shard.Idx, event.Release()); @@ -489,13 +489,13 @@ private: TSubOperationState::TPtr SelectStateFunc(TTxState::ETxState state) { switch(state) { case TTxState::CreateParts: - return THolder(new TCreateParts(OperationId)); + return THolder(new TCreateParts(OperationId)); case TTxState::ConfigureParts: - return THolder(new TConfigureDestination(OperationId)); + return THolder(new TConfigureDestination(OperationId)); case TTxState::TransferData: - return THolder(new TTranserData(OperationId)); + return THolder(new TTranserData(OperationId)); case TTxState::NotifyPartitioningChanged: - return THolder(new TNotifySrc(OperationId)); + return THolder(new TNotifySrc(OperationId)); default: return nullptr; } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_upgrade_subdomain.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_upgrade_subdomain.cpp index 196cd776aa..ad9c6808fc 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_upgrade_subdomain.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_upgrade_subdomain.cpp @@ -1084,25 +1084,25 @@ private: TSubOperationState::TPtr SelectStateFunc(TTxState::ETxState state) { switch(state) { case TTxState::Waiting: - return THolder(new TWait(OperationId)); + return THolder(new TWait(OperationId)); case TTxState::CreateParts: - return THolder(new TCreateParts(OperationId)); + return THolder(new TCreateParts(OperationId)); case TTxState::ConfigureParts: - return THolder(new TConfigure(OperationId)); + return THolder(new TConfigure(OperationId)); case TTxState::PublishTenantReadOnly: - return THolder(new TPublishTenantReadOnly(OperationId)); + return THolder(new TPublishTenantReadOnly(OperationId)); case TTxState::PublishGlobal: - return THolder(new TPublishGlobal(OperationId, UpgradeSubDomainDecision)); + return THolder(new TPublishGlobal(OperationId, UpgradeSubDomainDecision)); case TTxState::RewriteOwners: - return THolder(new TRewriteOwner(OperationId)); + return THolder(new TRewriteOwner(OperationId)); case TTxState::PublishTenant: - return THolder(new TPublishTenant(OperationId)); + return THolder(new TPublishTenant(OperationId)); case TTxState::DoneMigrateTree: - return THolder(new TDoneMigrateTree(OperationId)); + return THolder(new TDoneMigrateTree(OperationId)); case TTxState::DeleteTenantSS: - return THolder(new TDeleteTenantSS(OperationId)); + return THolder(new TDeleteTenantSS(OperationId)); default: return nullptr; @@ -1305,7 +1305,7 @@ public: TOperation::TPtr operation = context.SS->Operations.at(OperationId.GetTxId()); Y_VERIFY(operation->Parts.size()); - THolder<TEvPrivate::TEvUndoTenantUpdate> msg = MakeHolder<TEvPrivate::TEvUndoTenantUpdate>(); + THolder<TEvPrivate::TEvUndoTenantUpdate> msg = MakeHolder<TEvPrivate::TEvUndoTenantUpdate>(); TEvPrivate::TEvUndoTenantUpdate::TPtr personalEv = (TEventHandle<TEvPrivate::TEvUndoTenantUpdate>*) new IEventHandle( context.SS->SelfId(), context.SS->SelfId(), msg.Release()); operation->Parts.front()->HandleReply(personalEv, context); @@ -1381,7 +1381,7 @@ private: switch(state) { case TTxState::Waiting: case TTxState::Done: - return THolder(new TDecisionDone(OperationId)); + return THolder(new TDecisionDone(OperationId)); default: return nullptr; } @@ -1477,14 +1477,14 @@ public: switch (decision) { case NKikimrSchemeOp::TUpgradeSubDomain::Commit: { - THolder<TEvPrivate::TEvCommitTenantUpdate> msg = MakeHolder<TEvPrivate::TEvCommitTenantUpdate>(); + THolder<TEvPrivate::TEvCommitTenantUpdate> msg = MakeHolder<TEvPrivate::TEvCommitTenantUpdate>(); TEvPrivate::TEvCommitTenantUpdate::TPtr personalEv = (TEventHandle<TEvPrivate::TEvCommitTenantUpdate>*) new IEventHandle( context.SS->SelfId(), context.SS->SelfId(), msg.Release()); operation->Parts.front()->HandleReply(personalEv, context); break; } case NKikimrSchemeOp::TUpgradeSubDomain::Undo: { - THolder<TEvPrivate::TEvUndoTenantUpdate> msg = MakeHolder<TEvPrivate::TEvUndoTenantUpdate>(); + THolder<TEvPrivate::TEvUndoTenantUpdate> msg = MakeHolder<TEvPrivate::TEvUndoTenantUpdate>(); TEvPrivate::TEvUndoTenantUpdate::TPtr personalEv = (TEventHandle<TEvPrivate::TEvUndoTenantUpdate>*) new IEventHandle( context.SS->SelfId(), context.SS->SelfId(), msg.Release()); operation->Parts.front()->HandleReply(personalEv, context); diff --git a/ydb/core/tx/schemeshard/schemeshard__state_changed_reply.cpp b/ydb/core/tx/schemeshard/schemeshard__state_changed_reply.cpp index 14f1244faf..ffa6e34d50 100644 --- a/ydb/core/tx/schemeshard/schemeshard__state_changed_reply.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__state_changed_reply.cpp @@ -85,7 +85,7 @@ struct TSchemeShard::TTxShardStateChanged : public TSchemeShard::TRwTxBase { // Ack state change notification THolder<TEvDataShard::TEvStateChangedResult> event = - THolder(new TEvDataShard::TEvStateChangedResult(Self->TabletID(), state)); + THolder(new TEvDataShard::TEvStateChangedResult(Self->TabletID(), state)); SideEffects.Send(Ev->Get()->GetSource(), std::move(event)); if (state == NDataShard::TShardState::Offline) { diff --git a/ydb/core/tx/schemeshard/schemeshard_impl.cpp b/ydb/core/tx/schemeshard/schemeshard_impl.cpp index 052d0db5f5..0715543a22 100644 --- a/ydb/core/tx/schemeshard/schemeshard_impl.cpp +++ b/ydb/core/tx/schemeshard/schemeshard_impl.cpp @@ -4409,7 +4409,7 @@ void TSchemeShard::Handle(TEvDataShard::TEvSchemaChanged::TPtr& ev, const TActor << " message# " << ev->Get()->Record.DebugString()); THolder<TEvDataShard::TEvSchemaChangedResult> event = - THolder(new TEvDataShard::TEvSchemaChangedResult(ui64(txId))); + THolder(new TEvDataShard::TEvSchemaChangedResult(ui64(txId))); ctx.Send(ackTo, event.Release()); return; } @@ -4422,7 +4422,7 @@ void TSchemeShard::Handle(TEvDataShard::TEvSchemaChanged::TPtr& ev, const TActor << " message# " << ev->Get()->Record.DebugString()); THolder<TEvDataShard::TEvSchemaChangedResult> event = - THolder(new TEvDataShard::TEvSchemaChangedResult(ui64(txId))); + THolder(new TEvDataShard::TEvSchemaChangedResult(ui64(txId))); ctx.Send(ackTo, event.Release()); return; } diff --git a/ydb/core/tx/tx_proxy/read_table_impl.cpp b/ydb/core/tx/tx_proxy/read_table_impl.cpp index 40a4f087b6..6c30975fd9 100644 --- a/ydb/core/tx/tx_proxy/read_table_impl.cpp +++ b/ydb/core/tx/tx_proxy/read_table_impl.cpp @@ -301,7 +301,7 @@ public: WallClockAccepted = Now(); if (!Settings.UserToken.empty()) { - UserToken = MakeHolder<NACLib::TUserToken>(Settings.UserToken); + UserToken = MakeHolder<NACLib::TUserToken>(Settings.UserToken); } if (Settings.MaxRows > 0) { diff --git a/ydb/core/tx/tx_proxy/snapshotreq.cpp b/ydb/core/tx/tx_proxy/snapshotreq.cpp index 540f0efb80..4b2d7fe275 100644 --- a/ydb/core/tx/tx_proxy/snapshotreq.cpp +++ b/ydb/core/tx/tx_proxy/snapshotreq.cpp @@ -157,14 +157,14 @@ public: // Schedule execution timeout { - THolder<IEventHandle> wakeupEv = MakeHolder<IEventHandle>(ctx.SelfID, ctx.SelfID, new TEvents::TEvWakeup()); + THolder<IEventHandle> wakeupEv = MakeHolder<IEventHandle>(ctx.SelfID, ctx.SelfID, new TEvents::TEvWakeup()); ExecTimeoutCookieHolder.Reset(ISchedulerCookie::Make2Way()); CreateLongTimer(ctx, ExecTimeoutPeriod, wakeupEv, AppData(ctx)->SystemPoolId, ExecTimeoutCookieHolder.Get()); } if (!record.GetUserToken().empty()) { - UserToken = MakeHolder<NACLib::TUserToken>(record.GetUserToken()); + UserToken = MakeHolder<NACLib::TUserToken>(record.GetUserToken()); } const auto& tx = record.GetTransaction(); @@ -1190,14 +1190,14 @@ public: // Schedule execution timeout { - THolder<IEventHandle> wakeupEv = MakeHolder<IEventHandle>(ctx.SelfID, ctx.SelfID, new TEvents::TEvWakeup()); + THolder<IEventHandle> wakeupEv = MakeHolder<IEventHandle>(ctx.SelfID, ctx.SelfID, new TEvents::TEvWakeup()); ExecTimeoutCookieHolder.Reset(ISchedulerCookie::Make2Way()); CreateLongTimer(ctx, ExecTimeoutPeriod, wakeupEv, AppData(ctx)->SystemPoolId, ExecTimeoutCookieHolder.Get()); } if (!record.GetUserToken().empty()) { - UserToken = MakeHolder<NACLib::TUserToken>(record.GetUserToken()); + UserToken = MakeHolder<NACLib::TUserToken>(record.GetUserToken()); } const auto& tx = record.GetTransaction(); diff --git a/ydb/core/util/fast_tls.h b/ydb/core/util/fast_tls.h index 3b8c9492fb..af3c33a0ba 100644 --- a/ydb/core/util/fast_tls.h +++ b/ydb/core/util/fast_tls.h @@ -200,7 +200,7 @@ namespace NKikimr { TValueStorage* ptr = reinterpret_cast<TValueStorage*>(tls->Get(Key)); if (Y_UNLIKELY(!ptr)) { - THolder<TValueStorage> storage = MakeHolder<TValueStorage>(this, tls); + THolder<TValueStorage> storage = MakeHolder<TValueStorage>(this, tls); storage->Initialize(Key); ptr = storage.Release(); diff --git a/ydb/core/util/page_map_ut.cpp b/ydb/core/util/page_map_ut.cpp index 6bb969e96e..0fd8eef29d 100644 --- a/ydb/core/util/page_map_ut.cpp +++ b/ydb/core/util/page_map_ut.cpp @@ -25,8 +25,8 @@ Y_UNIT_TEST_SUITE(TPageMapTest) { UNIT_ASSERT_VALUES_EQUAL(map.size(), 1024u); UNIT_ASSERT_VALUES_EQUAL(map.used(), 0u); - UNIT_ASSERT(map.emplace(0, MakeHolder<TPage>(0))); - UNIT_ASSERT(map.emplace(1, MakeHolder<TPage>(1))); + UNIT_ASSERT(map.emplace(0, MakeHolder<TPage>(0))); + UNIT_ASSERT(map.emplace(1, MakeHolder<TPage>(1))); UNIT_ASSERT_VALUES_EQUAL(map.used(), 2u); for (ui32 id = 0; id < 2; ++id) { @@ -35,7 +35,7 @@ Y_UNIT_TEST_SUITE(TPageMapTest) { } for(ui32 id = 2; id < 1024; ++id) { UNIT_ASSERT(!map[id]); - UNIT_ASSERT(map.emplace(id, MakeHolder<TPage>(id))); + UNIT_ASSERT(map.emplace(id, MakeHolder<TPage>(id))); } map.resize(1024); @@ -72,7 +72,7 @@ Y_UNIT_TEST_SUITE(TPageMapTest) { for (size_t i = 0; i < pageIds.size(); ++i) { const ui32 pageId = pageIds[i]; //Cerr << "Emplacing page " << pageId << " at index " << i << Endl; - UNIT_ASSERT(map.emplace(pageId, MakeHolder<TPage>(pageId))); + UNIT_ASSERT(map.emplace(pageId, MakeHolder<TPage>(pageId))); UNIT_ASSERT(map[pageId]); UNIT_ASSERT_VALUES_EQUAL(map[pageId]->PageId, pageId); @@ -85,7 +85,7 @@ Y_UNIT_TEST_SUITE(TPageMapTest) { "Missing expected page " << oldPageId << " at index " << oldIndex << " after emplacing page " << pageId << " at index " << i); UNIT_ASSERT_VALUES_EQUAL(map[oldPageId]->PageId, oldPageId); - UNIT_ASSERT_C(!map.emplace(oldPageId, MakeHolder<TPage>(-1)), + UNIT_ASSERT_C(!map.emplace(oldPageId, MakeHolder<TPage>(-1)), "Unexpected emplace of page " << oldPageId << " at index " << oldIndex << " after emplacing page " << pageId << " at index " << i); } diff --git a/ydb/core/util/ut_common.h b/ydb/core/util/ut_common.h index 948962144f..07a102003d 100644 --- a/ydb/core/util/ut_common.h +++ b/ydb/core/util/ut_common.h @@ -26,7 +26,7 @@ namespace NKikimr { } static THolder<TWorkerThread> Spawn(std::function<void()> func) { - THolder<TWorkerThread> thread = MakeHolder<TWorkerThread>(std::move(func)); + THolder<TWorkerThread> thread = MakeHolder<TWorkerThread>(std::move(func)); thread->Start(); return thread; } diff --git a/ydb/core/viewer/browse.h b/ydb/core/viewer/browse.h index 81c124fe28..c5716f46a7 100644 --- a/ydb/core/viewer/browse.h +++ b/ydb/core/viewer/browse.h @@ -467,7 +467,7 @@ public: auto& bsGroupInfo = *bsResult->Record.MutableBSGroupInfo(); while (!bsGroupInfo.empty()) { - THolder<NKikimrBlobStorage::TEvResponseBSControllerInfo::TBSGroupInfo> groupInfo(bsGroupInfo.ReleaseLast()); + THolder<NKikimrBlobStorage::TEvResponseBSControllerInfo::TBSGroupInfo> groupInfo(bsGroupInfo.ReleaseLast()); ErasureSpecies.insert(groupInfo->GetErasureSpecies()); for (const auto& vDiskInfo : groupInfo->GetVDiskInfo()) { VDiskCategories.insert(vDiskInfo.GetVDiskCategory()); diff --git a/ydb/core/viewer/browse_db.h b/ydb/core/viewer/browse_db.h index 88885c2558..fe7b5d3140 100644 --- a/ydb/core/viewer/browse_db.h +++ b/ydb/core/viewer/browse_db.h @@ -94,7 +94,7 @@ public: auto& bsGroupInfo = *bsResult->Record.MutableBSGroupInfo(); while (!bsGroupInfo.empty()) { - THolder<NKikimrBlobStorage::TEvResponseBSControllerInfo::TBSGroupInfo> groupInfo(bsGroupInfo.ReleaseLast()); + THolder<NKikimrBlobStorage::TEvResponseBSControllerInfo::TBSGroupInfo> groupInfo(bsGroupInfo.ReleaseLast()); ErasureSpecies.insert(groupInfo->GetErasureSpecies()); for (const auto& vDiskInfo : groupInfo->GetVDiskInfo()) { VDiskCategories.insert(vDiskInfo.GetVDiskCategory()); diff --git a/ydb/core/viewer/counters_hosts.h b/ydb/core/viewer/counters_hosts.h index 05e1e9b552..6a7bdcfb3d 100644 --- a/ydb/core/viewer/counters_hosts.h +++ b/ydb/core/viewer/counters_hosts.h @@ -60,7 +60,7 @@ public: void SendRequest(ui32 nodeId, const TActorContext& ctx) { TActorId whiteboardServiceId = MakeNodeWhiteboardServiceId(nodeId); - THolder<TEvWhiteboard::TEvSystemStateRequest> request = MakeHolder<TEvWhiteboard::TEvSystemStateRequest>(); + THolder<TEvWhiteboard::TEvSystemStateRequest> request = MakeHolder<TEvWhiteboard::TEvSystemStateRequest>(); ctx.Send(whiteboardServiceId, request.Release(), IEventHandle::FlagTrackDelivery | IEventHandle::FlagSubscribeOnSession, nodeId); ++NodesRequested; } diff --git a/ydb/core/viewer/json_cluster.h b/ydb/core/viewer/json_cluster.h index 55d03752d2..36b5362a45 100644 --- a/ydb/core/viewer/json_cluster.h +++ b/ydb/core/viewer/json_cluster.h @@ -88,7 +88,7 @@ public: void HandleBrowse(TEvInterconnect::TEvNodesInfo::TPtr& ev, const TActorContext& ctx) { if (Tablets) { - THolder<TEvTxUserProxy::TEvNavigate> request = MakeHolder<TEvTxUserProxy::TEvNavigate>(); + THolder<TEvTxUserProxy::TEvNavigate> request = MakeHolder<TEvTxUserProxy::TEvNavigate>(); if (!Event->Get()->UserToken.empty()) { request->Record.SetUserToken(Event->Get()->UserToken); } diff --git a/ydb/core/viewer/json_hivestats.h b/ydb/core/viewer/json_hivestats.h index f22e88971f..7f24693d63 100644 --- a/ydb/core/viewer/json_hivestats.h +++ b/ydb/core/viewer/json_hivestats.h @@ -40,7 +40,7 @@ public: Timeout = FromStringWithDefault<ui32>(params.Get("timeout"), 10000); InitConfig(params); if (hiveId != 0 ) { - THolder<TEvHive::TEvRequestHiveDomainStats> request = MakeHolder<TEvHive::TEvRequestHiveDomainStats>(); + THolder<TEvHive::TEvRequestHiveDomainStats> request = MakeHolder<TEvHive::TEvRequestHiveDomainStats>(); request->Record.SetReturnFollowers(FromStringWithDefault(params.Get("followers"), false)); request->Record.SetReturnMetrics(FromStringWithDefault(params.Get("metrics"), true)); SendRequestToPipe(ConnectTabletPipe(hiveId), request.Release()); diff --git a/ydb/core/viewer/json_sysinfo.h b/ydb/core/viewer/json_sysinfo.h index c14bb38adb..05a477c2df 100644 --- a/ydb/core/viewer/json_sysinfo.h +++ b/ydb/core/viewer/json_sysinfo.h @@ -13,7 +13,7 @@ template <> class TWhiteboardMerger<TEvWhiteboard::TEvSystemStateResponse> { public: static THolder<TEvWhiteboard::TEvSystemStateResponse> MergeResponses(TMap<ui32, THolder<TEvWhiteboard::TEvSystemStateResponse>>& responses, const TString&) { - THolder<TEvWhiteboard::TEvSystemStateResponse> result = MakeHolder<TEvWhiteboard::TEvSystemStateResponse>(); + THolder<TEvWhiteboard::TEvSystemStateResponse> result = MakeHolder<TEvWhiteboard::TEvSystemStateResponse>(); ui64 minResponseTime = 0; auto* field = result->Record.MutableSystemStateInfo(); field->Reserve(responses.size()); diff --git a/ydb/core/viewer/json_wb_req.h b/ydb/core/viewer/json_wb_req.h index 316ea41249..f04c85688f 100644 --- a/ydb/core/viewer/json_wb_req.h +++ b/ydb/core/viewer/json_wb_req.h @@ -73,7 +73,7 @@ public: THolder<RequestType> BuildRequest(TNodeId nodeId) { Y_UNUSED(nodeId); - THolder<RequestType> request = MakeHolder<RequestType>(); + THolder<RequestType> request = MakeHolder<RequestType>(); if (ChangedSince != 0) { request->Record.SetChangedSince(ChangedSince); } diff --git a/ydb/core/viewer/wb_aggregate.h b/ydb/core/viewer/wb_aggregate.h index c858c649a4..7d09f1565f 100644 --- a/ydb/core/viewer/wb_aggregate.h +++ b/ydb/core/viewer/wb_aggregate.h @@ -19,7 +19,7 @@ public: using TResponseType = ResponseType; static THolder<TResponseType> AggregateResponses(TVector<THolder<TResponseType>>& responses) { - THolder<TResponseType> result = MakeHolder<TResponseType>(); + THolder<TResponseType> result = MakeHolder<TResponseType>(); for (const auto& response : responses) { AggregateMessage(result->Record, response->Record); } @@ -27,7 +27,7 @@ public: } static THolder<TResponseType> AggregateResponses(TMap<TTabletId, THolder<TResponseType>>& responses) { - THolder<TResponseType> result = MakeHolder<TResponseType>(); + THolder<TResponseType> result = MakeHolder<TResponseType>(); for (const auto& response : responses) { AggregateMessage(result->Record, response.second->Record); } diff --git a/ydb/core/viewer/wb_filter.h b/ydb/core/viewer/wb_filter.h index 852854e5cc..99c279b4fa 100644 --- a/ydb/core/viewer/wb_filter.h +++ b/ydb/core/viewer/wb_filter.h @@ -229,7 +229,7 @@ public: }; static THolder<ResponseType> FilterResponse(THolder<TResponseType>& source, const TVector<THolder<IFieldProtoFilter>>& filters) { - THolder<TResponseType> result = MakeHolder<TResponseType>(); + THolder<TResponseType> result = MakeHolder<TResponseType>(); auto* field = TWhiteboardInfo<ResponseType>::GetElementsField(result.Get()); auto* sourceField = TWhiteboardInfo<ResponseType>::GetElementsField(source.Get()); field->Reserve(sourceField->size()); @@ -297,34 +297,34 @@ public: StringSplitter(value.substr(1, value.size() - 2)).Split(',').SkipEmpty().Collect(&values); switch (fieldDescriptor->cpp_type()) { case FieldDescriptor::CPPTYPE_INT32: - filter = MakeHolder<TFieldProtoFilterInValue<i32>>(fieldDescriptor, FromStringWithDefaultArray<i32>(values)); + filter = MakeHolder<TFieldProtoFilterInValue<i32>>(fieldDescriptor, FromStringWithDefaultArray<i32>(values)); break; case FieldDescriptor::CPPTYPE_INT64: - filter = MakeHolder<TFieldProtoFilterInValue<i64>>(fieldDescriptor, FromStringWithDefaultArray<i64>(values)); + filter = MakeHolder<TFieldProtoFilterInValue<i64>>(fieldDescriptor, FromStringWithDefaultArray<i64>(values)); break; case FieldDescriptor::CPPTYPE_UINT32: - filter = MakeHolder<TFieldProtoFilterInValue<ui32>>(fieldDescriptor, FromStringWithDefaultArray<ui32>(values)); + filter = MakeHolder<TFieldProtoFilterInValue<ui32>>(fieldDescriptor, FromStringWithDefaultArray<ui32>(values)); break; case FieldDescriptor::CPPTYPE_UINT64: - filter = MakeHolder<TFieldProtoFilterInValue<ui64>>(fieldDescriptor, FromStringWithDefaultArray<ui64>(values)); + filter = MakeHolder<TFieldProtoFilterInValue<ui64>>(fieldDescriptor, FromStringWithDefaultArray<ui64>(values)); break; case FieldDescriptor::CPPTYPE_DOUBLE: - filter = MakeHolder<TFieldProtoFilterInValue<double>>(fieldDescriptor, FromStringWithDefaultArray<double>(values)); + filter = MakeHolder<TFieldProtoFilterInValue<double>>(fieldDescriptor, FromStringWithDefaultArray<double>(values)); break; case FieldDescriptor::CPPTYPE_FLOAT: - filter = MakeHolder<TFieldProtoFilterInValue<float>>(fieldDescriptor, FromStringWithDefaultArray<float>(values)); + filter = MakeHolder<TFieldProtoFilterInValue<float>>(fieldDescriptor, FromStringWithDefaultArray<float>(values)); break; case FieldDescriptor::CPPTYPE_BOOL: - filter = MakeHolder<TFieldProtoFilterInValue<bool>>(fieldDescriptor, FromStringWithDefaultArray<bool>(values)); + filter = MakeHolder<TFieldProtoFilterInValue<bool>>(fieldDescriptor, FromStringWithDefaultArray<bool>(values)); break; case FieldDescriptor::CPPTYPE_ENUM: - filter = MakeHolder<TFieldProtoFilterInValue<TEnumValue>>(fieldDescriptor, ConvertStringArray<TEnumValue>(values)); + filter = MakeHolder<TFieldProtoFilterInValue<TEnumValue>>(fieldDescriptor, ConvertStringArray<TEnumValue>(values)); break; case FieldDescriptor::CPPTYPE_STRING: - filter = MakeHolder<TFieldProtoFilterInValue<TString>>(fieldDescriptor, values); + filter = MakeHolder<TFieldProtoFilterInValue<TString>>(fieldDescriptor, values); break; case FieldDescriptor::CPPTYPE_MESSAGE: - filter = MakeHolder<TFieldProtoFilterInValue<TMessageValue>>(fieldDescriptor, ConvertStringArray<TMessageValue>(values)); + filter = MakeHolder<TFieldProtoFilterInValue<TMessageValue>>(fieldDescriptor, ConvertStringArray<TMessageValue>(values)); break; default: break; @@ -332,34 +332,34 @@ public: } else { switch (fieldDescriptor->cpp_type()) { case FieldDescriptor::CPPTYPE_INT32: - filter = MakeHolder<TFieldProtoFilterEqValue<i32>>(fieldDescriptor, FromStringWithDefault<i32>(value)); + filter = MakeHolder<TFieldProtoFilterEqValue<i32>>(fieldDescriptor, FromStringWithDefault<i32>(value)); break; case FieldDescriptor::CPPTYPE_INT64: - filter = MakeHolder<TFieldProtoFilterEqValue<i64>>(fieldDescriptor, FromStringWithDefault<i64>(value)); + filter = MakeHolder<TFieldProtoFilterEqValue<i64>>(fieldDescriptor, FromStringWithDefault<i64>(value)); break; case FieldDescriptor::CPPTYPE_UINT32: - filter = MakeHolder<TFieldProtoFilterEqValue<ui32>>(fieldDescriptor, FromStringWithDefault<ui32>(value)); + filter = MakeHolder<TFieldProtoFilterEqValue<ui32>>(fieldDescriptor, FromStringWithDefault<ui32>(value)); break; case FieldDescriptor::CPPTYPE_UINT64: - filter = MakeHolder<TFieldProtoFilterEqValue<ui64>>(fieldDescriptor, FromStringWithDefault<ui64>(value)); + filter = MakeHolder<TFieldProtoFilterEqValue<ui64>>(fieldDescriptor, FromStringWithDefault<ui64>(value)); break; case FieldDescriptor::CPPTYPE_DOUBLE: - filter = MakeHolder<TFieldProtoFilterEqValue<double>>(fieldDescriptor, FromStringWithDefault<double>(value)); + filter = MakeHolder<TFieldProtoFilterEqValue<double>>(fieldDescriptor, FromStringWithDefault<double>(value)); break; case FieldDescriptor::CPPTYPE_FLOAT: - filter = MakeHolder<TFieldProtoFilterEqValue<float>>(fieldDescriptor, FromStringWithDefault<float>(value)); + filter = MakeHolder<TFieldProtoFilterEqValue<float>>(fieldDescriptor, FromStringWithDefault<float>(value)); break; case FieldDescriptor::CPPTYPE_BOOL: - filter = MakeHolder<TFieldProtoFilterEqValue<bool>>(fieldDescriptor, FromStringWithDefault<bool>(value)); + filter = MakeHolder<TFieldProtoFilterEqValue<bool>>(fieldDescriptor, FromStringWithDefault<bool>(value)); break; case FieldDescriptor::CPPTYPE_ENUM: - filter = MakeHolder<TFieldProtoFilterEqValue<TEnumValue>>(fieldDescriptor, TEnumValue(value)); + filter = MakeHolder<TFieldProtoFilterEqValue<TEnumValue>>(fieldDescriptor, TEnumValue(value)); break; case FieldDescriptor::CPPTYPE_STRING: - filter = MakeHolder<TFieldProtoFilterEqValue<TString>>(fieldDescriptor, value); + filter = MakeHolder<TFieldProtoFilterEqValue<TString>>(fieldDescriptor, value); break; case FieldDescriptor::CPPTYPE_MESSAGE: - filter = MakeHolder<TFieldProtoFilterEqValue<TMessageValue>>(fieldDescriptor, TMessageValue(value)); + filter = MakeHolder<TFieldProtoFilterEqValue<TMessageValue>>(fieldDescriptor, TMessageValue(value)); break; default: break; @@ -368,34 +368,34 @@ public: } else if (op == "<>" || op == "!=") { switch (fieldDescriptor->cpp_type()) { case FieldDescriptor::CPPTYPE_INT32: - filter = MakeHolder<TFieldProtoFilterNeValue<i32>>(fieldDescriptor, FromStringWithDefault<i32>(value)); + filter = MakeHolder<TFieldProtoFilterNeValue<i32>>(fieldDescriptor, FromStringWithDefault<i32>(value)); break; case FieldDescriptor::CPPTYPE_INT64: - filter = MakeHolder<TFieldProtoFilterNeValue<i64>>(fieldDescriptor, FromStringWithDefault<i64>(value)); + filter = MakeHolder<TFieldProtoFilterNeValue<i64>>(fieldDescriptor, FromStringWithDefault<i64>(value)); break; case FieldDescriptor::CPPTYPE_UINT32: - filter = MakeHolder<TFieldProtoFilterNeValue<ui32>>(fieldDescriptor, FromStringWithDefault<ui32>(value)); + filter = MakeHolder<TFieldProtoFilterNeValue<ui32>>(fieldDescriptor, FromStringWithDefault<ui32>(value)); break; case FieldDescriptor::CPPTYPE_UINT64: - filter = MakeHolder<TFieldProtoFilterNeValue<ui64>>(fieldDescriptor, FromStringWithDefault<ui64>(value)); + filter = MakeHolder<TFieldProtoFilterNeValue<ui64>>(fieldDescriptor, FromStringWithDefault<ui64>(value)); break; case FieldDescriptor::CPPTYPE_DOUBLE: - filter = MakeHolder<TFieldProtoFilterNeValue<double>>(fieldDescriptor, FromStringWithDefault<double>(value)); + filter = MakeHolder<TFieldProtoFilterNeValue<double>>(fieldDescriptor, FromStringWithDefault<double>(value)); break; case FieldDescriptor::CPPTYPE_FLOAT: - filter = MakeHolder<TFieldProtoFilterNeValue<float>>(fieldDescriptor, FromStringWithDefault<float>(value)); + filter = MakeHolder<TFieldProtoFilterNeValue<float>>(fieldDescriptor, FromStringWithDefault<float>(value)); break; case FieldDescriptor::CPPTYPE_BOOL: - filter = MakeHolder<TFieldProtoFilterNeValue<bool>>(fieldDescriptor, FromStringWithDefault<bool>(value)); + filter = MakeHolder<TFieldProtoFilterNeValue<bool>>(fieldDescriptor, FromStringWithDefault<bool>(value)); break; case FieldDescriptor::CPPTYPE_ENUM: - filter = MakeHolder<TFieldProtoFilterNeValue<TEnumValue>>(fieldDescriptor, TEnumValue(value)); + filter = MakeHolder<TFieldProtoFilterNeValue<TEnumValue>>(fieldDescriptor, TEnumValue(value)); break; case FieldDescriptor::CPPTYPE_STRING: - filter = MakeHolder<TFieldProtoFilterNeValue<TString>>(fieldDescriptor, value); + filter = MakeHolder<TFieldProtoFilterNeValue<TString>>(fieldDescriptor, value); break; case FieldDescriptor::CPPTYPE_MESSAGE: - filter = MakeHolder<TFieldProtoFilterNeValue<TMessageValue>>(fieldDescriptor, TMessageValue(value)); + filter = MakeHolder<TFieldProtoFilterNeValue<TMessageValue>>(fieldDescriptor, TMessageValue(value)); break; default: break; @@ -403,31 +403,31 @@ public: } else if (op == "<") { switch (fieldDescriptor->cpp_type()) { case FieldDescriptor::CPPTYPE_INT32: - filter = MakeHolder<TFieldProtoFilterLtValue<i32>>(fieldDescriptor, FromStringWithDefault<i32>(value)); + filter = MakeHolder<TFieldProtoFilterLtValue<i32>>(fieldDescriptor, FromStringWithDefault<i32>(value)); break; case FieldDescriptor::CPPTYPE_INT64: - filter = MakeHolder<TFieldProtoFilterLtValue<i64>>(fieldDescriptor, FromStringWithDefault<i64>(value)); + filter = MakeHolder<TFieldProtoFilterLtValue<i64>>(fieldDescriptor, FromStringWithDefault<i64>(value)); break; case FieldDescriptor::CPPTYPE_UINT32: - filter = MakeHolder<TFieldProtoFilterLtValue<ui32>>(fieldDescriptor, FromStringWithDefault<ui32>(value)); + filter = MakeHolder<TFieldProtoFilterLtValue<ui32>>(fieldDescriptor, FromStringWithDefault<ui32>(value)); break; case FieldDescriptor::CPPTYPE_UINT64: - filter = MakeHolder<TFieldProtoFilterLtValue<ui64>>(fieldDescriptor, FromStringWithDefault<ui64>(value)); + filter = MakeHolder<TFieldProtoFilterLtValue<ui64>>(fieldDescriptor, FromStringWithDefault<ui64>(value)); break; case FieldDescriptor::CPPTYPE_DOUBLE: - filter = MakeHolder<TFieldProtoFilterLtValue<double>>(fieldDescriptor, FromStringWithDefault<double>(value)); + filter = MakeHolder<TFieldProtoFilterLtValue<double>>(fieldDescriptor, FromStringWithDefault<double>(value)); break; case FieldDescriptor::CPPTYPE_FLOAT: - filter = MakeHolder<TFieldProtoFilterLtValue<float>>(fieldDescriptor, FromStringWithDefault<float>(value)); + filter = MakeHolder<TFieldProtoFilterLtValue<float>>(fieldDescriptor, FromStringWithDefault<float>(value)); break; case FieldDescriptor::CPPTYPE_BOOL: - filter = MakeHolder<TFieldProtoFilterLtValue<bool>>(fieldDescriptor, FromStringWithDefault<bool>(value)); + filter = MakeHolder<TFieldProtoFilterLtValue<bool>>(fieldDescriptor, FromStringWithDefault<bool>(value)); break; case FieldDescriptor::CPPTYPE_ENUM: - filter = MakeHolder<TFieldProtoFilterLtValue<TEnumValue>>(fieldDescriptor, TEnumValue(value)); + filter = MakeHolder<TFieldProtoFilterLtValue<TEnumValue>>(fieldDescriptor, TEnumValue(value)); break; case FieldDescriptor::CPPTYPE_STRING: - filter = MakeHolder<TFieldProtoFilterLtValue<TString>>(fieldDescriptor, value); + filter = MakeHolder<TFieldProtoFilterLtValue<TString>>(fieldDescriptor, value); break; default: break; @@ -435,31 +435,31 @@ public: } else if (op == ">") { switch (fieldDescriptor->cpp_type()) { case FieldDescriptor::CPPTYPE_INT32: - filter = MakeHolder<TFieldProtoFilterGtValue<i32>>(fieldDescriptor, FromStringWithDefault<i32>(value)); + filter = MakeHolder<TFieldProtoFilterGtValue<i32>>(fieldDescriptor, FromStringWithDefault<i32>(value)); break; case FieldDescriptor::CPPTYPE_INT64: - filter = MakeHolder<TFieldProtoFilterGtValue<i64>>(fieldDescriptor, FromStringWithDefault<i64>(value)); + filter = MakeHolder<TFieldProtoFilterGtValue<i64>>(fieldDescriptor, FromStringWithDefault<i64>(value)); break; case FieldDescriptor::CPPTYPE_UINT32: - filter = MakeHolder<TFieldProtoFilterGtValue<ui32>>(fieldDescriptor, FromStringWithDefault<ui32>(value)); + filter = MakeHolder<TFieldProtoFilterGtValue<ui32>>(fieldDescriptor, FromStringWithDefault<ui32>(value)); break; case FieldDescriptor::CPPTYPE_UINT64: - filter = MakeHolder<TFieldProtoFilterGtValue<ui64>>(fieldDescriptor, FromStringWithDefault<ui64>(value)); + filter = MakeHolder<TFieldProtoFilterGtValue<ui64>>(fieldDescriptor, FromStringWithDefault<ui64>(value)); break; case FieldDescriptor::CPPTYPE_DOUBLE: - filter = MakeHolder<TFieldProtoFilterGtValue<double>>(fieldDescriptor, FromStringWithDefault<double>(value)); + filter = MakeHolder<TFieldProtoFilterGtValue<double>>(fieldDescriptor, FromStringWithDefault<double>(value)); break; case FieldDescriptor::CPPTYPE_FLOAT: - filter = MakeHolder<TFieldProtoFilterGtValue<float>>(fieldDescriptor, FromStringWithDefault<float>(value)); + filter = MakeHolder<TFieldProtoFilterGtValue<float>>(fieldDescriptor, FromStringWithDefault<float>(value)); break; case FieldDescriptor::CPPTYPE_BOOL: - filter = MakeHolder<TFieldProtoFilterGtValue<bool>>(fieldDescriptor, FromStringWithDefault<bool>(value)); + filter = MakeHolder<TFieldProtoFilterGtValue<bool>>(fieldDescriptor, FromStringWithDefault<bool>(value)); break; case FieldDescriptor::CPPTYPE_ENUM: - filter = MakeHolder<TFieldProtoFilterGtValue<TEnumValue>>(fieldDescriptor, TEnumValue(value)); + filter = MakeHolder<TFieldProtoFilterGtValue<TEnumValue>>(fieldDescriptor, TEnumValue(value)); break; case FieldDescriptor::CPPTYPE_STRING: - filter = MakeHolder<TFieldProtoFilterGtValue<TString>>(fieldDescriptor, value); + filter = MakeHolder<TFieldProtoFilterGtValue<TString>>(fieldDescriptor, value); break; default: break; @@ -467,31 +467,31 @@ public: } else if (op == "<=") { switch (fieldDescriptor->cpp_type()) { case FieldDescriptor::CPPTYPE_INT32: - filter = MakeHolder<TFieldProtoFilterLeValue<i32>>(fieldDescriptor, FromStringWithDefault<i32>(value)); + filter = MakeHolder<TFieldProtoFilterLeValue<i32>>(fieldDescriptor, FromStringWithDefault<i32>(value)); break; case FieldDescriptor::CPPTYPE_INT64: - filter = MakeHolder<TFieldProtoFilterLeValue<i64>>(fieldDescriptor, FromStringWithDefault<i64>(value)); + filter = MakeHolder<TFieldProtoFilterLeValue<i64>>(fieldDescriptor, FromStringWithDefault<i64>(value)); break; case FieldDescriptor::CPPTYPE_UINT32: - filter = MakeHolder<TFieldProtoFilterLeValue<ui32>>(fieldDescriptor, FromStringWithDefault<ui32>(value)); + filter = MakeHolder<TFieldProtoFilterLeValue<ui32>>(fieldDescriptor, FromStringWithDefault<ui32>(value)); break; case FieldDescriptor::CPPTYPE_UINT64: - filter = MakeHolder<TFieldProtoFilterLeValue<ui64>>(fieldDescriptor, FromStringWithDefault<ui64>(value)); + filter = MakeHolder<TFieldProtoFilterLeValue<ui64>>(fieldDescriptor, FromStringWithDefault<ui64>(value)); break; case FieldDescriptor::CPPTYPE_DOUBLE: - filter = MakeHolder<TFieldProtoFilterLeValue<double>>(fieldDescriptor, FromStringWithDefault<double>(value)); + filter = MakeHolder<TFieldProtoFilterLeValue<double>>(fieldDescriptor, FromStringWithDefault<double>(value)); break; case FieldDescriptor::CPPTYPE_FLOAT: - filter = MakeHolder<TFieldProtoFilterLeValue<float>>(fieldDescriptor, FromStringWithDefault<float>(value)); + filter = MakeHolder<TFieldProtoFilterLeValue<float>>(fieldDescriptor, FromStringWithDefault<float>(value)); break; case FieldDescriptor::CPPTYPE_BOOL: - filter = MakeHolder<TFieldProtoFilterLeValue<bool>>(fieldDescriptor, FromStringWithDefault<bool>(value)); + filter = MakeHolder<TFieldProtoFilterLeValue<bool>>(fieldDescriptor, FromStringWithDefault<bool>(value)); break; case FieldDescriptor::CPPTYPE_ENUM: - filter = MakeHolder<TFieldProtoFilterLeValue<TEnumValue>>(fieldDescriptor, TEnumValue(value)); + filter = MakeHolder<TFieldProtoFilterLeValue<TEnumValue>>(fieldDescriptor, TEnumValue(value)); break; case FieldDescriptor::CPPTYPE_STRING: - filter = MakeHolder<TFieldProtoFilterLeValue<TString>>(fieldDescriptor, value); + filter = MakeHolder<TFieldProtoFilterLeValue<TString>>(fieldDescriptor, value); break; default: break; @@ -499,31 +499,31 @@ public: } else if (op == ">=") { switch (fieldDescriptor->cpp_type()) { case FieldDescriptor::CPPTYPE_INT32: - filter = MakeHolder<TFieldProtoFilterGeValue<i32>>(fieldDescriptor, FromStringWithDefault<i32>(value)); + filter = MakeHolder<TFieldProtoFilterGeValue<i32>>(fieldDescriptor, FromStringWithDefault<i32>(value)); break; case FieldDescriptor::CPPTYPE_INT64: - filter = MakeHolder<TFieldProtoFilterGeValue<i64>>(fieldDescriptor, FromStringWithDefault<i64>(value)); + filter = MakeHolder<TFieldProtoFilterGeValue<i64>>(fieldDescriptor, FromStringWithDefault<i64>(value)); break; case FieldDescriptor::CPPTYPE_UINT32: - filter = MakeHolder<TFieldProtoFilterGeValue<ui32>>(fieldDescriptor, FromStringWithDefault<ui32>(value)); + filter = MakeHolder<TFieldProtoFilterGeValue<ui32>>(fieldDescriptor, FromStringWithDefault<ui32>(value)); break; case FieldDescriptor::CPPTYPE_UINT64: - filter = MakeHolder<TFieldProtoFilterGeValue<ui64>>(fieldDescriptor, FromStringWithDefault<ui64>(value)); + filter = MakeHolder<TFieldProtoFilterGeValue<ui64>>(fieldDescriptor, FromStringWithDefault<ui64>(value)); break; case FieldDescriptor::CPPTYPE_DOUBLE: - filter = MakeHolder<TFieldProtoFilterGeValue<double>>(fieldDescriptor, FromStringWithDefault<double>(value)); + filter = MakeHolder<TFieldProtoFilterGeValue<double>>(fieldDescriptor, FromStringWithDefault<double>(value)); break; case FieldDescriptor::CPPTYPE_FLOAT: - filter = MakeHolder<TFieldProtoFilterGeValue<float>>(fieldDescriptor, FromStringWithDefault<float>(value)); + filter = MakeHolder<TFieldProtoFilterGeValue<float>>(fieldDescriptor, FromStringWithDefault<float>(value)); break; case FieldDescriptor::CPPTYPE_BOOL: - filter = MakeHolder<TFieldProtoFilterGeValue<bool>>(fieldDescriptor, FromStringWithDefault<bool>(value)); + filter = MakeHolder<TFieldProtoFilterGeValue<bool>>(fieldDescriptor, FromStringWithDefault<bool>(value)); break; case FieldDescriptor::CPPTYPE_ENUM: - filter = MakeHolder<TFieldProtoFilterGeValue<TEnumValue>>(fieldDescriptor, TEnumValue(value)); + filter = MakeHolder<TFieldProtoFilterGeValue<TEnumValue>>(fieldDescriptor, TEnumValue(value)); break; case FieldDescriptor::CPPTYPE_STRING: - filter = MakeHolder<TFieldProtoFilterGeValue<TString>>(fieldDescriptor, value); + filter = MakeHolder<TFieldProtoFilterGeValue<TString>>(fieldDescriptor, value); break; default: break; diff --git a/ydb/core/viewer/wb_group.h b/ydb/core/viewer/wb_group.h index 6227cd5900..9735d8f29e 100644 --- a/ydb/core/viewer/wb_group.h +++ b/ydb/core/viewer/wb_group.h @@ -243,7 +243,7 @@ public: } static THolder<ResponseType> GroupResponse(THolder<TResponseType>& source, const TVector<const FieldDescriptor*>& groupFields, bool allEnums = false) { - THolder<TResponseType> result = MakeHolder<TResponseType>(); + THolder<TResponseType> result = MakeHolder<TResponseType>(); TElementsFieldType* field = TWhiteboardInfo<ResponseType>::GetElementsField(result.Get()); bool allKeys = allEnums && IsEnum(groupFields); TMap<TPartProtoKey, ui32> counters; diff --git a/ydb/core/viewer/wb_merge.h b/ydb/core/viewer/wb_merge.h index aee0dcf8da..27fd3c8f67 100644 --- a/ydb/core/viewer/wb_merge.h +++ b/ydb/core/viewer/wb_merge.h @@ -177,7 +177,7 @@ public: } } - THolder<TResponseType> result = MakeHolder<TResponseType>(); + THolder<TResponseType> result = MakeHolder<TResponseType>(); auto* field = TWhiteboardInfo<ResponseType>::GetElementsField(result.Get()); field->Reserve(mergedData.size()); for (auto it = mergedData.begin(); it != mergedData.end(); ++it) { diff --git a/ydb/core/ymq/actor/common_batch_actor.h b/ydb/core/ymq/actor/common_batch_actor.h index caad85e5d1..1d9cc6916d 100644 --- a/ydb/core/ymq/actor/common_batch_actor.h +++ b/ydb/core/ymq/actor/common_batch_actor.h @@ -61,7 +61,7 @@ private: RLOG_SQS_DEBUG("Create proxy subactor[" << i << "]. Req id: " << reqId); requests[i].SetRequestId(reqId); requests[i].SetRequestRateLimit(false); // already requested - this->Register(new TProxyActor(requests[i], MakeHolder<TBatchRequestReplyCallback>(this->SelfId(), i))); + this->Register(new TProxyActor(requests[i], MakeHolder<TBatchRequestReplyCallback>(this->SelfId(), i))); } } diff --git a/ydb/core/ymq/actor/infly.cpp b/ydb/core/ymq/actor/infly.cpp index d0cae197e5..a08cb65387 100644 --- a/ydb/core/ymq/actor/infly.cpp +++ b/ydb/core/ymq/actor/infly.cpp @@ -74,7 +74,7 @@ THolder<TInflyMessage> TInflyMessages::Delete(ui64 offset) { TInflyMessageWithVisibilityDeadlineKey* byVisibilityDeadline = &msg->Message(); byVisibilityDeadline->UnLink(); msg->UnLink(); - return THolder<TInflyMessage>(&msg->Message()); + return THolder<TInflyMessage>(&msg->Message()); } return nullptr; } @@ -123,7 +123,7 @@ THolder<TInflyMessage> TInflyMessages::TReceiveCandidates::Delete(ui64 offset) { Y_ASSERT(Parent->HoldCount > 0); --Parent->HoldCount; msg->UnLink(); - return THolder<TInflyMessage>(&msg->Message()); + return THolder<TInflyMessage>(&msg->Message()); } return nullptr; } @@ -218,7 +218,7 @@ THolder<TInflyMessage> TInflyMessages::TChangeVisibilityCandidates::Delete(ui64 msg->UnLink(); TInflyMessageWithVisibilityDeadlineKey* byVisibilityDeadline = &msg->Message(); byVisibilityDeadline->UnLink(); - return THolder<TInflyMessage>(&msg->Message()); + return THolder<TInflyMessage>(&msg->Message()); } return nullptr; } diff --git a/ydb/core/ymq/actor/proxy_service.cpp b/ydb/core/ymq/actor/proxy_service.cpp index bc26e7b091..1eecd85103 100644 --- a/ydb/core/ymq/actor/proxy_service.cpp +++ b/ydb/core/ymq/actor/proxy_service.cpp @@ -195,7 +195,7 @@ TSqsProxyService::TNodeInfoRef TSqsProxyService::GetNodeInfo(ui32 nodeId) { void TSqsProxyService::SendProxyError(TProxyRequestInfoRef request, TSqsEvents::TEvProxySqsResponse::EProxyStatus proxyStatus) { RLOG_SQS_REQ_TRACE(request->RequestId, "Sending proxy status " << proxyStatus << " to proxy actor"); - THolder<TSqsEvents::TEvProxySqsResponse> answer = MakeHolder<TSqsEvents::TEvProxySqsResponse>(); + THolder<TSqsEvents::TEvProxySqsResponse> answer = MakeHolder<TSqsEvents::TEvProxySqsResponse>(); answer->ProxyStatus = proxyStatus; Send(request->ProxyActorId, std::move(answer)); } diff --git a/ydb/core/ymq/actor/queue_leader.cpp b/ydb/core/ymq/actor/queue_leader.cpp index 8683231edf..2c6e81d827 100644 --- a/ydb/core/ymq/actor/queue_leader.cpp +++ b/ydb/core/ymq/actor/queue_leader.cpp @@ -1749,7 +1749,7 @@ void TQueueLeader::OnInflyLoaded(ui64 shard, const TSqsEvents::TEvExecuted::TRec const ui32 receiveCount = message["ReceiveCount"]; const TInstant maxVisibilityDeadline = TInstant::MilliSeconds(Max(visibilityDeadlineMs, delayDeadlineMs)); LOG_SQS_TRACE("Adding message to infly struct for shard " << TLogQueueName(UserName_, QueueName_, shard) << ": { Offset: " << offset << ", VisibilityDeadline: " << maxVisibilityDeadline << ", ReceiveCount: " << receiveCount << " }"); - shardInfo.Infly->Add(MakeHolder<TInflyMessage>(offset, message["RandomId"], maxVisibilityDeadline, receiveCount)); + shardInfo.Infly->Add(MakeHolder<TInflyMessage>(offset, message["RandomId"], maxVisibilityDeadline, receiveCount)); } LWPROBE(LoadInfly, UserName_, QueueName_, shard, list.Size()); shardInfo.InflyVersion = val["inflyVersion"]; @@ -1868,7 +1868,7 @@ void TQueueLeader::OnAddedMessagesToInfly(ui64 shard, const TSqsEvents::TEvExecu const ui64 offset = message["Offset"]; const ui32 receiveCount = 0; // as in transaction LOG_SQS_TRACE("Adding message to infly struct for shard " << TLogQueueName(UserName_, QueueName_, shard) << ": { Offset: " << offset << ", DelayDeadline: " << delayDeadline << ", ReceiveCount: " << receiveCount << " }"); - shardInfo.Infly->Add(MakeHolder<TInflyMessage>(offset, message["RandomId"], delayDeadline, receiveCount)); + shardInfo.Infly->Add(MakeHolder<TInflyMessage>(offset, message["RandomId"], delayDeadline, receiveCount)); } LWPROBE(AddMessagesToInfly, UserName_, QueueName_, shard, list.Size()); shardInfo.ReadOffset = val["readOffset"]; diff --git a/ydb/library/schlab/schine/bin_log.h b/ydb/library/schlab/schine/bin_log.h index 38249de8b1..8abe61ccd8 100644 --- a/ydb/library/schlab/schine/bin_log.h +++ b/ydb/library/schlab/schine/bin_log.h @@ -20,7 +20,7 @@ class TBinLog { public: TBinLog() { - Buffer = TArrayHolder<TItem>(new TItem[Size]); + Buffer = TArrayHolder<TItem>(new TItem[Size]); } inline void Write(ui64 value) { diff --git a/ydb/library/yql/core/file_storage/storage_ut.cpp b/ydb/library/yql/core/file_storage/storage_ut.cpp index 6cbafa39b4..4229abd219 100644 --- a/ydb/library/yql/core/file_storage/storage_ut.cpp +++ b/ydb/library/yql/core/file_storage/storage_ut.cpp @@ -57,7 +57,7 @@ Y_UNIT_TEST_SUITE(TStorageTests) { } Y_UNIT_TEST(Put) { - THolder<TStorage> storage = MakeHolder<TStorage>(10, 100); + THolder<TStorage> storage = MakeHolder<TStorage>(10, 100); TFileLinkPtr fileInStorage = PutFile("test.file", *storage, "somename"); TFsPath rootPath(fileInStorage->GetPath()); UNIT_ASSERT(rootPath.Exists()); @@ -72,7 +72,7 @@ Y_UNIT_TEST_SUITE(TStorageTests) { } Y_UNIT_TEST(ParallelPut) { - THolder<TStorage> storage = MakeHolder<TStorage>(10, 100); + THolder<TStorage> storage = MakeHolder<TStorage>(10, 100); TThreadPool queue; queue.Start(10); @@ -96,7 +96,7 @@ Y_UNIT_TEST_SUITE(TStorageTests) { } Y_UNIT_TEST(CleanUp) { - THolder<TStorage> storage = MakeHolder<TStorage>(10, 100); + THolder<TStorage> storage = MakeHolder<TStorage>(10, 100); TFileLinkPtr fileInStorage = PutFile("test.file", *storage); UNIT_ASSERT(fileInStorage->GetPath().Exists()); @@ -108,7 +108,7 @@ Y_UNIT_TEST_SUITE(TStorageTests) { Y_UNIT_TEST(DisplaceByCount) { ui64 maxCount = 2; - THolder<TStorage> storage = MakeHolder<TStorage>(maxCount, 100); + THolder<TStorage> storage = MakeHolder<TStorage>(maxCount, 100); TFileLinkPtr file1 = PutFile("test1.file", *storage); TFileLinkPtr file2 = PutFile("test2.file", *storage); @@ -145,7 +145,7 @@ Y_UNIT_TEST_SUITE(TStorageTests) { Y_UNIT_TEST(DisplaceBySize) { ui64 maxSize = 25; - THolder<TStorage> storage = MakeHolder<TStorage>(10, maxSize); + THolder<TStorage> storage = MakeHolder<TStorage>(10, maxSize); TFileLinkPtr file1 = PutFile("test1.file", *storage); TFileLinkPtr file2 = PutFile("test2.file", *storage); @@ -182,7 +182,7 @@ Y_UNIT_TEST_SUITE(TStorageTests) { Y_UNIT_TEST(PersistStorage) { TTestDir dir("PersistStorage"); - THolder<TStorage> storage = MakeHolder<TStorage>(100, 100, dir.GetFsPath()); + THolder<TStorage> storage = MakeHolder<TStorage>(100, 100, dir.GetFsPath()); auto rootPath = storage->GetRoot(); TFileLinkPtr fileInStorage = PutFile("test.file", *storage); diff --git a/ydb/library/yql/minikql/computation/mkql_computation_node_graph.cpp b/ydb/library/yql/minikql/computation/mkql_computation_node_graph.cpp index dfef841ee6..f2b188ae47 100644 --- a/ydb/library/yql/minikql/computation/mkql_computation_node_graph.cpp +++ b/ydb/library/yql/minikql/computation/mkql_computation_node_graph.cpp @@ -864,7 +864,7 @@ private: }; IComputationPatternCache::TPtr IComputationPatternCache::Create() { - return THolder(new TComputationPatternCache()); + return THolder(new TComputationPatternCache()); } IComputationPattern::TPtr TComputationPatternCache::EmplacePattern(const TString& serialized, PrepareFunc prepareFunc) { diff --git a/ydb/library/yql/providers/clickhouse/provider/yql_clickhouse_datasink_execution.cpp b/ydb/library/yql/providers/clickhouse/provider/yql_clickhouse_datasink_execution.cpp index 37568e8c36..18b02d41bb 100644 --- a/ydb/library/yql/providers/clickhouse/provider/yql_clickhouse_datasink_execution.cpp +++ b/ydb/library/yql/providers/clickhouse/provider/yql_clickhouse_datasink_execution.cpp @@ -26,7 +26,7 @@ private: }; THolder<TExecTransformerBase> CreateClickHouseDataSinkExecTransformer(TClickHouseState::TPtr state) { - return THolder(new TClickHouseDataSinkExecTransformer(state)); + return THolder(new TClickHouseDataSinkExecTransformer(state)); } } // namespace NYql diff --git a/ydb/library/yql/providers/common/config/yql_configuration_transformer.cpp b/ydb/library/yql/providers/common/config/yql_configuration_transformer.cpp index c3b17b3f16..9fbd44acb3 100644 --- a/ydb/library/yql/providers/common/config/yql_configuration_transformer.cpp +++ b/ydb/library/yql/providers/common/config/yql_configuration_transformer.cpp @@ -158,7 +158,7 @@ THolder<IGraphTransformer> CreateProviderConfigurationTransformer( TSettingDispatcher::TPtr dispatcher, const TTypeAnnotationContext& types, const TString& provider) { - return THolder(new TProviderConfigurationTransformer(dispatcher, types, provider)); + return THolder(new TProviderConfigurationTransformer(dispatcher, types, provider)); } } // namespace NCommon diff --git a/ydb/library/yql/providers/dq/opt/physical_optimize.cpp b/ydb/library/yql/providers/dq/opt/physical_optimize.cpp index 7a9e837695..858e3da45a 100644 --- a/ydb/library/yql/providers/dq/opt/physical_optimize.cpp +++ b/ydb/library/yql/providers/dq/opt/physical_optimize.cpp @@ -323,7 +323,7 @@ private: }; THolder<IGraphTransformer> CreateDqsPhyOptTransformer(TTypeAnnotationContext* typeCtx) { - return THolder(new TDqsPhysicalOptProposalTransformer(typeCtx)); + return THolder(new TDqsPhysicalOptProposalTransformer(typeCtx)); } } // NYql::NDqs diff --git a/ydb/library/yql/providers/dq/provider/yql_dq_recapture.cpp b/ydb/library/yql/providers/dq/provider/yql_dq_recapture.cpp index 9c7cd62c0d..90e8af759c 100644 --- a/ydb/library/yql/providers/dq/provider/yql_dq_recapture.cpp +++ b/ydb/library/yql/providers/dq/provider/yql_dq_recapture.cpp @@ -257,7 +257,7 @@ private: }; THolder<IGraphTransformer> CreateDqsRecaptureTransformer(TDqStatePtr state) { - return THolder(new TDqsRecaptureTransformer(state)); + return THolder(new TDqsRecaptureTransformer(state)); } } // NYql diff --git a/ydb/library/yql/providers/solomon/provider/yql_solomon_datasink_execution.cpp b/ydb/library/yql/providers/solomon/provider/yql_solomon_datasink_execution.cpp index a5e5c3d73e..e3048498c7 100644 --- a/ydb/library/yql/providers/solomon/provider/yql_solomon_datasink_execution.cpp +++ b/ydb/library/yql/providers/solomon/provider/yql_solomon_datasink_execution.cpp @@ -132,7 +132,7 @@ private: }; THolder<TExecTransformerBase> CreateSolomonDataSinkExecTransformer(TSolomonState::TPtr state) { - return THolder(new TSolomonDataSinkExecTransformer(state)); + return THolder(new TSolomonDataSinkExecTransformer(state)); } } // namespace NYql diff --git a/ydb/library/yql/providers/solomon/provider/yql_solomon_datasink_type_ann.cpp b/ydb/library/yql/providers/solomon/provider/yql_solomon_datasink_type_ann.cpp index 55f3335f61..dc9ea45a8f 100644 --- a/ydb/library/yql/providers/solomon/provider/yql_solomon_datasink_type_ann.cpp +++ b/ydb/library/yql/providers/solomon/provider/yql_solomon_datasink_type_ann.cpp @@ -81,7 +81,7 @@ private: }; THolder<TVisitorTransformerBase> CreateSolomonDataSinkTypeAnnotationTransformer(TSolomonState::TPtr state) { - return THolder(new TSolomonDataSinkTypeAnnotationTransformer(state)); + return THolder(new TSolomonDataSinkTypeAnnotationTransformer(state)); } } // namespace NYql diff --git a/ydb/library/yql/providers/solomon/provider/yql_solomon_datasource_execution.cpp b/ydb/library/yql/providers/solomon/provider/yql_solomon_datasource_execution.cpp index cbe49dfcb2..c381baf708 100644 --- a/ydb/library/yql/providers/solomon/provider/yql_solomon_datasource_execution.cpp +++ b/ydb/library/yql/providers/solomon/provider/yql_solomon_datasource_execution.cpp @@ -16,7 +16,7 @@ private: }; THolder<TExecTransformerBase> CreateSolomonDataSourceExecTransformer(TSolomonState::TPtr state) { - return THolder(new TSolomonDataSourceExecTransformer(state)); + return THolder(new TSolomonDataSourceExecTransformer(state)); } } // namespace NYql diff --git a/ydb/library/yql/providers/solomon/provider/yql_solomon_datasource_type_ann.cpp b/ydb/library/yql/providers/solomon/provider/yql_solomon_datasource_type_ann.cpp index a193588ba0..f6a0ce8003 100644 --- a/ydb/library/yql/providers/solomon/provider/yql_solomon_datasource_type_ann.cpp +++ b/ydb/library/yql/providers/solomon/provider/yql_solomon_datasource_type_ann.cpp @@ -19,7 +19,7 @@ private: }; THolder<TVisitorTransformerBase> CreateSolomonDataSourceTypeAnnotationTransformer(TSolomonState::TPtr state) { - return THolder(new TSolomonDataSourceTypeAnnotationTransformer(state)); + return THolder(new TSolomonDataSourceTypeAnnotationTransformer(state)); } } // namespace NYql diff --git a/ydb/library/yql/providers/solomon/provider/yql_solomon_io_discovery.cpp b/ydb/library/yql/providers/solomon/provider/yql_solomon_io_discovery.cpp index ed9a1d23dd..880811beee 100644 --- a/ydb/library/yql/providers/solomon/provider/yql_solomon_io_discovery.cpp +++ b/ydb/library/yql/providers/solomon/provider/yql_solomon_io_discovery.cpp @@ -73,7 +73,7 @@ private: }; THolder<IGraphTransformer> CreateSolomonIODiscoveryTransformer(TSolomonState::TPtr state) { - return THolder(new TSolomonIODiscoveryTransformer(state)); + return THolder(new TSolomonIODiscoveryTransformer(state)); } } // namespace NYql diff --git a/ydb/library/yql/providers/solomon/provider/yql_solomon_load_meta.cpp b/ydb/library/yql/providers/solomon/provider/yql_solomon_load_meta.cpp index 4b4f70ba4c..42324bb3de 100644 --- a/ydb/library/yql/providers/solomon/provider/yql_solomon_load_meta.cpp +++ b/ydb/library/yql/providers/solomon/provider/yql_solomon_load_meta.cpp @@ -39,7 +39,7 @@ private: }; THolder<IGraphTransformer> CreateSolomonLoadTableMetadataTransformer(TSolomonState::TPtr state) { - return THolder(new TSolomonLoadTableMetadataTransformer(state)); + return THolder(new TSolomonLoadTableMetadataTransformer(state)); } } // namespace NYql diff --git a/ydb/library/yql/utils/log/log.cpp b/ydb/library/yql/utils/log/log.cpp index 5d5b587f81..b62bfeb907 100644 --- a/ydb/library/yql/utils/log/log.cpp +++ b/ydb/library/yql/utils/log/log.cpp @@ -160,7 +160,7 @@ void TYqlLog::WriteLogPrefix(IOutputStream* out, EComponent component, ELevel le void TYqlLog::SetMaxLogLimit(ui64 limit) { auto backend = TLog::ReleaseBackend(); - TLog::ResetBackend(THolder(new TLimitedLogBackend(backend, WriteTruncMsg_, limit))); + TLog::ResetBackend(THolder(new TLimitedLogBackend(backend, WriteTruncMsg_, limit))); } void InitLogger(const TString& logType, bool startAsDaemon) { @@ -186,7 +186,7 @@ void InitLogger(const TString& logType, bool startAsDaemon) { auto backend = MakeHolder<TSysLogBackend>( GetProgramName().data(), TSysLogBackend::TSYSLOG_LOCAL1); auto& logger = TLoggerOperator<TYqlLog>::Log(); - logger.ResetBackend(THolder(backend.Release())); + logger.ResetBackend(THolder(backend.Release())); } else { TLoggerOperator<TYqlLog>::Set(new TYqlLog(logType, levels)); } |