move to mkql

MrLolthe1st · Feb 6, 2024 · e96445f · e96445f
1 parent b7c4465
commit e96445f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 17 deletions.
diff --git a/ydb/library/yql/providers/dq/opt/dqs_opt.cpp b/ydb/library/yql/providers/dq/opt/dqs_opt.cpp
@@ -93,21 +93,14 @@ namespace NYql::NDqs {
                     }
 
                     YQL_CLOG(INFO, ProviderDq) << "DqsRewritePhyBlockReadOnDqIntegration";
-                    auto reader = Build<TDqReadBlockWideWrap>(ctx, node->Pos())
-                                                .Input(readWideWrap.Input())
-                                                .Flags(readWideWrap.Flags())
-                                                .Token(readWideWrap.Token())
-                                            .Done().Ptr();
-                    auto dechunkedReader = 
-                        ctx.Builder(node->Pos())
-                        .Callable("BlockExpandChunked")
-                            .Add(0, reader)
-                            .Seal()
-                        .Build();
                     return Build<TCoWideFromBlocks>(ctx, node->Pos())
                             .Input(
                                 Build<TCoToFlow>(ctx, node->Pos())
-                                .Input(dechunkedReader)
+                                .Input(Build<TDqReadBlockWideWrap>(ctx, node->Pos())
+                                                .Input(readWideWrap.Input())
+                                                .Flags(readWideWrap.Flags())
+                                                .Token(readWideWrap.Token())
+                                            .Done().Ptr())
                                 .Done())
                             .Done().Ptr();
                 }, ctx, optSettings);

diff --git a/ydb/library/yql/providers/yt/provider/yql_yt_mkql_compiler.cpp b/ydb/library/yql/providers/yt/provider/yql_yt_mkql_compiler.cpp
@@ -495,11 +495,11 @@ void RegisterDqYtMkqlCompilers(NCommon::TMkqlCallableCompilerBase& compiler, con
                 for (const auto& flag : wrapper.Flags())
                     if (solid = flag.Value() == "Solid")
                         break;
-
-                if (solid)
-                    return BuildDqYtInputCall<false>(outputType, inputItemType, cluster, tokenName, ytRead.Input(), state, ctx, inflight, timeout, true && inflight);
-                else
-                    return BuildDqYtInputCall<true>(outputType, inputItemType, cluster, tokenName, ytRead.Input(), state, ctx, inflight, timeout, true && inflight);
+                return ctx.ProgramBuilder.BlockExpandChunked(
+                    solid
+                    ? BuildDqYtInputCall<false>(outputType, inputItemType, cluster, tokenName, ytRead.Input(), state, ctx, inflight, timeout, true && inflight)
+                    : BuildDqYtInputCall<true>(outputType, inputItemType, cluster, tokenName, ytRead.Input(), state, ctx, inflight, timeout, true && inflight)
+                );
             }
 
             return TRuntimeNode();