turn on withTagged flag

2 files changed, 10 insertions, 8 deletions

diff --git a/ydb/library/yql/providers/dq/planner/execution_planner.cpp b/ydb/library/yql/providers/dq/planner/execution_planner.cpp
index 54d9ab280ab..46c3e90b4f8 100644
--- a/ydb/library/yql/providers/dq/planner/execution_planner.cpp
+++ b/ydb/library/yql/providers/dq/planner/execution_planner.cpp
@@ -461,7 +461,7 @@ namespace NYql::NDqs {
         }
     }
 
-    TString TDqsExecutionPlanner::GetResultType(bool withTagged) const {
+    TString TDqsExecutionPlanner::GetResultType() const {
         if (SourceTaskID) {
             auto& stage = TasksGraph.GetStageInfo(TasksGraph.GetTask(SourceTaskID).StageId).Meta.Stage;
             auto result = stage.Ref().GetTypeAnn();
@@ -476,6 +476,7 @@ namespace NYql::NDqs {
 
             TProgramBuilder pgmBuilder(typeEnv, *FunctionRegistry);
             TStringStream errorStream;
+            const bool withTagged = true;
             auto type = NCommon::BuildType(*exprType, pgmBuilder, errorStream, withTagged);
             return SerializeNode(type, typeEnv);
         }
@@ -796,9 +797,9 @@ THashMap<TStageId, std::tuple<TString,ui64,ui64>> TDqsExecutionPlanner::BuildAll
         }
     }
 
-    TString TDqsSingleExecutionPlanner::GetResultType(bool withTagged) const
+    TString TDqsSingleExecutionPlanner::GetResultType() const
     {
-        if (withTagged && TypeAnn) {
+        if (TypeAnn && TypeAnn->GetKind() == ETypeAnnotationKind::List) {
             auto item = TypeAnn;
             YQL_ENSURE(item->GetKind() == ETypeAnnotationKind::List);
             auto exprType = item->Cast<TListExprType>()->GetItemType();
@@ -808,6 +809,7 @@ THashMap<TStageId, std::tuple<TString,ui64,ui64>> TDqsExecutionPlanner::BuildAll
 
             TProgramBuilder pgmBuilder(typeEnv, *FunctionRegistry);
             TStringStream errorStream;
+            const bool withTagged = true;
             auto type = NCommon::BuildType(*exprType, pgmBuilder, errorStream, withTagged);
             return SerializeNode(type, typeEnv);
         } else {
@@ -878,7 +880,7 @@ THashMap<TStageId, std::tuple<TString,ui64,ui64>> TDqsExecutionPlanner::BuildAll
         }
     }
 
-    TString TGraphExecutionPlanner::GetResultType(bool) const
+    TString TGraphExecutionPlanner::GetResultType() const
     {
         return ResultType;
     }
diff --git a/ydb/library/yql/providers/dq/planner/execution_planner.h b/ydb/library/yql/providers/dq/planner/execution_planner.h
index 4049cff1a57..16838c3dded 100644
--- a/ydb/library/yql/providers/dq/planner/execution_planner.h
+++ b/ydb/library/yql/providers/dq/planner/execution_planner.h
@@ -26,7 +26,7 @@ namespace NYql::NDqs {
         virtual TVector<NDqProto::TDqTask> GetTasks(const TVector<NActors::TActorId>& workers) = 0;
         virtual TVector<NDqProto::TDqTask>& GetTasks() = 0;
         virtual NActors::TActorId GetSourceID() const = 0;
-        virtual TString GetResultType(bool withTagged = false) const = 0;
+        virtual TString GetResultType() const = 0;
 
         TPlan GetPlan() {
             return TPlan {
@@ -57,7 +57,7 @@ namespace NYql::NDqs {
         TVector<NDqProto::TDqTask>& GetTasks() override;
 
         NActors::TActorId GetSourceID() const override;
-        TString GetResultType(bool withTagged = false) const override;
+        TString GetResultType() const override;
 
         void SetPublicIds(const THashMap<ui64, ui32>& publicIds) {
             PublicIds = publicIds;
@@ -106,7 +106,7 @@ namespace NYql::NDqs {
         TVector<NDqProto::TDqTask>& GetTasks() override;
         TVector<NDqProto::TDqTask> GetTasks(const TVector<NActors::TActorId>& workers) override;
         NActors::TActorId GetSourceID() const override;
-        TString GetResultType(bool withTagged = false) const override;
+        TString GetResultType() const override;
 
     private:
         TString Program;
@@ -134,7 +134,7 @@ namespace NYql::NDqs {
         }
         TVector<NDqProto::TDqTask> GetTasks(const TVector<NActors::TActorId>& workers) override;
         NActors::TActorId GetSourceID() const override;
-        TString GetResultType(bool withTagged = false) const override;
+        TString GetResultType() const override;
 
     private:
         TVector<NDqProto::TDqTask> Tasks;