[] Avoid unneded optionals and SkipNullMemers when deriving unified join key type

1 files changed, 15 insertions, 11 deletions

diff --git a/ydb/library/yql/core/yql_join.cpp b/ydb/library/yql/core/yql_join.cpp
index 7ec3afeba06..b6e1861badc 100644
--- a/ydb/library/yql/core/yql_join.cpp
+++ b/ydb/library/yql/core/yql_join.cpp
@@ -1270,18 +1270,22 @@ TExprNode::TPtr RemapNonConvertibleMemberForJoin(TPositionHandle pos, const TExp
     }
 
     if (RemoveOptionalType(&unifiedType)->GetKind() != ETypeAnnotationKind::Data) {
-        result = ctx.Builder(pos)
-            .Callable("If")
-                .Callable(0, "HasNull")
-                    .Add(0, result)
-                .Seal()
-                .Callable(1, "Null")
-                .Seal()
-                .Callable(2, "StablePickle")
-                    .Add(0, result)
+        if (unifiedType.HasOptionalOrNull()) {
+            result = ctx.Builder(pos)
+                .Callable("If")
+                    .Callable(0, "HasNull")
+                        .Add(0, result)
+                    .Seal()
+                    .Callable(1, "Null")
+                    .Seal()
+                    .Callable(2, "StablePickle")
+                        .Add(0, result)
+                    .Seal()
                 .Seal()
-            .Seal()
-            .Build();
+                .Build();
+        } else {
+            result = ctx.NewCallable(pos, "StablePickle", { result });
+        }
     }
 
     return result;