diff options
| author | bystrovserg <[email protected]> | 2025-07-10 14:51:31 +0300 |
|---|---|---|
| committer | bystrovserg <[email protected]> | 2025-07-10 15:09:52 +0300 |
| commit | 6d178dc1e5fe73dc17fb8ca9ab3e74caaafe116c (patch) | |
| tree | b5f292f60717d12de98f360acefdcb1e8ae906fb | |
| parent | e27d394b0eaa804a235af844d417410087668ef2 (diff) | |
YT-24840: Move EJobStderrType to client/api
commit_hash:9b8fd0952d7d3e283fcc02ed3e9eb8b6e09607d7
| -rw-r--r-- | yt/yt/client/api/operation_client.h | 9 | ||||
| -rw-r--r-- | yt/yt/client/api/rpc_proxy/helpers.cpp | 12 | ||||
| -rw-r--r-- | yt/yt/client/api/rpc_proxy/helpers.h | 4 | ||||
| -rw-r--r-- | yt/yt/client/driver/scheduler_commands.cpp | 2 | ||||
| -rw-r--r-- | yt/yt/client/exec_node/public.h | 16 |
5 files changed, 15 insertions, 28 deletions
diff --git a/yt/yt/client/api/operation_client.h b/yt/yt/client/api/operation_client.h index a0aa8723a04..e60e42ea5f1 100644 --- a/yt/yt/client/api/operation_client.h +++ b/yt/yt/client/api/operation_client.h @@ -2,8 +2,6 @@ #include "client_common.h" -#include <yt/yt/client/exec_node/public.h> - #include <yt/yt/client/scheduler/operation_id_or_alias.h> #include <yt/yt/client/scheduler/public.h> @@ -91,11 +89,16 @@ struct TGetJobSpecOptions bool OmitOutputTableSpecs = false; }; +DEFINE_ENUM(EJobStderrType, + ((UserJobStderr) (0)) + ((GpuCheckStderr) (1)) +); + struct TGetJobStderrOptions : public TTimeoutOptions , public TMasterReadOptions { - std::optional<NExecNode::EJobStderrType> Type; + std::optional<EJobStderrType> Type; std::optional<i64> Limit; std::optional<i64> Offset; }; diff --git a/yt/yt/client/api/rpc_proxy/helpers.cpp b/yt/yt/client/api/rpc_proxy/helpers.cpp index 0eb7bb6a5a0..acdfa826ff5 100644 --- a/yt/yt/client/api/rpc_proxy/helpers.cpp +++ b/yt/yt/client/api/rpc_proxy/helpers.cpp @@ -1821,24 +1821,24 @@ NQueryTrackerClient::EQueryState ConvertQueryStateFromProto( YT_ABORT(); } -NExecNode::EJobStderrType ConvertJobStderrTypeFromProto( +NApi::EJobStderrType ConvertJobStderrTypeFromProto( NProto::EJobStderrType proto) { switch (proto) { case NProto::EJobStderrType::JST_USER_JOB_STDERR: - return NExecNode::EJobStderrType::UserJobStderr; + return NApi::EJobStderrType::UserJobStderr; case NProto::EJobStderrType::JST_GPU_CHECK_STDERR: - return NExecNode::EJobStderrType::GpuCheckStderr; + return NApi::EJobStderrType::GpuCheckStderr; } } NProto::EJobStderrType ConvertJobStderrTypeToProto( - NExecNode::EJobStderrType jobStderrType) + NApi::EJobStderrType jobStderrType) { switch (jobStderrType) { - case NExecNode::EJobStderrType::UserJobStderr: + case NApi::EJobStderrType::UserJobStderr: return NProto::EJobStderrType::JST_USER_JOB_STDERR; - case NExecNode::EJobStderrType::GpuCheckStderr: + case NApi::EJobStderrType::GpuCheckStderr: return NProto::EJobStderrType::JST_GPU_CHECK_STDERR; } } diff --git a/yt/yt/client/api/rpc_proxy/helpers.h b/yt/yt/client/api/rpc_proxy/helpers.h index bb5ca9b190c..f0a8f7a3735 100644 --- a/yt/yt/client/api/rpc_proxy/helpers.h +++ b/yt/yt/client/api/rpc_proxy/helpers.h @@ -308,11 +308,11 @@ NProto::EQueryState ConvertQueryStateToProto( NQueryTrackerClient::EQueryState ConvertQueryStateFromProto( NProto::EQueryState proto); -NExecNode::EJobStderrType ConvertJobStderrTypeFromProto( +NApi::EJobStderrType ConvertJobStderrTypeFromProto( NProto::EJobStderrType proto); NProto::EJobStderrType ConvertJobStderrTypeToProto( - NExecNode::EJobStderrType jobStderrType); + NApi::EJobStderrType jobStderrType); //////////////////////////////////////////////////////////////////////////////// diff --git a/yt/yt/client/driver/scheduler_commands.cpp b/yt/yt/client/driver/scheduler_commands.cpp index e845058ca9a..322304d86db 100644 --- a/yt/yt/client/driver/scheduler_commands.cpp +++ b/yt/yt/client/driver/scheduler_commands.cpp @@ -151,7 +151,7 @@ void TGetJobStderrCommand::Register(TRegistrar registrar) }) .Optional(/*init*/ true); - registrar.ParameterWithUniversalAccessor<std::optional<NExecNode::EJobStderrType>>( + registrar.ParameterWithUniversalAccessor<std::optional<NApi::EJobStderrType>>( "type", [] (TThis* command) -> auto& { return command->Options.Type; diff --git a/yt/yt/client/exec_node/public.h b/yt/yt/client/exec_node/public.h deleted file mode 100644 index d1db53393f5..00000000000 --- a/yt/yt/client/exec_node/public.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#include <library/cpp/yt/misc/enum.h> - -namespace NYT::NExecNode { - -//////////////////////////////////////////////////////////////////////////////// - -DEFINE_ENUM(EJobStderrType, - ((UserJobStderr) (0)) - ((GpuCheckStderr) (1)) -); - -//////////////////////////////////////////////////////////////////////////////// - -} // namespace NYT::NExecNode |
