Library import 240819-0942 (#7994)

Co-authored-by: robot-piglet <robot-piglet@yandex-team.com>
Co-authored-by: hiddenpath <hiddenpath@yandex-team.com>
Co-authored-by: bulatman <bulatman@yandex-team.com>
Co-authored-by: robot-contrib <robot-contrib@yandex-team.com>
Co-authored-by: osidorkin <osidorkin@yandex-team.com>
Co-authored-by: akhropov <akhropov@yandex-team.com>
Co-authored-by: akozhikhov <akozhikhov@yandex-team.com>
Co-authored-by: orlovorlov <orlovorlov@yandex-team.com>
Co-authored-by: babenko <babenko@yandex-team.com>
Co-authored-by: shadchin <shadchin@yandex-team.com>
Co-authored-by: dmasloff <dmasloff@yandex-team.com>
Co-authored-by: aleksei-le <aleksei-le@yandex-team.com>
Co-authored-by: coteeq <coteeq@yandex-team.com>
Co-authored-by: dimdim11 <dimdim11@yandex-team.com>
Co-authored-by: robot-ya-builder <robot-ya-builder@yandex-team.com>
Co-authored-by: iaz1607 <iaz1607@yandex-team.com>

build/config/tests/cpp_style/config.clang-format

@@ -89,5 +89,5 @@ AttributeMacros: [Y_PRINTF_FORMAT, Y_NO_SANITIZE, Y_FORCE_INLINE, Y_NO_INLINE, Y
 IndentExternBlock: Indent
 TypenameMacros: [Y_THREAD, Y_STATIC_THREAD, Y_POD_THREAD, Y_POD_STATIC_THREAD]
 SpacesInLineCommentPrefix:
- Minimum: 0
- Maximum: -1
+ Minimum: 1
+ Maximum: 1

build/export_generators/cmake/conan_imports.jinja

@@ -5,8 +5,29 @@
 {%-     set srcdir_and_mask = rsplit(search, ",", 2) -%}
 {%-     set srcdir = srcdir_and_mask[0]|trim -%}
 {%-     set mask = srcdir_and_mask[1]|trim -%}
-{%-     if use_conan2 %}
-                {{ shift }}copy(self, pattern="{{ mask }}", src=dep.cpp_info.bindirs[0], dst=self.build_folder + "../../../../{{ dstdir }}")
+{%-     if use_conan2 -%}
+{%-         if "bin" in srcdir %}
+            for bindir in dep.cpp_info.bindirs:
+                {{ shift }}copy(self, pattern="{{ mask }}", src=bindir, dst=self.build_folder + "../../../../{{ dstdir }}")
+{%-         elif "res" in srcdir %}
+            for resdir in dep.cpp_info.resdirs:
+                {{ shift }}copy(self, pattern="{{ mask }}", src=resdir, dst=self.build_folder + "../../../../{{ dstdir }}")
+{%-         elif "build" in srcdir %}
+            for builddir in dep.cpp_info.builddirs:
+                {{ shift }}copy(self, pattern="{{ mask }}", src=builddir, dst=self.build_folder + "../../../../{{ dstdir }}")
+{%-         elif ("src" in srcdir) or ("source" in srcdir) %}
+            for srcdir in dep.cpp_info.srcdirs:
+                {{ shift }}copy(self, pattern="{{ mask }}", src=srcdir, dst=self.build_folder + "../../../../{{ dstdir }}")
+{%-         elif "lib" in srcdir %}
+            for libdir in dep.cpp_info.libdirs:
+                {{ shift }}copy(self, pattern="{{ mask }}", src=libdir, dst=self.build_folder + "../../../../{{ dstdir }}")
+{%-         elif "include" in srcdir %}
+            for includedir in dep.cpp_info.includedirs:
+                {{ shift }}copy(self, pattern="{{ mask }}", src=includedir, dst=self.build_folder + "../../../../{{ dstdir }}")
+{%-         elif "frame" in srcdir %}
+            for framedir in dep.cpp_info.frameworkdirs:
+                {{ shift }}copy(self, pattern="{{ mask }}", src=framedir, dst=self.build_folder + "../../../../{{ dstdir }}")
+{%-         endif -%}
 {%-     else %}
         {{ shift }}self.copy(pattern="{{ mask }}", src="{{ srcdir }}", dst="{{ dstdir }}")
 {%-     endif -%}

build/export_generators/cmake/conanfile.py.jinja

@@ -75,7 +75,6 @@ class App(ConanFile):
 {%-     endfor %}
 
         for dep in self.dependencies.values():
-            if dep.cpp_info.bindirs:
 {%-         if conan.imports|length -%}
 {%-             set conan_imports = conan.imports -%}
 {%-             set shift = "" -%}

build/mapping.conf.json

@@ -196,14 +196,19 @@
         "5841616607": "https://devtools-registry.s3.yandex.net/5841616607",
         "6255592114": "https://devtools-registry.s3.yandex.net/6255592114",
         "6607396810": "https://devtools-registry.s3.yandex.net/6607396810",
+        "6892424874": "https://devtools-registry.s3.yandex.net/6892424874",
         "6255591964": "https://devtools-registry.s3.yandex.net/6255591964",
         "6607396320": "https://devtools-registry.s3.yandex.net/6607396320",
+        "6892424539": "https://devtools-registry.s3.yandex.net/6892424539",
         "6255592465": "https://devtools-registry.s3.yandex.net/6255592465",
         "6607397946": "https://devtools-registry.s3.yandex.net/6607397946",
+        "6892425499": "https://devtools-registry.s3.yandex.net/6892425499",
         "6255592313": "https://devtools-registry.s3.yandex.net/6255592313",
         "6607397279": "https://devtools-registry.s3.yandex.net/6607397279",
+        "6892425185": "https://devtools-registry.s3.yandex.net/6892425185",
         "6255591839": "https://devtools-registry.s3.yandex.net/6255591839",
         "6607395742": "https://devtools-registry.s3.yandex.net/6607395742",
+        "6892424070": "https://devtools-registry.s3.yandex.net/6892424070",
         "5786827409": "https://devtools-registry.s3.yandex.net/5786827409",
         "5786826723": "https://devtools-registry.s3.yandex.net/5786826723",
         "5786828167": "https://devtools-registry.s3.yandex.net/5786828167",
@@ -369,6 +374,8 @@
         "6815696206": "https://devtools-registry.s3.yandex.net/6815696206",
         "6859343013": "https://devtools-registry.s3.yandex.net/6859343013",
         "6859350577": "https://devtools-registry.s3.yandex.net/6859350577",
+        "6892341406": "https://devtools-registry.s3.yandex.net/6892341406",
+        "6892348074": "https://devtools-registry.s3.yandex.net/6892348074",
         "5486731632": "https://devtools-registry.s3.yandex.net/5486731632",
         "5514350352": "https://devtools-registry.s3.yandex.net/5514350352",
         "5514360398": "https://devtools-registry.s3.yandex.net/5514360398",
@@ -964,14 +971,19 @@
         "5841616607": "contrib/tools/protoc/bin/protoc for linux",
         "6255592114": "contrib/tools/python3/bin/python3 for darwin",
         "6607396810": "contrib/tools/python3/bin/python3 for darwin",
+        "6892424874": "contrib/tools/python3/bin/python3 for darwin",
         "6255591964": "contrib/tools/python3/bin/python3 for darwin-arm64",
         "6607396320": "contrib/tools/python3/bin/python3 for darwin-arm64",
+        "6892424539": "contrib/tools/python3/bin/python3 for darwin-arm64",
         "6255592465": "contrib/tools/python3/bin/python3 for linux",
         "6607397946": "contrib/tools/python3/bin/python3 for linux",
+        "6892425499": "contrib/tools/python3/bin/python3 for linux",
         "6255592313": "contrib/tools/python3/bin/python3 for linux-aarch64",
         "6607397279": "contrib/tools/python3/bin/python3 for linux-aarch64",
+        "6892425185": "contrib/tools/python3/bin/python3 for linux-aarch64",
         "6255591839": "contrib/tools/python3/bin/python3 for win32",
         "6607395742": "contrib/tools/python3/bin/python3 for win32",
+        "6892424070": "contrib/tools/python3/bin/python3 for win32",
         "5786827409": "contrib/tools/python3/python3 for darwin",
         "5786826723": "contrib/tools/python3/python3 for darwin-arm64",
         "5786828167": "contrib/tools/python3/python3 for linux",
@@ -1137,6 +1149,8 @@
         "6815696206": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
         "6859343013": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
         "6859350577": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
+        "6892341406": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
+        "6892348074": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
         "5486731632": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
         "5514350352": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
         "5514360398": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",

build/platform/python/ymake_python3/resources.json

@@ -1,19 +1,19 @@
 {
     "by_platform": {
         "darwin": {
-            "uri": "sbr:6607396810"
+            "uri": "sbr:6892424874"
         },
         "darwin-arm64": {
-            "uri": "sbr:6607396320"
+            "uri": "sbr:6892424539"
         },
         "linux": {
-            "uri": "sbr:6607397946"
+            "uri": "sbr:6892425499"
         },
         "linux-aarch64": {
-            "uri": "sbr:6607397279"
+            "uri": "sbr:6892425185"
         },
         "win32": {
-            "uri": "sbr:6607395742"
+            "uri": "sbr:6892424070"
         }
     }
 }

build/platform/test_tool/host.ya.make.inc

@@ -1,12 +1,12 @@
 IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6859341560)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6892340424)
 ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6859340618)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6892339701)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6859343013)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6892341406)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6859339878)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6892339194)
 ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6859342250)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6892340947)
 
 ENDIF()

