Merge pull request #12017 from ydb-platform/mergelibs-241126-1510

Library import 241126-1510

build/conf/compilers/gnu_compiler.conf

@@ -225,17 +225,22 @@ _C_CPP_KV_STYLE_NEW=${hide;kv:_C_CPP_KV_STYLE_P} ${hide;kv:_C_CPP_KV_STYLE_PC}
 _C_CPP_KV_STYLE_P=p CC
 _C_CPP_KV_STYLE_PC=pc green
 
-_C_CPP_WRAPPER=$YMAKE_PYTHON3 ${input:"build/scripts/wrapcc.py"} ${input:SRC}
-when ($CLANG_TIDY_ARGS || $RETRY_ARGS || $YNDEXER_ARGS || $OPENSOURCE == "yes" || $RAW_COMPILE_CPP_CMD == "yes" ) {
+# --wrapcc-end argument must be the last one
+_C_CPP_WRAPPER=$YMAKE_PYTHON3 ${input:"build/scripts/wrapcc.py"} \
+    --source-file ${input:SRC} \
+    --source-root ${ARCADIA_ROOT} \
+    --wrapcc-end
+
+when ($CLANG_TIDY_ARGS || $OPENSOURCE == "yes" || $RAW_COMPILE_CPP_CMD == "yes" ) {
     _C_CPP_WRAPPER=
 }
 
 _CPP_ARGS_NEW=\
     $CLANG_STATIC_ANALYZER_OPTIONS_NEW && \
     $CLANG_TIDY_ARGS \
+    $_C_CPP_WRAPPER \
     $YNDEXER_ARGS \
     $RETRY_ARGS \
-    $_C_CPP_WRAPPER \
     $CXX_COMPILER \
     $C_FLAGS_PLATFORM \
     $GCC_COMPILE_FLAGS \
@@ -254,9 +259,9 @@ _CPP_ARGS_NEW=\
 
 _C_ARGS_NEW=\
     $CLANG_TIDY_ARGS \
+    $_C_CPP_WRAPPER \
     $YNDEXER_ARGS \
     $RETRY_ARGS \
-    $_C_CPP_WRAPPER \
     $C_COMPILER \
     $C_FLAGS_PLATFORM \
     $GCC_COMPILE_FLAGS \

build/conf/proto.conf

@@ -657,8 +657,6 @@ JAVA_PROTO_LIBRARY_SEM=$BUILD_PROTO_JAR_SEM $_GRADLE_EXPORT_PUBLISHING_SEM
 
 module _CPP_PROTO : LIBRARY {
     .ALLOWED=_EXPOSE LIST_PROTO
-    # TODO(svidyuk): think about marker which forces semantics inheritance
-    .SEM=CPP_PROTO_LIBRARY_SEM
     FORCE_COVERAGE_DISABLED=yes
     ENABLE(CPP_PROTO)
     ENABLE(GEN_PROTO)
@@ -682,7 +680,6 @@ module _CPP_PROTO : LIBRARY {
 module _JAVA_PROTO: EXTERNAL_JAVA_LIBRARY {
     .EXTS=.jsrc
     .ALLOWED=GRPC
-    .SEM=JAVA_PROTO_LIBRARY_SEM
     SET(PEERDIR_TAGS JAVA)
     ENABLE(JAVA_PROTO)
     DISABLE(_NEED_SBOM_INFO)
@@ -708,7 +705,6 @@ module _JAVA_PROTO: EXTERNAL_JAVA_LIBRARY {
 module _PY_PROTO: PY2_LIBRARY {
     .ALIASES=SRCS=PY_SRCS
     .ALLOWED=OPTIMIZE_PY_PROTOS NO_OPTIMIZE_PY_PROTOS
-    .SEM=IGNORED
     SET(PEERDIR_TAGS PY2)
     ENABLE(PY_PROTO)
     DISABLE(_NEED_SBOM_INFO)
@@ -732,7 +728,6 @@ module _PY_PROTO: PY2_LIBRARY {
 module _PY3_PROTO: PY3_LIBRARY {
     .ALIASES=SRCS=PY_SRCS
     .ALLOWED=OPTIMIZE_PY_PROTOS NO_OPTIMIZE_PY_PROTOS
-    .SEM=IGNORED
     SET(PEERDIR_TAGS PY3)
     ENABLE(PY3_PROTO)
     DISABLE(_NEED_SBOM_INFO)
@@ -755,7 +750,6 @@ module _PY3_PROTO: PY3_LIBRARY {
 
 module _GO_PROTO: GO_LIBRARY {
     .IGNORED=GENERATE_ENUM_SERIALIZATION GENERATE_ENUM_SERIALIZATION_WITH_HEADER YMAPS_SPROTO
-    .SEM=IGNORED
     SET(PEERDIR_TAGS GO)
     ENABLE(GO_PROTO)
 
@@ -782,7 +776,6 @@ module _TS_PREPARE_DEPS: _PREPARE_DEPS_BASE {
 
 module _DESC_PROTO: _BARE_UNIT {
     .CMD=_PROTO_DESC_MERGE_CMD
-    .SEM=IGNORED
     .EXTS=.desc .rawproto
     .NODE_TYPE=Library
     .IGNORED=GENERATE_ENUM_SERIALIZATION GENERATE_ENUM_SERIALIZATION_WITH_HEADER YMAPS_SPROTO RESOURCE GO_PROTO_PLUGIN GRPC
@@ -831,24 +824,30 @@ module _DESC_PROTO: _BARE_UNIT {
 ### See: [GRPC()](#macro_GRPC), [OPTIMIZE_PY_PROTOS()](#macro_OPTIMIZE_PY_PROTOS), [INCLUDE_TAGS()](#macro_INCLUDE_TAGS), [EXCLUDE_TAGS()](#macro_EXCLUDE_TAGS)
 multimodule PROTO_LIBRARY {
     module CPP_PROTO: _CPP_PROTO {
+        # TODO(svidyuk): think about marker which forces semantics inheritance
+        .SEM=CPP_PROTO_LIBRARY_SEM
         SET_APPEND(PEERDIR_TAGS CPP_PROTO)
     }
 
     module JAVA_PROTO: _JAVA_PROTO {
+        .SEM=JAVA_PROTO_LIBRARY_SEM
         SET_APPEND(PEERDIR_TAGS JAVA_PROTO)
     }
 
     module PY_PROTO: _PY_PROTO {
+        .SEM=IGNORED
         SET_APPEND(PEERDIR_TAGS PY_PROTO)
         .PEERDIRSELF=CPP_PROTO
     }
 
     module PY3_PROTO: _PY3_PROTO {
+        .SEM=IGNORED
         SET_APPEND(PEERDIR_TAGS PY3_PROTO)
         .PEERDIRSELF=CPP_PROTO
     }
 
     module GO_PROTO: _GO_PROTO {
+        .SEM=IGNORED
         SET_APPEND(PEERDIR_TAGS GO_PROTO)
     }
 
@@ -867,6 +866,7 @@ multimodule PROTO_LIBRARY {
     }
 
     module DESC_PROTO: _DESC_PROTO {
+        .SEM=IGNORED
         SET_APPEND(PEERDIR_TAGS DESC_PROTO)
     }
 }
@@ -902,28 +902,34 @@ module PROTO_REGISTRY: PROTO_DESCRIPTIONS {
 ### See: [PROTO_LIBRARY()](#module_PROTO_LIBRARY)
 multimodule PROTO_SCHEMA {
     module CPP_PROTO_FROM_SCHEMA: _CPP_PROTO {
+        # TODO(svidyuk): think about marker which forces semantics inheritance
+        .SEM=CPP_PROTO_LIBRARY_SEM
         DISABLE(START_TARGET)
         SET_APPEND(PEERDIR_TAGS CPP_PROTO CPP_PROTO_FROM_SCHEMA)
     }
 
     module JAVA_PROTO_FROM_SCHEMA: _JAVA_PROTO {
+        .SEM=JAVA_PROTO_LIBRARY_SEM
         DISABLE(START_TARGET)
         SET_APPEND(PEERDIR_TAGS JAVA_PROTO JAVA_PROTO_FROM_SCHEMA)
     }
 
     module PY_PROTO_FROM_SCHEMA: _PY_PROTO {
+        .SEM=IGNORED
         .PEERDIRSELF=CPP_PROTO_FROM_SCHEMA
         DISABLE(START_TARGET)
         SET_APPEND(PEERDIR_TAGS PY_PROTO PY_PROTO_FROM_SCHEMA)
     }
 
     module PY3_PROTO_FROM_SCHEMA: _PY3_PROTO {
+        .SEM=IGNORED
         .PEERDIRSELF=CPP_PROTO_FROM_SCHEMA
         DISABLE(START_TARGET)
         SET_APPEND(PEERDIR_TAGS PY3_PROTO PY3_PROTO_FROM_SCHEMA)
     }
 
     module GO_PROTO_FROM_SCHEMA: _GO_PROTO {
+        .SEM=IGNORED
         DISABLE(START_TARGET)
         SET_APPEND(PEERDIR_TAGS GO_PROTO GO_PROTO_FROM_SCHEMA)
     }
@@ -945,6 +951,7 @@ multimodule PROTO_SCHEMA {
     }
 
     module DESC_PROTO_FROM_SCHEMA: _DESC_PROTO {
+        .SEM=IGNORED
         DISABLE(START_TARGET)
         SET_APPEND(PEERDIR_TAGS DESC_PROTO DESC_PROTO_FROM_SCHEMA)
     }

build/external_resources/ymake/public.resources.json

@@ -1,19 +1,19 @@
 {
     "by_platform": {
         "darwin": {
-            "uri": "sbr:7478218557"
+            "uri": "sbr:7522713648"
         },
         "darwin-arm64": {
-            "uri": "sbr:7478218228"
+            "uri": "sbr:7522713246"
         },
         "linux": {
-            "uri": "sbr:7478219259"
+            "uri": "sbr:7522714449"
         },
         "linux-aarch64": {
-            "uri": "sbr:7478218007"
+            "uri": "sbr:7522712750"
         },
         "win32-clang-cl": {
-            "uri": "sbr:7478218861"
+            "uri": "sbr:7522714072"
         }
     }
 }

build/external_resources/ymake/resources.json

@@ -1,19 +1,19 @@
 {
     "by_platform": {
         "darwin": {
-            "uri": "sbr:7478217383"
+            "uri": "sbr:7522728679"
         },
         "darwin-arm64": {
-            "uri": "sbr:7478216869"
+            "uri": "sbr:7522728262"
         },
         "linux": {
-            "uri": "sbr:7478218277"
+            "uri": "sbr:7522729575"
         },
         "linux-aarch64": {
-            "uri": "sbr:7478216503"
+            "uri": "sbr:7522727825"
         },
         "win32-clang-cl": {
-            "uri": "sbr:7478218014"
+            "uri": "sbr:7522729138"
         }
     }
 }

build/mapping.conf.json

@@ -448,6 +448,8 @@
         "7434972788": "https://devtools-registry.s3.yandex.net/7434972788",
         "7480257071": "https://devtools-registry.s3.yandex.net/7480257071",
         "7480276291": "https://devtools-registry.s3.yandex.net/7480276291",
+        "7537937986": "https://devtools-registry.s3.yandex.net/7537937986",
+        "7538005601": "https://devtools-registry.s3.yandex.net/7538005601",
         "5486731632": "https://devtools-registry.s3.yandex.net/5486731632",
         "5514350352": "https://devtools-registry.s3.yandex.net/5514350352",
         "5514360398": "https://devtools-registry.s3.yandex.net/5514360398",
@@ -616,6 +618,7 @@
         "7431156616": "https://devtools-registry.s3.yandex.net/7431156616",
         "7448914799": "https://devtools-registry.s3.yandex.net/7448914799",
         "7478218557": "https://devtools-registry.s3.yandex.net/7478218557",
+        "7522713648": "https://devtools-registry.s3.yandex.net/7522713648",
         "5766171800": "https://devtools-registry.s3.yandex.net/5766171800",
         "5805430761": "https://devtools-registry.s3.yandex.net/5805430761",
         "5829025456": "https://devtools-registry.s3.yandex.net/5829025456",
@@ -668,6 +671,7 @@
         "7431156019": "https://devtools-registry.s3.yandex.net/7431156019",
         "7448913101": "https://devtools-registry.s3.yandex.net/7448913101",
         "7478218228": "https://devtools-registry.s3.yandex.net/7478218228",
+        "7522713246": "https://devtools-registry.s3.yandex.net/7522713246",
         "5766173070": "https://devtools-registry.s3.yandex.net/5766173070",
         "5805432830": "https://devtools-registry.s3.yandex.net/5805432830",
         "5829031598": "https://devtools-registry.s3.yandex.net/5829031598",
@@ -720,6 +724,7 @@
         "7431157902": "https://devtools-registry.s3.yandex.net/7431157902",
         "7448917907": "https://devtools-registry.s3.yandex.net/7448917907",
         "7478219259": "https://devtools-registry.s3.yandex.net/7478219259",
+        "7522714449": "https://devtools-registry.s3.yandex.net/7522714449",
         "5766171341": "https://devtools-registry.s3.yandex.net/5766171341",
         "5805430188": "https://devtools-registry.s3.yandex.net/5805430188",
         "5829023352": "https://devtools-registry.s3.yandex.net/5829023352",
@@ -772,6 +777,7 @@
         "7431155222": "https://devtools-registry.s3.yandex.net/7431155222",
         "7448911598": "https://devtools-registry.s3.yandex.net/7448911598",
         "7478218007": "https://devtools-registry.s3.yandex.net/7478218007",
+        "7522712750": "https://devtools-registry.s3.yandex.net/7522712750",
         "5766172695": "https://devtools-registry.s3.yandex.net/5766172695",
         "5805432230": "https://devtools-registry.s3.yandex.net/5805432230",
         "5829029743": "https://devtools-registry.s3.yandex.net/5829029743",
@@ -824,6 +830,7 @@
         "7431157276": "https://devtools-registry.s3.yandex.net/7431157276",
         "7448916360": "https://devtools-registry.s3.yandex.net/7448916360",
         "7478218861": "https://devtools-registry.s3.yandex.net/7478218861",
+        "7522714072": "https://devtools-registry.s3.yandex.net/7522714072",
         "4307890075": "https://devtools-registry.s3.yandex.net/4307890075",
         "5517245192": "https://devtools-registry.s3.yandex.net/5517245192",
         "4307901240": "https://devtools-registry.s3.yandex.net/4307901240",
@@ -1502,6 +1509,8 @@
         "7434972788": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
         "7480257071": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
         "7480276291": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
+        "7537937986": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
+        "7538005601": "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",
@@ -1670,6 +1679,7 @@
         "7431156616": "devtools/ymake/bin/ymake for darwin",
         "7448914799": "devtools/ymake/bin/ymake for darwin",
         "7478218557": "devtools/ymake/bin/ymake for darwin",
+        "7522713648": "devtools/ymake/bin/ymake for darwin",
         "5766171800": "devtools/ymake/bin/ymake for darwin-arm64",
         "5805430761": "devtools/ymake/bin/ymake for darwin-arm64",
         "5829025456": "devtools/ymake/bin/ymake for darwin-arm64",
@@ -1722,6 +1732,7 @@
         "7431156019": "devtools/ymake/bin/ymake for darwin-arm64",
         "7448913101": "devtools/ymake/bin/ymake for darwin-arm64",
         "7478218228": "devtools/ymake/bin/ymake for darwin-arm64",
+        "7522713246": "devtools/ymake/bin/ymake for darwin-arm64",
         "5766173070": "devtools/ymake/bin/ymake for linux",
         "5805432830": "devtools/ymake/bin/ymake for linux",
         "5829031598": "devtools/ymake/bin/ymake for linux",
@@ -1774,6 +1785,7 @@
         "7431157902": "devtools/ymake/bin/ymake for linux",
         "7448917907": "devtools/ymake/bin/ymake for linux",
         "7478219259": "devtools/ymake/bin/ymake for linux",
+        "7522714449": "devtools/ymake/bin/ymake for linux",
         "5766171341": "devtools/ymake/bin/ymake for linux-aarch64",
         "5805430188": "devtools/ymake/bin/ymake for linux-aarch64",
         "5829023352": "devtools/ymake/bin/ymake for linux-aarch64",
@@ -1826,6 +1838,7 @@
         "7431155222": "devtools/ymake/bin/ymake for linux-aarch64",
         "7448911598": "devtools/ymake/bin/ymake for linux-aarch64",
         "7478218007": "devtools/ymake/bin/ymake for linux-aarch64",
+        "7522712750": "devtools/ymake/bin/ymake for linux-aarch64",
         "5766172695": "devtools/ymake/bin/ymake for win32-clang-cl",
         "5805432230": "devtools/ymake/bin/ymake for win32-clang-cl",
         "5829029743": "devtools/ymake/bin/ymake for win32-clang-cl",
@@ -1878,6 +1891,7 @@
         "7431157276": "devtools/ymake/bin/ymake for win32-clang-cl",
         "7448916360": "devtools/ymake/bin/ymake for win32-clang-cl",
         "7478218861": "devtools/ymake/bin/ymake for win32-clang-cl",
+        "7522714072": "devtools/ymake/bin/ymake for win32-clang-cl",
         "4307890075": "flake8_linter for linux",
         "5517245192": "flake8_linter for linux",
         "4307901240": "flake8_linter for linux-aarch64",

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:7480275076)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7538003967)
 ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7480274698)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7538003163)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7480276291)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7538005601)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7480273938)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7538002456)
 ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7480275651)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7538004884)
 
 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:7480256374)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7537936527)
 ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7480255951)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7537935343)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7480257071)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7537937986)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7480255328)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7537934380)
 ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7480256738)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7537937248)
 
 ENDIF()

