diff options
| author | Aleksandr Khoroshilov <hor911@gmail.com> | 2022-04-19 19:03:10 +0300 |
|---|---|---|
| committer | Aleksandr Khoroshilov <hor911@gmail.com> | 2022-04-19 19:03:10 +0300 |
| commit | c93a7db0c2f228ca5ac87310dc5bae77d821fb03 (patch) | |
| tree | 01242d93e6033893379eecdcd865eae27fb53e46 | |
| parent | eb3f8b2c051dfb1532102448c491e0a0015956f8 (diff) | |
| download | ydb-c93a7db0c2f228ca5ac87310dc5bae77d821fb03.tar.gz | |
Use ActorSystem for logging instead of ActorContext
ref:a02f0fda0152588a5b6ca09e8fed3d6c7c5fc4d5
| -rw-r--r-- | ydb/library/yql/dq/actors/compute/dq_compute_actor_impl.h | 3 | ||||
| -rw-r--r-- | ydb/library/yql/dq/actors/compute/dq_compute_memory_quota.h | 12 |
2 files changed, 9 insertions, 6 deletions
diff --git a/ydb/library/yql/dq/actors/compute/dq_compute_actor_impl.h b/ydb/library/yql/dq/actors/compute/dq_compute_actor_impl.h index 75b4086fd99..665d5b43dc1 100644 --- a/ydb/library/yql/dq/actors/compute/dq_compute_actor_impl.h +++ b/ydb/library/yql/dq/actors/compute/dq_compute_actor_impl.h @@ -226,7 +226,8 @@ protected: TxId, Task.GetId(), RuntimeSettings.StatsMode >= NDqProto::DQ_STATS_MODE_PROFILE, - CanAllocateExtraMemory); + CanAllocateExtraMemory, + NActors::TActivationContext::ActorSystem()); } virtual ui64 GetMkqlMemoryLimit() const { diff --git a/ydb/library/yql/dq/actors/compute/dq_compute_memory_quota.h b/ydb/library/yql/dq/actors/compute/dq_compute_memory_quota.h index cc83989ae93..8dcb62e906a 100644 --- a/ydb/library/yql/dq/actors/compute/dq_compute_memory_quota.h +++ b/ydb/library/yql/dq/actors/compute/dq_compute_memory_quota.h @@ -12,22 +12,23 @@ namespace NYql::NDq { #define CAMQ_LOG_D(s) \ - LOG_DEBUG_S(*NActors::TlsActivationContext, NKikimrServices::KQP_COMPUTE, "TxId: " << TxId << ", task: " << TaskId << ". " << s) + LOG_DEBUG_S(*ActorSystem, NKikimrServices::KQP_COMPUTE, "TxId: " << TxId << ", task: " << TaskId << ". " << s) #define CAMQ_LOG_I(s) \ - LOG_INFO_S(*NActors::TlsActivationContext, NKikimrServices::KQP_COMPUTE, "TxId: " << TxId << ", task: " << TaskId << ". " << s) + LOG_INFO_S(*ActorSystem, NKikimrServices::KQP_COMPUTE, "TxId: " << TxId << ", task: " << TaskId << ". " << s) #define CAMQ_LOG_W(s) \ - LOG_WARN_S(*NActors::TlsActivationContext, NKikimrServices::KQP_COMPUTE, "TxId: " << TxId << ", task: " << TaskId << ". " << s) + LOG_WARN_S(*ActorSystem, NKikimrServices::KQP_COMPUTE, "TxId: " << TxId << ", task: " << TaskId << ". " << s) class TDqMemoryQuota { public: - TDqMemoryQuota(ui64 initialMkqlMemoryLimit, const NYql::NDq::TComputeMemoryLimits& memoryLimits, NYql::NDq::TTxId txId, ui64 taskId, bool profileStats, bool canAllocateExtraMemory) + TDqMemoryQuota(ui64 initialMkqlMemoryLimit, const NYql::NDq::TComputeMemoryLimits& memoryLimits, NYql::NDq::TTxId txId, ui64 taskId, bool profileStats, bool canAllocateExtraMemory, NActors::TActorSystem* actorSystem) : InitialMkqlMemoryLimit(initialMkqlMemoryLimit) , MkqlMemoryLimit(initialMkqlMemoryLimit) , MemoryLimits(memoryLimits) , TxId(txId) , TaskId(taskId) , ProfileStats(profileStats ? MakeHolder<TProfileStats>() : nullptr) - , CanAllocateExtraMemory(canAllocateExtraMemory) { + , CanAllocateExtraMemory(canAllocateExtraMemory) + , ActorSystem(actorSystem) { } ui64 GetMkqlMemoryLimit() const { @@ -126,5 +127,6 @@ namespace NYql::NDq { const ui64 TaskId; THolder<TProfileStats> ProfileStats; const bool CanAllocateExtraMemory; + NActors::TActorSystem* ActorSystem; }; } // namespace NYql::NDq
\ No newline at end of file |