build/platform/test_tool/host_os.ya.make.inc

@@ -1,12 +1,12 @@
 IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6859349354)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6892347071)
 ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6859348596)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6892346489)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6859350577)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6892348074)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6859347658)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6892345742)
 ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6859349912)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6892347590)
 
 ENDIF()

build/plugins/lib/test_const/__init__.py

@@ -1,6 +1,16 @@
 # coding: utf-8
 import re
 
+TEST_BT_COLORS = {
+    "function_name": "[[alt1]]",
+    "function_arg": "[[good]]",
+    "stack_frame": "[[bad]]",
+    "thread_prefix": "[[alt3]]",
+    "thread_id": "[[bad]]",
+    "file_path": "[[warn]]",
+    "line_num": "[[alt2]]",
+    "address": "[[unimp]]",
+}
 
 RESTART_TEST_INDICATOR = '##restart-test##'
 INFRASTRUCTURE_ERROR_INDICATOR = '##infrastructure-error##'

build/scripts/link_dyn_lib.py

@@ -212,7 +212,6 @@ def parse_args():
     parser.add_option('--soname')
     parser.add_option('--source-root')
     parser.add_option('--build-root')
-    parser.add_option('--fix-elf')
     parser.add_option('--linker-output')
     parser.add_option('--musl', action='store_true')
     parser.add_option('--dynamic-cuda', action='store_true')
@@ -268,16 +267,6 @@ if __name__ == '__main__':
         print >> sys.stderr, 'linker command:', shlex_join(cmd)
         sys.exit(proc.returncode)
 
-    if opts.fix_elf:
-        cmd = [opts.fix_elf, opts.target]
-        proc = subprocess.Popen(cmd, shell=False, stderr=sys.stderr, stdout=sys.stdout)
-        proc.communicate()
-
-        if proc.returncode:
-            print >> sys.stderr, 'fix_elf has failed with retcode:', proc.returncode
-            print >> sys.stderr, 'fix_elf command:', shlex_join(cmd)
-            sys.exit(proc.returncode)
-
     if opts.soname and opts.soname != opts.target:
         if os.path.exists(opts.soname):
             os.unlink(opts.soname)

contrib/libs/apache/orc/c++/include/orc/orc-config.hh

@@ -19,7 +19,7 @@
 #ifndef ORC_CONFIG_HH
 #define ORC_CONFIG_HH
 
-#define ORC_VERSION "2.0.1"
+#define ORC_VERSION "2.0.2"
 
 #define ORC_CXX_HAS_CSTDINT