Merge pull request #13486 from ydb-platform/merge-libs-250117-1049

ydb-platform · Jan 17, 2025 · 7327215 · 7327215
2 parents 931b6f4 + 7fa2ccd
commit 7327215
Show file tree

Hide file tree

Showing 34 changed files with 811 additions and 169 deletions.
diff --git a/build/conf/java.conf b/build/conf/java.conf
@@ -407,8 +407,8 @@ macro _JAVA_SRCS(RESOURCES?"yes":"no", SRCDIR=".", PACKAGE_PREFIX="", EXCLUDE[],
     SET_APPEND(ALL_JAR_SOURCES --jsources ${BINDIR}/misc/${tolower:JAR_SRCS_GLOB}.src.txt --resources ${BINDIR}/misc/${tolower:JAR_SRCS_GLOB}.res.txt --srcdir ${quo:SRCDIR} \${input:${JAR_SRCS_GLOB}} ${pre=\$\{input\:\";suf=\"\}:FILES})
     _FILL_JAR_COPY_RESOURCES_CMD(LINK_JAR_RESOURCES ${quo:SRCDIR} ${BINDIR}/cls ${PACKAGE_PREFIX} ${BINDIR}/misc/${tolower:JAR_SRCS_GLOB}.res.txt)
     _FILL_JAR_COPY_RESOURCES_CMD(LINK_JAR_JSOURCES ${quo:SRCDIR} ${BINDIR}/src ${PACKAGE_PREFIX} ${BINDIR}/misc/${tolower:JAR_SRCS_GLOB}.src.txt)
-    _FILL_JAR_GEN_SRCS(JAR_GEN_SRCS  JAR     $SRCDIR ${BINDIR}/cls ${BINDIR}/all-java.srclst $KT_SRCLIST ${BINDIR}/misc/all-gr-sources.txt ${BINDIR}/misc/${tolower:JAR_SRCS_GLOB}.res.txt $Globs EXCLUDE $EXCLUDE)
-    _FILL_JAR_GEN_SRCS(JAR_GEN_JSRCS SRC_JAR $SRCDIR ${BINDIR}/cls ${BINDIR}/all-java.srclst $KT_SRCLIST ${BINDIR}/misc/all-gr-sources.txt ${BINDIR}/misc/${tolower:JAR_SRCS_GLOB}.src.txt $Globs EXCLUDE $EXCLUDE)
+    _FILL_JAR_GEN_SRCS(JAR_GEN_SRCS  JAR     $SRCDIR ${BINDIR}/cls ${BINDIR}/all-java.srclst $KT_SRCLIST ${BINDIR}/misc/${tolower:JAR_SRCS_GLOB}.res.txt $Globs EXCLUDE $EXCLUDE)
+    _FILL_JAR_GEN_SRCS(JAR_GEN_JSRCS SRC_JAR $SRCDIR ${BINDIR}/cls ${BINDIR}/all-java.srclst $KT_SRCLIST ${BINDIR}/misc/${tolower:JAR_SRCS_GLOB}.src.txt $Globs EXCLUDE $EXCLUDE)
 }
 
 # tag:java-specific
@@ -455,9 +455,14 @@ macro _HASH_HELPER(Args...) {
     .SEM=${hash:Args}
 }
 
+macro _HASH_GENTAR_HELPER(HASH, OUT_DIR[]) {
+    .CMD=${cwd:BINDIR} $YMAKE_PYTHON ${input:"build/scripts/autotar_gendirs.py"} --pack ${OUT_DIR} --outs ${output;tared;suf=.$HASH.gentar:OUT_DIR} ${hide;kv:"tared_kind nodir"}
+    .SEM=${hide;output;tared;suf=.$HASH.gentar:OUT_DIR}
+}
+
 macro _GENTAR_HELPER(OUT_DIR[], Args...) {
-    .CMD=${cwd:BINDIR} $YMAKE_PYTHON ${input:"build/scripts/autotar_gendirs.py"} --pack ${OUT_DIR} --outs ${output;tared;suf=.$_HASH_HELPER($Args).gentar:OUT_DIR} ${hide;kv:"tared_kind nodir"}
-    .SEM=${hide;output;tared;suf=.$_HASH_HELPER($Args).gentar:OUT_DIR}
+    .CMD=$_HASH_GENTAR_HELPER(${hash:Args} OUT_DIR $OUT_DIR)
+    .SEM=$_HASH_GENTAR_HELPER(${hash:Args} OUT_DIR $OUT_DIR)
 }
 
 # tag:java-specific

diff --git a/build/mapping.conf.json b/build/mapping.conf.json
@@ -484,6 +484,8 @@
         "7808709138": "https://devtools-registry.s3.yandex.net/7808709138",
         "7827427680": "https://devtools-registry.s3.yandex.net/7827427680",
         "7827481464": "https://devtools-registry.s3.yandex.net/7827481464",
+        "7842973241": "https://devtools-registry.s3.yandex.net/7842973241",
+        "7842994658": "https://devtools-registry.s3.yandex.net/7842994658",
         "5486731632": "https://devtools-registry.s3.yandex.net/5486731632",
         "5514350352": "https://devtools-registry.s3.yandex.net/5514350352",
         "5514360398": "https://devtools-registry.s3.yandex.net/5514360398",
@@ -949,6 +951,7 @@
         "7101981380": "https://devtools-registry.s3.yandex.net/7101981380",
         "7552080809": "https://devtools-registry.s3.yandex.net/7552080809",
         "7833244075": "https://devtools-registry.s3.yandex.net/7833244075",
+        "7830390213": "https://devtools-registry.s3.yandex.net/7830390213",
         "5776379446": "https://devtools-registry.s3.yandex.net/5776379446",
         "5777100597": "https://devtools-registry.s3.yandex.net/5777100597",
         "5909067709": "https://devtools-registry.s3.yandex.net/5909067709",
@@ -962,6 +965,7 @@
         "7101978818": "https://devtools-registry.s3.yandex.net/7101978818",
         "7552077729": "https://devtools-registry.s3.yandex.net/7552077729",
         "7833241952": "https://devtools-registry.s3.yandex.net/7833241952",
+        "7830388201": "https://devtools-registry.s3.yandex.net/7830388201",
         "5776375952": "https://devtools-registry.s3.yandex.net/5776375952",
         "5777098178": "https://devtools-registry.s3.yandex.net/5777098178",
         "5909065014": "https://devtools-registry.s3.yandex.net/5909065014",
@@ -975,6 +979,7 @@
         "7101973818": "https://devtools-registry.s3.yandex.net/7101973818",
         "7552072726": "https://devtools-registry.s3.yandex.net/7552072726",
         "7833238161": "https://devtools-registry.s3.yandex.net/7833238161",
+        "7830384362": "https://devtools-registry.s3.yandex.net/7830384362",
         "5776374505": "https://devtools-registry.s3.yandex.net/5776374505",
         "5777096988": "https://devtools-registry.s3.yandex.net/5777096988",
         "5909063641": "https://devtools-registry.s3.yandex.net/5909063641",
@@ -988,6 +993,7 @@
         "7101971416": "https://devtools-registry.s3.yandex.net/7101971416",
         "7552070388": "https://devtools-registry.s3.yandex.net/7552070388",
         "7833236145": "https://devtools-registry.s3.yandex.net/7833236145",
+        "7830382341": "https://devtools-registry.s3.yandex.net/7830382341",
         "5776377955": "https://devtools-registry.s3.yandex.net/5776377955",
         "5777099502": "https://devtools-registry.s3.yandex.net/5777099502",
         "5909066324": "https://devtools-registry.s3.yandex.net/5909066324",
@@ -1001,6 +1007,7 @@
         "7101976574": "https://devtools-registry.s3.yandex.net/7101976574",
         "7552075245": "https://devtools-registry.s3.yandex.net/7552075245",
         "7833240023": "https://devtools-registry.s3.yandex.net/7833240023",
+        "7830386085": "https://devtools-registry.s3.yandex.net/7830386085",
         "6391354461": "https://devtools-registry.s3.yandex.net/6391354461",
         "7805449010": "https://devtools-registry.s3.yandex.net/7805449010",
         "6990868751": "https://devtools-registry.s3.yandex.net/6990868751",
@@ -1659,6 +1666,8 @@
         "7808709138": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
         "7827427680": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
         "7827481464": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
+        "7842973241": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
+        "7842994658": "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",
@@ -2124,6 +2133,7 @@
         "7101981380": "none-none-none-result_resources/jdk-darwin-aarch64.yandex.tgz",
         "7552080809": "none-none-none-result_resources/jdk-darwin-aarch64.yandex.tgz",
         "7833244075": "none-none-none-result_resources/jdk-darwin-aarch64.yandex.tgz",
+        "7830390213": "none-none-none-result_resources/jdk-darwin-aarch64.yandex.tgz",
         "5776379446": "none-none-none-result_resources/jdk-darwin-x86_64.yandex.tgz",
         "5777100597": "none-none-none-result_resources/jdk-darwin-x86_64.yandex.tgz",
         "5909067709": "none-none-none-result_resources/jdk-darwin-x86_64.yandex.tgz",
@@ -2137,6 +2147,7 @@
         "7101978818": "none-none-none-result_resources/jdk-darwin-x86_64.yandex.tgz",
         "7552077729": "none-none-none-result_resources/jdk-darwin-x86_64.yandex.tgz",
         "7833241952": "none-none-none-result_resources/jdk-darwin-x86_64.yandex.tgz",
+        "7830388201": "none-none-none-result_resources/jdk-darwin-x86_64.yandex.tgz",
         "5776375952": "none-none-none-result_resources/jdk-linux-aarch64.yandex.tgz",
         "5777098178": "none-none-none-result_resources/jdk-linux-aarch64.yandex.tgz",
         "5909065014": "none-none-none-result_resources/jdk-linux-aarch64.yandex.tgz",
@@ -2150,6 +2161,7 @@
         "7101973818": "none-none-none-result_resources/jdk-linux-aarch64.yandex.tgz",
         "7552072726": "none-none-none-result_resources/jdk-linux-aarch64.yandex.tgz",
         "7833238161": "none-none-none-result_resources/jdk-linux-aarch64.yandex.tgz",
+        "7830384362": "none-none-none-result_resources/jdk-linux-aarch64.yandex.tgz",
         "5776374505": "none-none-none-result_resources/jdk-linux-x86_64.yandex.tgz",
         "5777096988": "none-none-none-result_resources/jdk-linux-x86_64.yandex.tgz",
         "5909063641": "none-none-none-result_resources/jdk-linux-x86_64.yandex.tgz",
@@ -2163,6 +2175,7 @@
         "7101971416": "none-none-none-result_resources/jdk-linux-x86_64.yandex.tgz",
         "7552070388": "none-none-none-result_resources/jdk-linux-x86_64.yandex.tgz",
         "7833236145": "none-none-none-result_resources/jdk-linux-x86_64.yandex.tgz",
+        "7830382341": "none-none-none-result_resources/jdk-linux-x86_64.yandex.tgz",
         "5776377955": "none-none-none-result_resources/jdk-windows-amd64.yandex.tgz",
         "5777099502": "none-none-none-result_resources/jdk-windows-amd64.yandex.tgz",
         "5909066324": "none-none-none-result_resources/jdk-windows-amd64.yandex.tgz",
@@ -2176,6 +2189,7 @@
         "7101976574": "none-none-none-result_resources/jdk-windows-amd64.yandex.tgz",
         "7552075245": "none-none-none-result_resources/jdk-windows-amd64.yandex.tgz",
         "7833240023": "none-none-none-result_resources/jdk-windows-amd64.yandex.tgz",
+        "7830386085": "none-none-none-result_resources/jdk-windows-amd64.yandex.tgz",
         "6391354461": "none-none-none-result_resources/protoc-linux-x86_64.tgz",
         "7805449010": "none-none-none-result_resources/protoc-linux-x86_64.tgz",
         "6990868751": "none-none-none-sandbox/backup/3527d100-e2d0-4b0e-bb7a-905010853d98/yfm-docs.tar",

diff --git a/build/platform/java/jdk/jdk21/jdk.json b/build/platform/java/jdk/jdk21/jdk.json
@@ -1,19 +1,19 @@
 {
   "by_platform": {
     "darwin-arm64": {
-      "uri": "sbr:6956612793"
+      "uri": "sbr:7830390213"
     },
     "darwin-x86_64": {
-      "uri": "sbr:6956611400"
+      "uri": "sbr:7830388201"
     },
     "linux-x86_64": {
-      "uri": "sbr:6956607525"
+      "uri": "sbr:7830382341"
     },
     "linux-aarch64": {
-      "uri": "sbr:6956608703"
+      "uri": "sbr:7830384362"
     },
     "win32-x86_64": {
-      "uri": "sbr:6956610092"
+      "uri": "sbr:7830386085"
     }
   }
 }
diff --git a/build/platform/test_tool/host.ya.make.inc b/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:7827478825)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7842993506)
 ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7827476769)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7842992801)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7827481464)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7842994658)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7827475180)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7842992357)
 ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7827480238)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7842994147)
 
 ENDIF()