build/plugins/yql_python_udf.py

@@ -23,13 +23,12 @@ def onregister_yql_python_udf(unit, *args):
             ymake.report_configure_error('Libra modules are not supported in opensource python UDFs')
             add_libra_modules = False
 
-    yql_base_dir = unit.get('YQL_BASE_DIR')
     yql_python_dir = unit.get('YQL_PYTHON_DIR')
     if not yql_python_dir:
-        yql_python_dir = '/'.join([yql_base_dir, 'udfs/common/python'])
+        yql_python_dir = 'yql/essentials/udfs/common/python'
 
     unit.onyql_abi_version(['2', '27', '0'])
-    unit.onpeerdir(['/'.join([yql_base_dir, '/udfs/common/python/python_udf'])])
+    unit.onpeerdir(['yql/essentials/udfs/common/python/python_udf'])
     unit.onpeerdir(['yql/essentials/public/udf'])
 
     if add_libra_modules:
@@ -41,13 +40,13 @@ def onregister_yql_python_udf(unit, *args):
         unit.onpeerdir(
             ['library/python/runtime', '/'.join([yql_python_dir, '/main'])]
             if not py3
-            else ['library/python/runtime_py3', '/'.join([yql_base_dir, '/udfs/common/python/main_py3'])]
+            else ['library/python/runtime_py3', 'yql/essentials/udfs/common/python/main_py3']
         )
     else:
         flavor = 'System'
 
     output_includes = [
-        '/'.join([yql_base_dir, '/udfs/common/python/python_udf/python_udf.h']),
+        'yql/essentials/udfs/common/python/python_udf/python_udf.h',
         'yql/essentials/public/udf/udf_registrator.h',
     ]
     if add_libra_modules:
@@ -63,7 +62,6 @@ def onregister_yql_python_udf(unit, *args):
             resource_name,
             path,
             libra_flag,
-            yql_base_dir,
             'OUT',
             path,
             'OUTPUT_INCLUDES',