Intermediate changes

6 files changed, 14 insertions, 3 deletions

diff --git a/yt/cpp/mapreduce/client/skiff.cpp b/yt/cpp/mapreduce/client/skiff.cpp
index f6e52f44e8..480ee4ef66 100644
--- a/yt/cpp/mapreduce/client/skiff.cpp
+++ b/yt/cpp/mapreduce/client/skiff.cpp
@@ -78,6 +78,7 @@ NSkiff::EWireType ValueTypeToSkiffType(EValueType valueType)
         case VT_STRING:
         case VT_UTF8:
         case VT_JSON:
+        case VT_UUID:
             return EWireType::String32;
 
         case VT_ANY:
diff --git a/yt/cpp/mapreduce/interface/common.cpp b/yt/cpp/mapreduce/interface/common.cpp
index 0a46c0b583..831762fa95 100644
--- a/yt/cpp/mapreduce/interface/common.cpp
+++ b/yt/cpp/mapreduce/interface/common.cpp
@@ -201,6 +201,9 @@ static NTi::TTypePtr OldTypeToTypeV3(EValueType type)
             return NTi::Timestamp64();
         case VT_INTERVAL64:
             return NTi::Interval64();
+
+        case VT_UUID:
+            return NTi::Uuid();
     }
 }
 
@@ -259,7 +262,7 @@ static std::pair<EValueType, bool> Simplify(const NTi::TTypePtr& type)
         case ETypeName::Decimal:
             return {VT_STRING, true};
         case ETypeName::Uuid:
-            break;
+            return {VT_UUID, true};
         case ETypeName::Yson:
             return {VT_ANY, true};
 
@@ -660,6 +663,9 @@ TString ToString(EValueType type)
             return "timestamp64";
         case VT_INTERVAL64:
             return "interval64";
+
+        case VT_UUID:
+            return "uuid";
     }
     ythrow yexception() << "Invalid value type " << static_cast<int>(type);
 }
diff --git a/yt/cpp/mapreduce/interface/common.h b/yt/cpp/mapreduce/interface/common.h
index 10988225dd..557f4ea6c4 100644
--- a/yt/cpp/mapreduce/interface/common.h
+++ b/yt/cpp/mapreduce/interface/common.h
@@ -412,6 +412,9 @@ enum EValueType : int
     VT_TIMESTAMP64,
     // Interval64, difference between two timestamps64 (signed)
     VT_INTERVAL64,
+
+    // Universally unique identifier according to RFC-4122.
+    VT_UUID,
 };
 
 ///
diff --git a/yt/cpp/mapreduce/interface/serialize.cpp b/yt/cpp/mapreduce/interface/serialize.cpp
index b195bf04d6..99f6f46b93 100644
--- a/yt/cpp/mapreduce/interface/serialize.cpp
+++ b/yt/cpp/mapreduce/interface/serialize.cpp
@@ -134,6 +134,8 @@ void Deserialize(EValueType& valueType, const TNode& node)
         {"datetime64", VT_DATETIME64},
         {"timestamp64", VT_TIMESTAMP64},
         {"interval64", VT_INTERVAL64},
+
+        {"uuid", VT_UUID},
     };
 
     auto it = str2ValueType.find(nodeStr);
diff --git a/yt/yt/core/http/helpers.h b/yt/yt/core/http/helpers.h
index 658236f1e5..f0da7d1118 100644
--- a/yt/yt/core/http/helpers.h
+++ b/yt/yt/core/http/helpers.h
@@ -40,6 +40,7 @@ inline const TString XContentTypeOptionsHeaderName("X-Content-Type-Options");
 inline const TString XRequestTimeoutHeaderName("X-Request-Timeout");
 
 inline const TString UserTicketHeaderName("X-Ya-User-Ticket");
+inline const TString ServiceTicketHeaderName("X-Ya-Service-Ticket");
 inline const TString XDnsPrefetchControlHeaderName("X-DNS-Prefetch-Control");
 inline const TString XForwardedForYHeaderName("X-Forwarded-For-Y");
 inline const TString XFrameOptionsHeaderName("X-Frame-Options");
diff --git a/yt/yt/core/rpc/service_detail.h b/yt/yt/core/rpc/service_detail.h
index 19c64c0359..21c9078e80 100644
--- a/yt/yt/core/rpc/service_detail.h
+++ b/yt/yt/core/rpc/service_detail.h
@@ -1136,8 +1136,6 @@ private:
     void ScheduleRequestsFromQueue();
     void RunRequest(TServiceBase::TServiceContextPtr context);
 
-    i64 GetTotalRequestSize(const TServiceBase::TServiceContextPtr& context);
-
     void IncrementQueueSize(const TServiceBase::TServiceContextPtr& context);
     void DecrementQueueSize(const TServiceBase::TServiceContextPtr& context);