Skip to content

Commit 4ac0ad1

Browse files
authored
Fix TPogram fields order (#8268)
1 parent bd6f576 commit 4ac0ad1

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

ydb/library/yql/core/facade/yql_facade.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,8 @@ TProgram::TProgram(
267267
, RandomProvider_(randomProvider)
268268
, TimeProvider_(timeProvider)
269269
, NextUniqueId_(nextUniqueId)
270+
, AstRoot_(nullptr)
271+
, Modules_(modules)
270272
, DataProvidersInit_(dataProvidersInit)
271273
, Credentials_(MakeIntrusive<NYql::TCredentials>(*credentials))
272274
, UrlListerManager_(urlListerManager)
@@ -280,8 +282,6 @@ TProgram::TProgram(
280282
, SourceCode_(sourceCode)
281283
, SourceSyntax_(ESourceSyntax::Unknown)
282284
, SyntaxVersion_(0)
283-
, AstRoot_(nullptr)
284-
, Modules_(modules)
285285
, ExprRoot_(nullptr)
286286
, SessionId_(sessionId)
287287
, ResultType_(IDataProvider::EResultFormat::Yson)

ydb/library/yql/core/facade/yql_facade.h

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,13 @@ class TProgram: public TThrRefBase, private TNonCopyable
383383
const TIntrusivePtr<IRandomProvider> RandomProvider_;
384384
const TIntrusivePtr<ITimeProvider> TimeProvider_;
385385
const ui64 NextUniqueId_;
386+
387+
TAstNode* AstRoot_;
388+
std::unique_ptr<TMemoryPool> AstPool_;
389+
const IModuleResolver::TPtr Modules_;
390+
TAutoPtr<TExprContext> ExprCtx_;
391+
TTypeAnnotationContextPtr TypeCtx_;
392+
386393
TVector<TDataProviderInitializer> DataProvidersInit_;
387394
TAdaptiveLock DataProvidersLock_;
388395
TVector<TDataProviderInfo> DataProviders_;
@@ -402,16 +409,11 @@ class TProgram: public TThrRefBase, private TNonCopyable
402409
ESourceSyntax SourceSyntax_;
403410
ui16 SyntaxVersion_;
404411

405-
TAstNode* AstRoot_;
406-
std::unique_ptr<TMemoryPool> AstPool_;
407-
TAutoPtr<TExprContext> ExprCtx_;
408-
const IModuleResolver::TPtr Modules_;
409412
TExprNode::TPtr ExprRoot_;
410413
TExprNode::TPtr SavedExprRoot_;
411414
mutable TAdaptiveLock SessionIdLock_;
412415
TString SessionId_;
413416
NThreading::TFuture<void> CloseLastSessionFuture_;
414-
TTypeAnnotationContextPtr TypeCtx_;
415417
TAutoPtr<IPlanBuilder> PlanBuilder_;
416418
TAutoPtr<IGraphTransformer> Transformer_;
417419
TIntrusivePtr<TResultProviderConfig> ResultProviderConfig_;

0 commit comments

Comments
 (0)