diff options
| author | galaxycrab <UgnineSirdis@ydb.tech> | 2022-10-26 19:03:15 +0300 |
|---|---|---|
| committer | galaxycrab <UgnineSirdis@ydb.tech> | 2022-10-26 19:03:15 +0300 |
| commit | 608252fc836bcc17fd845053126f1e60bee2f767 (patch) | |
| tree | 9e44fb87310b895462aecac3f58fed65518f5f39 | |
| parent | 7a8c83ad951880f91a587a3d7c772e05b7e2b61b (diff) | |
| download | ydb-608252fc836bcc17fd845053126f1e60bee2f767.tar.gz | |
Fix incorrect base class for TEvStateRequest
| -rw-r--r-- | library/cpp/neh/http2.cpp | 7 | ||||
| -rw-r--r-- | ydb/library/yql/dq/actors/compute/dq_compute_actor.h | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/library/cpp/neh/http2.cpp b/library/cpp/neh/http2.cpp index fb8b08fd81..e4b024d093 100644 --- a/library/cpp/neh/http2.cpp +++ b/library/cpp/neh/http2.cpp @@ -1563,7 +1563,10 @@ namespace { size_t buffPos = 0; //DBGOUT("receive and parse: " << TStringBuf(Buff_.Get(), amount)); while (P_->Parse(Buff_.Get() + buffPos, amount - buffPos)) { - SeenMessageWithoutKeepalive_ |= !P_->IsKeepAlive() || LeftRequestsToDisconnect_ == 1; + if (!P_->IsKeepAlive() || LeftRequestsToDisconnect_ == 1) { + SeenMessageWithoutKeepalive_ = true; + } + char rt = *P_->FirstLine().data(); const size_t extraDataSize = P_->GetExtraDataSize(); if (rt == 'P' || rt == 'p') { @@ -1858,7 +1861,7 @@ namespace { THashMap<TAtomicBase, TResponseDataRef> ResponsesData_; TAtomicBool Canceled_; - bool SeenMessageWithoutKeepalive_ = false; + TAtomicBool SeenMessageWithoutKeepalive_ = false; i32 LeftRequestsToDisconnect_ = -1; }; diff --git a/ydb/library/yql/dq/actors/compute/dq_compute_actor.h b/ydb/library/yql/dq/actors/compute/dq_compute_actor.h index 44394ccd47..5028acabf4 100644 --- a/ydb/library/yql/dq/actors/compute/dq_compute_actor.h +++ b/ydb/library/yql/dq/actors/compute/dq_compute_actor.h @@ -18,7 +18,7 @@ namespace NDq { struct TEvDqCompute { struct TEvState : public NActors::TEventPB<TEvState, NDqProto::TEvComputeActorState, TDqComputeEvents::EvState> {}; - struct TEvStateRequest : public NActors::TEventPB<TEvState, NDqProto::TEvComputeStateRequest, TDqComputeEvents::EvStateRequest> {}; + struct TEvStateRequest : public NActors::TEventPB<TEvStateRequest, NDqProto::TEvComputeStateRequest, TDqComputeEvents::EvStateRequest> {}; struct TEvResumeExecution : public NActors::TEventLocal<TEvResumeExecution, TDqComputeEvents::EvResumeExecution> {}; |