[yql] Reset some fields in type annotation context on fallback

YQL-16128

3 files changed, 13 insertions, 0 deletions

diff --git a/ydb/library/yql/core/facade/yql_facade.cpp b/ydb/library/yql/core/facade/yql_facade.cpp
index c4db14e367..7872f74a29 100644
--- a/ydb/library/yql/core/facade/yql_facade.cpp
+++ b/ydb/library/yql/core/facade/yql_facade.cpp
@@ -1095,6 +1095,7 @@ TFuture<IGraphTransformer::TStatus> TProgram::AsyncTransformWithFallback(bool ap
             for (auto source : TypeCtx_->DataSources) {
                 source->Reset();
             }
+            TypeCtx_->Reset();
             CleanupLastSession();
 
             std::function<void(const TIssuePtr& issue)> toInfo = [&](const TIssuePtr& issue) {
diff --git a/ydb/library/yql/core/yql_type_annotation.cpp b/ydb/library/yql/core/yql_type_annotation.cpp
index 5a76e4f3a7..275813e7bf 100644
--- a/ydb/library/yql/core/yql_type_annotation.cpp
+++ b/ydb/library/yql/core/yql_type_annotation.cpp
@@ -47,6 +47,16 @@ bool TTypeAnnotationContext::DoInitialize(TExprContext& ctx) {
     return true;
 }
 
+void TTypeAnnotationContext::Reset() {
+    UdfImports.clear();
+    UdfModules.clear();
+    NodeToOperationId.clear();
+    EvaluationInProgress = 0;
+    ExpectedTypes.clear();
+    ExpectedConstraints.clear();
+    ExpectedColumnOrders.clear();
+}
+
 TString FormatColumnOrder(const TMaybe<TColumnOrder>& columnOrder) {
     TStringStream ss;
     if (columnOrder) {
diff --git a/ydb/library/yql/core/yql_type_annotation.h b/ydb/library/yql/core/yql_type_annotation.h
index 01c388d1b3..be99440e41 100644
--- a/ydb/library/yql/core/yql_type_annotation.h
+++ b/ydb/library/yql/core/yql_type_annotation.h
@@ -308,6 +308,8 @@ struct TTypeAnnotationContext: public TThrRefBase {
     bool IsConstraintCheckEnabled() const {
         return DisableConstraintCheck.find(TConstraint::Name()) == DisableConstraintCheck.end();
     }
+
+    void Reset();
 };
 
 template <> inline