diff --git a/build/platform/test_tool/host_os.ya.make.inc b/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:7827425105)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7842972207)
 ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7827423650)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7842971762)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7827427680)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7842973241)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7827422227)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7842971279)
 ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7827426459)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7842972751)
 
 ENDIF()
diff --git a/build/plugins/java.py b/build/plugins/java.py
@@ -252,7 +252,7 @@ def on_fill_jar_copy_resources_cmd(unit, *args):
 
 
 def on_fill_jar_gen_srcs(unit, *args):
-    varname, jar_type, srcdir, base_classes_dir, java_list, kt_list, groovy_list, res_list = tuple(args[0:8])
+    varname, jar_type, srcdir, base_classes_dir, java_list, kt_list, res_list = tuple(args[0:7])
     resolved_srcdir = unit.resolve_arc_path(srcdir)
     if not resolved_srcdir.startswith('$') or resolved_srcdir.startswith('$S'):
         return
@@ -261,8 +261,8 @@ def on_fill_jar_gen_srcs(unit, *args):
     globs = args[7:exclude_pos]
     excludes = args[exclude_pos + 1 :]
     var = unit.get(varname)
-    var += ' && ${{cwd:BINDIR}} $YMAKE_PYTHON ${{input:"build/scripts/resolve_java_srcs.py"}} --append -d {} -s {} -k {} -g {} -r {} --include-patterns {}'.format(
-        srcdir, java_list, kt_list, groovy_list, res_list, ' '.join(globs)
+    var += ' && ${{cwd:BINDIR}} $YMAKE_PYTHON ${{input:"build/scripts/resolve_java_srcs.py"}} --append -d {} -s {} -k {} -r {} --include-patterns {}'.format(
+        srcdir, java_list, kt_list, res_list, ' '.join(globs)
     )
     if jar_type == 'SRC_JAR':
         var += ' --all-resources'

diff --git a/build/scripts/resolve_java_srcs.py b/build/scripts/resolve_java_srcs.py
@@ -30,10 +30,8 @@ def pattern_to_regexp(p):
     )
 
 
