Cosmetics, resolve babenko-issues

b6044e29b6bb543be4bcd074c38b1e79bbce0032

5 files changed, 4 insertions, 6 deletions

diff --git a/yt/yt/client/api/admin_client.h b/yt/yt/client/api/admin_client.h
index 8a374df98c..b81b7a0f9b 100644
--- a/yt/yt/client/api/admin_client.h
+++ b/yt/yt/client/api/admin_client.h
@@ -161,7 +161,7 @@ struct TResurrectChunkLocationsResult
 struct TMasterConsistentState
 {
     i64 SequenceNumber;
-    i64 SegmentId;
+    int SegmentId;
 };
 
 using TCellIdToSnapshotIdMap = THashMap<NHydra::TCellId, int>;
diff --git a/yt/yt/client/hive/public.h b/yt/yt/client/hive/public.h
index 0c8d010ecc..ac1e725e94 100644
--- a/yt/yt/client/hive/public.h
+++ b/yt/yt/client/hive/public.h
@@ -34,7 +34,7 @@ DECLARE_REFCOUNTED_STRUCT(ITransactionParticipant)
 YT_DEFINE_ERROR_ENUM(
     ((MailboxNotCreatedYet)    (2200))
     ((ParticipantUnregistered) (2201))
-    ((TimeEntryNotFound)           (2202))
+    ((TimeEntryNotFound)       (2202))
 );
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/yt/yt/client/object_client/public.cpp b/yt/yt/client/object_client/public.cpp
index cf368cc1c9..11eb2f1a6b 100644
--- a/yt/yt/client/object_client/public.cpp
+++ b/yt/yt/client/object_client/public.cpp
@@ -8,8 +8,6 @@ namespace NYT::NObjectClient {
 
 ////////////////////////////////////////////////////////////////////////////////
 
-const TStringBuf ObjectIdPathPrefix("#");
-
 TVersionedObjectId::TVersionedObjectId(TObjectId objectId)
     : ObjectId(objectId)
 { }
diff --git a/yt/yt/client/object_client/public.h b/yt/yt/client/object_client/public.h
index bdb18fa02d..fa6c90fa38 100644
--- a/yt/yt/client/object_client/public.h
+++ b/yt/yt/client/object_client/public.h
@@ -48,7 +48,7 @@ using TObjectId = TGuid;
 constexpr TObjectId NullObjectId = {};
 
 //! |#|-prefix.
-extern const TStringBuf ObjectIdPathPrefix;
+inline const TStringBuf ObjectIdPathPrefix = "#";
 
 //! Used to mark counters for well-known ids.
 constexpr ui64 WellKnownCounterMask = 0x8000000000000000;
diff --git a/yt/yt/core/ytree/ypath_client.cpp b/yt/yt/core/ytree/ypath_client.cpp
index b7bf13d3dd..47a285b360 100644
--- a/yt/yt/core/ytree/ypath_client.cpp
+++ b/yt/yt/core/ytree/ypath_client.cpp
@@ -264,7 +264,7 @@ TYPathMaybeRef GetOriginalRequestTargetYPath(const NRpc::NProto::TRequestHeader&
 void SetRequestTargetYPath(NRpc::NProto::TRequestHeader* header, TYPathBuf path)
 {
     auto* ypathExt = header->MutableExtension(NProto::TYPathHeaderExt::ypath_header_ext);
-    ypathExt->set_target_path(TYPath(path));
+    ypathExt->set_target_path(ToProto<TString>(path));
 }
 
 bool IsRequestMutating(const NRpc::NProto::TRequestHeader& header)