Revert wrong fix.

2 files changed, 6 insertions, 10 deletions

diff --git a/ydb/library/yql/core/yql_graph_transformer.h b/ydb/library/yql/core/yql_graph_transformer.h
index ba89799f2f..60d87727dd 100644
--- a/ydb/library/yql/core/yql_graph_transformer.h
+++ b/ydb/library/yql/core/yql_graph_transformer.h
@@ -320,7 +320,7 @@ private:
     TNodeMap<TAsyncTransformCallbackFuture> Callbacks;
 };
 
-template <bool RaiseIssues = true, typename TFuture, typename TCallback>
+template <typename TFuture, typename TCallback>
 std::pair<IGraphTransformer::TStatus, TAsyncTransformCallbackFuture>
 WrapFutureCallback(const TFuture& future, const TCallback& callback, const TString& message = "") {
     return std::make_pair(IGraphTransformer::TStatus::Async, future.Apply(
@@ -338,9 +338,7 @@ WrapFutureCallback(const TFuture& future, const TCallback& callback, const TStri
                                 ? TStringBuilder() << "Execution of node: " << input->Content()
                                 : message);
                     });
-
-                    if constexpr (RaiseIssues)
-                        res.ReportIssues(ctx.IssueManager);
+                    res.ReportIssues(ctx.IssueManager);
 
                     if (!res.Success()) {
                         input->SetState(TExprNode::EState::Error);
diff --git a/ydb/library/yql/providers/dq/provider/exec/yql_dq_exectransformer.cpp b/ydb/library/yql/providers/dq/provider/exec/yql_dq_exectransformer.cpp
index f1c3797d8d..076194524f 100644
--- a/ydb/library/yql/providers/dq/provider/exec/yql_dq_exectransformer.cpp
+++ b/ydb/library/yql/providers/dq/provider/exec/yql_dq_exectransformer.cpp
@@ -811,7 +811,7 @@ private:
 
             FlushStatisticsToState();
 
-            return WrapFutureCallback<false>(future, [localRun, startTime, type, fillSettings, level, settings, enableFullResultWrite, columns, graphParams, state = State](const IDqGateway::TResult& res, const TExprNode::TPtr& input, TExprNode::TPtr& output, TExprContext& ctx) {
+            return WrapFutureCallback(future, [localRun, startTime, type, fillSettings, level, settings, enableFullResultWrite, columns, graphParams, state = State](const IDqGateway::TResult& res, const TExprNode::TPtr& input, TExprNode::TPtr& output, TExprContext& ctx) {
                 YQL_CLOG(DEBUG, ProviderDq) << state->SessionId <<  " WrapFutureCallback";
 
                 auto duration = TInstant::Now() - startTime;
@@ -845,8 +845,7 @@ private:
                         state->Metrics->IncCounter("dq", "ForceFallback");
                     }
                     return FallbackCallback(state, input, output, ctx);
-                } else
-                    res.ReportIssues(ctx.IssueManager);
+                }
 
                 output = input;
                 input->SetState(TExprNode::EState::ExecutionComplete);
@@ -1173,7 +1172,7 @@ private:
 
         int level = 0;
         // TODO: remove copy-paste
-        return WrapFutureCallback<false>(future, [settings, startTime, localRun, type, fillSettings, level, graphParams, columns, enableFullResultWrite, state = State](const IDqGateway::TResult& res, const TExprNode::TPtr& input, TExprNode::TPtr& output, TExprContext& ctx) {
+        return WrapFutureCallback(future, [settings, startTime, localRun, type, fillSettings, level, graphParams, columns, enableFullResultWrite, state = State](const IDqGateway::TResult& res, const TExprNode::TPtr& input, TExprNode::TPtr& output, TExprContext& ctx) {
             auto duration = TInstant::Now() - startTime;
             YQL_CLOG(INFO, ProviderDq) << "Execution Pull complete, duration: " << duration;
             if (state->Metrics) {
@@ -1198,8 +1197,7 @@ private:
                 issues.AddIssues(res.Issues());
                 ctx.AssociativeIssues.emplace(input.Get(), std::move(issues));
                 return IGraphTransformer::TStatus(IGraphTransformer::TStatus::Error);
-            } else
-                res.ReportIssues(ctx.IssueManager);
+            }
 
             output = input;
             input->SetState(TExprNode::EState::ExecutionComplete);