-def resolve_java_srcs(
-    srcdir, include_patterns, exclude_patterns, all_resources, resolve_kotlin=False, resolve_groovy=False
-):
-    result = {'java': [], 'not_java': [], 'kotlin': [], 'groovy': []}
+def resolve_java_srcs(srcdir, include_patterns, exclude_patterns, all_resources, resolve_kotlin=False):
+    result = {'java': [], 'not_java': [], 'kotlin': []}
     include_patterns_normal, include_patterns_hidden, exclude_patterns_normal, exclude_patterns_hidden = [], [], [], []
     for vis, hid, patterns in (
         (include_patterns_normal, include_patterns_hidden, include_patterns),
@@ -69,44 +67,36 @@ def resolve_java_srcs(
             for inc_re in inc_patterns:
                 if inc_re.match(f):
                     s = os.path.normpath(f[1:])
-                    if all_resources or not (f.endswith('.java') or f.endswith('.kt') or f.endswith('.groovy')):
+                    if all_resources or not (f.endswith('.java') or f.endswith('.kt')):
                         result['not_java'].append(s)
                     elif f.endswith('.java'):
                         result['java'].append(os.path.join(srcdir, s))
                     elif f.endswith('.kt') and resolve_kotlin:
                         result['kotlin'].append(os.path.join(srcdir, s))
-                    elif f.endswith('.groovy') and resolve_groovy:
-                        result['groovy'].append(os.path.join(srcdir, s))
                     else:
                         result['not_java'].append(s)
                     break
 
-    return sorted(result['java']), sorted(result['not_java']), sorted(result['kotlin']), sorted(result['groovy'])
+    return sorted(result['java']), sorted(result['not_java']), sorted(result['kotlin'])
 
 
 def do_it(
     directory,
     sources_file,
     resources_file,
     kotlin_sources_file,
-    groovy_sources_file,
     include_patterns,
     exclude_patterns,
     resolve_kotlin,
-    resolve_groovy,
     append,
     all_resources,
 ):
-    j, r, k, g = resolve_java_srcs(
-        directory, include_patterns, exclude_patterns, all_resources, resolve_kotlin, resolve_groovy
-    )
+    j, r, k = resolve_java_srcs(directory, include_patterns, exclude_patterns, all_resources, resolve_kotlin)
     mode = 'a' if append else 'w'
     open(sources_file, mode).writelines(i + '\n' for i in j)
     open(resources_file, mode).writelines(i + '\n' for i in r)
     if kotlin_sources_file:
         open(kotlin_sources_file, mode).writelines(i + '\n' for i in k + j)
-    if groovy_sources_file:
-        open(groovy_sources_file, mode).writelines(i + '\n' for i in g + j)
 
 
 if __name__ == '__main__':
@@ -115,11 +105,9 @@ def do_it(
     parser.add_argument('-s', '--sources-file', required=True)
     parser.add_argument('-r', '--resources-file', required=True)
     parser.add_argument('-k', '--kotlin-sources-file', default=None)
-    parser.add_argument('-g', '--groovy-sources-file', default=None)
     parser.add_argument('--append', action='store_true', default=False)
     parser.add_argument('--all-resources', action='store_true', default=False)
     parser.add_argument('--resolve-kotlin', action='store_true', default=False)
-    parser.add_argument('--resolve-groovy', action='store_true', default=False)
     parser.add_argument('--include-patterns', nargs='*', default=[])
     parser.add_argument('--exclude-patterns', nargs='*', default=[])
     args = parser.parse_args()

diff --git a/ya b/ya
@@ -39,33 +39,33 @@ REGISTRY_ENDPOINT = os.environ.get("YA_REGISTRY_ENDPOINT", "https://devtools-reg
 PLATFORM_MAP = {
     "data": {
         "darwin": {
-            "md5": "85c76fbd0d23319cce3ad98cd6926ad7",
+            "md5": "ae63bfaf584d60bbfed88f02ab39d214",
             "urls": [
-                f"{REGISTRY_ENDPOINT}/7827466176"
+                f"{REGISTRY_ENDPOINT}/7843021328"
             ]
         },
         "darwin-arm64": {
-            "md5": "b29d3df1d6e67afaa304bdc0fc811966",
+            "md5": "42b853ad17d72ae1ebfabf5e9cfe38f6",
             "urls": [
-                f"{REGISTRY_ENDPOINT}/7827465506"
+                f"{REGISTRY_ENDPOINT}/7843020972"
             ]
         },
         "linux-aarch64": {
-            "md5": "855754159dd5301a07b58ed0c01dc334",
+            "md5": "b23c0e2569b81d759e2eaa37529d9d25",
             "urls": [
-                f"{REGISTRY_ENDPOINT}/7827464666"
+                f"{REGISTRY_ENDPOINT}/7843020525"
             ]
         },
         "win32-clang-cl": {
-            "md5": "fba50c68c7a0a106dc7370113172c77c",
+            "md5": "1be0d0332ae664bb62d2e461ff094ca1",
             "urls": [
-                f"{REGISTRY_ENDPOINT}/7827466887"
+                f"{REGISTRY_ENDPOINT}/7843021829"
             ]
         },
         "linux": {
-            "md5": "8292d28960e74996f913db75c3a880f6",
+            "md5": "c1096864c2c0360c7784295b0a0b3597",
             "urls": [
-                f"{REGISTRY_ENDPOINT}/7827467700"
+                f"{REGISTRY_ENDPOINT}/7843022530"
             ]
         }
     }

diff --git a/ydb/ci/rightlib.txt b/ydb/ci/rightlib.txt
@@ -1 +1 @@
-2f3fd95aac24e27a3b0aa2badda49db82bf36cc5
+150c1d4730788edc1f760ff28f1aa87ae69b2ae7
diff --git a/yql/essentials/core/expr_nodes/yql_expr_nodes.json b/yql/essentials/core/expr_nodes/yql_expr_nodes.json
@@ -1612,6 +1612,21 @@
                 {"Index": 8, "Name": "RightKeysColumnNames", "Type": "TCoAtomList"}
             ]
         },
+        {
+            "Name": "TCoBlockMapJoinCore",
+            "Base": "TCallable",
+            "Match": {"Type": "Callable", "Name": "BlockMapJoinCore"},
+            "Children": [
+                {"Index": 0, "Name": "LeftInput", "Type": "TExprBase"},
+                {"Index": 1, "Name": "RightInput", "Type": "TExprBase"},
+                {"Index": 2, "Name": "JoinKind", "Type": "TCoAtom"},
+                {"Index": 3, "Name": "LeftKeyColumns", "Type": "TCoAtomList"},
+                {"Index": 4, "Name": "LeftKeyDrops", "Type": "TCoAtomList"},
+                {"Index": 5, "Name": "RightKeyColumns", "Type": "TCoAtomList"},
+                {"Index": 6, "Name": "RightKeyDrops", "Type": "TCoAtomList"},
+                {"Index": 7, "Name": "Options", "Type": "TExprList"}
+            ]
+        },
         {
             "Name": "TCoGraceJoinCore",
             "Base": "TCallable",

diff --git a/yql/essentials/core/type_ann/type_ann_core.cpp b/yql/essentials/core/type_ann/type_ann_core.cpp
@@ -12850,6 +12850,8 @@ template <NKikimr::NUdf::EDataSlot DataSlot>
         ExtFunctions["BlockFunc"] = &BlockFuncWrapper;
         ExtFunctions["BlockBitCast"] = &BlockBitCastWrapper;
 
+        Functions["BlockMapJoinCore"] = &BlockMapJoinCoreWrapper;
+
         ExtFunctions["AsScalar"] = &AsScalarWrapper;
         ExtFunctions["WideToBlocks"] = &WideToBlocksWrapper;
         ExtFunctions["BlockCombineAll"] = &BlockCombineAllWrapper;

diff --git a/yql/essentials/core/type_ann/type_ann_impl.h b/yql/essentials/core/type_ann/type_ann_impl.h
@@ -35,6 +35,7 @@ namespace NTypeAnnImpl {
     IGraphTransformer::TStatus CombineCoreWrapper(const TExprNode::TPtr& input, TExprNode::TPtr& output, TContext& ctx);
     IGraphTransformer::TStatus GroupingCoreWrapper(const TExprNode::TPtr& input, TExprNode::TPtr& output, TContext& ctx);
     IGraphTransformer::TStatus DecimalBinaryWrapperBase(const TExprNode::TPtr& input, TExprNode::TPtr& output, TContext& ctx, bool blocks);
+    IGraphTransformer::TStatus BlockMapJoinCoreWrapper(const TExprNode::TPtr& input, TExprNode::TPtr& output, TContext& ctx);
 
     TMaybe<ui32> FindOrReportMissingMember(TStringBuf memberName, TPositionHandle pos, const TStructExprType& structType, TExprContext& ctx);
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		2f3fd95aac24e27a3b0aa2badda49db82bf36cc5
		150c1d4730788edc1f760ff28f1aa87ae69b2ae7