Merge branch 'rightlib' into mergelibs-240913-0843

5 files changed, 18 insertions, 9 deletions

diff --git a/library/cpp/http/push_parser/http_parser.cpp b/library/cpp/http/push_parser/http_parser.cpp
index a646b349a3..b7b0a82bec 100644
--- a/library/cpp/http/push_parser/http_parser.cpp
+++ b/library/cpp/http/push_parser/http_parser.cpp
@@ -44,6 +44,10 @@ TString THttpParser::GetBestCompressionScheme() const {
     return TString();
 }
 
+const THashSet<TString>& THttpParser::AcceptedEncodings() const {
+    return AcceptEncodings_;
+}
+
 bool THttpParser::FirstLineParser() {
     if (Y_UNLIKELY(!ReadLine())) {
         return false;
diff --git a/library/cpp/http/push_parser/http_parser.h b/library/cpp/http/push_parser/http_parser.h
index af3ce46dbd..64d7b12ea5 100644
--- a/library/cpp/http/push_parser/http_parser.h
+++ b/library/cpp/http/push_parser/http_parser.h
@@ -100,6 +100,8 @@ public:
 
     TString GetBestCompressionScheme() const;
 
+    const THashSet<TString>& AcceptedEncodings() const;
+
     const TString& Content() const noexcept {
         return Content_;
     }
diff --git a/library/cpp/svnversion/ya.make b/library/cpp/svnversion/ya.make
index 3789c4b38a..d028f45c94 100644
--- a/library/cpp/svnversion/ya.make
+++ b/library/cpp/svnversion/ya.make
@@ -4,7 +4,13 @@ SRCS(
     svnversion.cpp
     svn_interface.c
 )
+
+IF (OPENSOURCE_PROJECT == "yt-cpp-sdk")
+    PEERDIR(build/scripts/c_templates/)
+ENDIF()
+
 END()
+
 RECURSE(
     test
 )
diff --git a/library/cpp/threading/thread_local/thread_local.h b/library/cpp/threading/thread_local/thread_local.h
index 1cc4642373..bb0d11347d 100644
--- a/library/cpp/threading/thread_local/thread_local.h
+++ b/library/cpp/threading/thread_local/thread_local.h
@@ -222,16 +222,16 @@ public:
 
     template <typename ...ConsturctArgs>
     T* Get(TThread::TId tid, ConsturctArgs&& ...args) {
-        TNode* node = Head_.load(std::memory_order_relaxed);
-        for (; node; node = node->Next) {
+        TNode* head = Head_.load(std::memory_order_acquire);
+        for (TNode* node = head; node; node = node->Next) {
             if (node->Key == tid) {
                 return &node->Value;
             }
         }
 
-        TNode* newNode = AllocateNode(tid, node, std::forward<ConsturctArgs>(args)...);
-        while (!Head_.compare_exchange_weak(node, newNode, std::memory_order_release, std::memory_order_relaxed)) {
-            newNode->Next = node;
+        TNode* newNode = AllocateNode(tid, head, std::forward<ConsturctArgs>(args)...);
+        while (!Head_.compare_exchange_weak(head, newNode, std::memory_order_release, std::memory_order_relaxed)) {
+            newNode->Next = head;
         }
 
         return &newNode->Value;
diff --git a/library/python/monlib/metric_registry.pyx b/library/python/monlib/metric_registry.pyx
index 800a1abd1b..aae0a5962a 100644
--- a/library/python/monlib/metric_registry.pyx
+++ b/library/python/monlib/metric_registry.pyx
@@ -12,6 +12,7 @@ from util.datetime.base cimport TInstant
 from util.system.types cimport ui32
 from util.generic.vector cimport TVector
 
+from libcpp.utility cimport move
 from libcpp.string cimport string
 
 from cython.operator cimport address, dereference as deref
@@ -20,10 +21,6 @@ import datetime as dt
 import sys
 
 
-cdef extern from "<utility>" namespace "std" nogil:
-    cdef IHistogramCollectorPtr&& move(IHistogramCollectorPtr t)
-
-
 def get_or_raise(kwargs, key):
     value = kwargs.get(key)
     if value is None: