YQL-20086 minikql

commit_hash:c35c972d6708fb1b3f34fa34a42cdae1ddf11cdc

9 files changed, 124 insertions, 124 deletions

diff --git a/yql/essentials/minikql/jsonpath/parser/ast_builder.cpp b/yql/essentials/minikql/jsonpath/parser/ast_builder.cpp
index 2cfecb94310..2b630fda8b7 100644
--- a/yql/essentials/minikql/jsonpath/parser/ast_builder.cpp
+++ b/yql/essentials/minikql/jsonpath/parser/ast_builder.cpp
@@ -63,13 +63,13 @@ bool TryStringContent(const TString& str, TString& result, TString& error, bool
 }
 
 TAstBuilder::TAstBuilder(TIssues& issues)
-    : Issues(issues)
+    : Issues_(issues)
 {
 }
 
 void TAstBuilder::Error(TPosition pos, const TStringBuf message) {
-    Issues.AddIssue(pos, message);
-    Issues.back().SetCode(TIssuesIds::JSONPATH_PARSE_ERROR, TSeverityIds::S_ERROR);
+    Issues_.AddIssue(pos, message);
+    Issues_.back().SetCode(TIssuesIds::JSONPATH_PARSE_ERROR, TSeverityIds::S_ERROR);
 }
 
 TArrayAccessNode::TSubscript TAstBuilder::BuildArraySubscript(const TRule_array_subscript& node) {
diff --git a/yql/essentials/minikql/jsonpath/parser/ast_builder.h b/yql/essentials/minikql/jsonpath/parser/ast_builder.h
index 66a47483b34..6f5e2d72c7b 100644
--- a/yql/essentials/minikql/jsonpath/parser/ast_builder.h
+++ b/yql/essentials/minikql/jsonpath/parser/ast_builder.h
@@ -46,7 +46,7 @@ private:
 
     void Error(TPosition pos, const TStringBuf message);
 
-    TIssues& Issues;
+    TIssues& Issues_;
 };
 
 }
diff --git a/yql/essentials/minikql/jsonpath/parser/ast_nodes.cpp b/yql/essentials/minikql/jsonpath/parser/ast_nodes.cpp
index 5a51c2e90e2..b89bc87ddb8 100644
--- a/yql/essentials/minikql/jsonpath/parser/ast_nodes.cpp
+++ b/yql/essentials/minikql/jsonpath/parser/ast_nodes.cpp
@@ -3,12 +3,12 @@
 namespace NYql::NJsonPath {
 
 TAstNode::TAstNode(TPosition pos)
-    : Pos(pos)
+    : Pos_(pos)
 {
 }
 
 TPosition TAstNode::GetPos() const {
-    return Pos;
+    return Pos_;
 }
 
 EReturnType TAstNode::GetReturnType() const {
@@ -17,17 +17,17 @@ EReturnType TAstNode::GetReturnType() const {
 
 TRootNode::TRootNode(TPosition pos, TAstNodePtr expr, EJsonPathMode mode)
     : TAstNode(pos)
-    , Expr(expr)
-    , Mode(mode)
+    , Expr_(expr)
+    , Mode_(mode)
 {
 }
 
 const TAstNodePtr TRootNode::GetExpr() const {
-    return Expr;
+    return Expr_;
 }
 
 EJsonPathMode TRootNode::GetMode() const {
-    return Mode;
+    return Mode_;
 }
 
 void TRootNode::Accept(IAstNodeVisitor& visitor) const {
@@ -35,7 +35,7 @@ void TRootNode::Accept(IAstNodeVisitor& visitor) const {
 }
 
 EReturnType TRootNode::GetReturnType() const {
-    return Expr->GetReturnType();
+    return Expr_->GetReturnType();
 }
 
 TContextObjectNode::TContextObjectNode(TPosition pos)
@@ -49,12 +49,12 @@ void TContextObjectNode::Accept(IAstNodeVisitor& visitor) const {
 
 TVariableNode::TVariableNode(TPosition pos, const TString& name)
     : TAstNode(pos)
-    , Name(name)
+    , Name_(name)
 {
 }
 
 const TString& TVariableNode::GetName() const {
-    return Name;
+    return Name_;
 }
 
 void TVariableNode::Accept(IAstNodeVisitor& visitor) const {
@@ -72,12 +72,12 @@ void TLastArrayIndexNode::Accept(IAstNodeVisitor& visitor) const {
 
 TNumberLiteralNode::TNumberLiteralNode(TPosition pos, double value)
     : TAstNode(pos)
-    , Value(value)
+    , Value_(value)
 {
 }
 
 double TNumberLiteralNode::GetValue() const {
-    return Value;
+    return Value_;
 }
 
 void TNumberLiteralNode::Accept(IAstNodeVisitor& visitor) const {
@@ -86,17 +86,17 @@ void TNumberLiteralNode::Accept(IAstNodeVisitor& visitor) const {
 
 TMemberAccessNode::TMemberAccessNode(TPosition pos, const TString& member, TAstNodePtr input)
     : TAstNode(pos)
-    , Member(member)
-    , Input(input)
+    , Member_(member)
+    , Input_(input)
 {
 }
 
 const TStringBuf TMemberAccessNode::GetMember() const {
-    return Member;
+    return Member_;
 }
 
 const TAstNodePtr TMemberAccessNode::GetInput() const {
-    return Input;
+    return Input_;
 }
 
 void TMemberAccessNode::Accept(IAstNodeVisitor& visitor) const {
@@ -105,12 +105,12 @@ void TMemberAccessNode::Accept(IAstNodeVisitor& visitor) const {
 
 TWildcardMemberAccessNode::TWildcardMemberAccessNode(TPosition pos, TAstNodePtr input)
     : TAstNode(pos)
-    , Input(input)
+    , Input_(input)
 {
 }
 
 const TAstNodePtr TWildcardMemberAccessNode::GetInput() const {
-    return Input;
+    return Input_;
 }
 
 void TWildcardMemberAccessNode::Accept(IAstNodeVisitor& visitor) const {
@@ -119,17 +119,17 @@ void TWildcardMemberAccessNode::Accept(IAstNodeVisitor& visitor) const {
 
 TArrayAccessNode::TArrayAccessNode(TPosition pos, TVector<TSubscript> subscripts, TAstNodePtr input)
     : TAstNode(pos)
-    , Subscripts(subscripts)
-    , Input(input)
+    , Subscripts_(subscripts)
+    , Input_(input)
 {
 }
 
 const TVector<TArrayAccessNode::TSubscript>& TArrayAccessNode::GetSubscripts() const {
-    return Subscripts;
+    return Subscripts_;
 }
 
 const TAstNodePtr TArrayAccessNode::GetInput() const {
-    return Input;
+    return Input_;
 }
 
 void TArrayAccessNode::Accept(IAstNodeVisitor& visitor) const {
@@ -138,12 +138,12 @@ void TArrayAccessNode::Accept(IAstNodeVisitor& visitor) const {
 
 TWildcardArrayAccessNode::TWildcardArrayAccessNode(TPosition pos, TAstNodePtr input)
     : TAstNode(pos)
-    , Input(input)
+    , Input_(input)
 {
 }
 
 const TAstNodePtr TWildcardArrayAccessNode::GetInput() const {
-    return Input;
+    return Input_;
 }
 
 void TWildcardArrayAccessNode::Accept(IAstNodeVisitor& visitor) const {
@@ -152,17 +152,17 @@ void TWildcardArrayAccessNode::Accept(IAstNodeVisitor& visitor) const {
 
 TUnaryOperationNode::TUnaryOperationNode(TPosition pos, EUnaryOperation op, TAstNodePtr expr)
     : TAstNode(pos)
-    , Operation(op)
-    , Expr(expr)
+    , Operation_(op)
+    , Expr_(expr)
 {
 }
 
 EUnaryOperation TUnaryOperationNode::GetOp() const {
-    return Operation;
+    return Operation_;
 }
 
 const TAstNodePtr TUnaryOperationNode::GetExpr() const {
-    return Expr;
+    return Expr_;
 }
 
 void TUnaryOperationNode::Accept(IAstNodeVisitor& visitor) const {
@@ -170,27 +170,27 @@ void TUnaryOperationNode::Accept(IAstNodeVisitor& visitor) const {
 }
 
 EReturnType TUnaryOperationNode::GetReturnType() const {
-    return Operation == EUnaryOperation::Not ? EReturnType::Bool : EReturnType::Any;
+    return Operation_ == EUnaryOperation::Not ? EReturnType::Bool : EReturnType::Any;
 }
 
 TBinaryOperationNode::TBinaryOperationNode(TPosition pos, EBinaryOperation op, TAstNodePtr leftExpr, TAstNodePtr rightExpr)
     : TAstNode(pos)
-    , Operation(op)
-    , LeftExpr(leftExpr)
-    , RightExpr(rightExpr)
+    , Operation_(op)
+    , LeftExpr_(leftExpr)
+    , RightExpr_(rightExpr)
 {
 }
 
 EBinaryOperation TBinaryOperationNode::GetOp() const {
-    return Operation;
+    return Operation_;
 }
 
 const TAstNodePtr TBinaryOperationNode::GetLeftExpr() const {
-    return LeftExpr;
+    return LeftExpr_;
 }
 
 const TAstNodePtr TBinaryOperationNode::GetRightExpr() const {
-    return RightExpr;
+    return RightExpr_;
 }
 
 void TBinaryOperationNode::Accept(IAstNodeVisitor& visitor) const {
@@ -198,7 +198,7 @@ void TBinaryOperationNode::Accept(IAstNodeVisitor& visitor) const {
 }
 
 EReturnType TBinaryOperationNode::GetReturnType() const {
-    switch (Operation) {
+    switch (Operation_) {
         case EBinaryOperation::Less:
         case EBinaryOperation::LessEqual:
         case EBinaryOperation::Greater:
@@ -216,12 +216,12 @@ EReturnType TBinaryOperationNode::GetReturnType() const {
 
 TBooleanLiteralNode::TBooleanLiteralNode(TPosition pos, bool value)
     : TAstNode(pos)
-    , Value(value)
+    , Value_(value)
 {
 }
 
 bool TBooleanLiteralNode::GetValue() const {
-    return Value;
+    return Value_;
 }
 
 void TBooleanLiteralNode::Accept(IAstNodeVisitor& visitor) const {
@@ -239,12 +239,12 @@ void TNullLiteralNode::Accept(IAstNodeVisitor& visitor) const {
 
 TStringLiteralNode::TStringLiteralNode(TPosition pos, const TString& value)
     : TAstNode(pos)
-    , Value(value)
+    , Value_(value)
 {
 }
 
 const TString& TStringLiteralNode::GetValue() const {
-    return Value;
+    return Value_;
 }
 
 void TStringLiteralNode::Accept(IAstNodeVisitor& visitor) const {
@@ -262,17 +262,17 @@ void TFilterObjectNode::Accept(IAstNodeVisitor& visitor) const {
 
 TFilterPredicateNode::TFilterPredicateNode(TPosition pos, TAstNodePtr predicate, TAstNodePtr input)
     : TAstNode(pos)
-    , Predicate(predicate)
-    , Input(input)
+    , Predicate_(predicate)
+    , Input_(input)
 {
 }
 
 const TAstNodePtr TFilterPredicateNode::GetPredicate() const {
-    return Predicate;
+    return Predicate_;
 }
 
 const TAstNodePtr TFilterPredicateNode::GetInput() const {
-    return Input;
+    return Input_;
 }
 
 void TFilterPredicateNode::Accept(IAstNodeVisitor& visitor) const {
@@ -281,17 +281,17 @@ void TFilterPredicateNode::Accept(IAstNodeVisitor& visitor) const {
 
 TMethodCallNode::TMethodCallNode(TPosition pos, EMethodType type, TAstNodePtr input)
     : TAstNode(pos)
-    , Type(type)
-    , Input(input)
+    , Type_(type)
+    , Input_(input)
 {
 }
 
 EMethodType TMethodCallNode::GetType() const {
-    return Type;
+    return Type_;
 }
 
 const TAstNodePtr TMethodCallNode::GetInput() const {
-    return Input;
+    return Input_;
 }
 
 void TMethodCallNode::Accept(IAstNodeVisitor& visitor) const {
@@ -300,17 +300,17 @@ void TMethodCallNode::Accept(IAstNodeVisitor& visitor) const {
 
 TStartsWithPredicateNode::TStartsWithPredicateNode(TPosition pos, TAstNodePtr input, TAstNodePtr prefix)
     : TAstNode(pos)
-    , Input(input)
-    , Prefix(prefix)
+    , Input_(input)
+    , Prefix_(prefix)
 {
 }
 
 const TAstNodePtr TStartsWithPredicateNode::GetInput() const {
-    return Input;
+    return Input_;
 }
 
 const TAstNodePtr TStartsWithPredicateNode::GetPrefix() const {
-    return Prefix;
+    return Prefix_;
 }
 
 EReturnType TStartsWithPredicateNode::GetReturnType() const {
@@ -323,12 +323,12 @@ void TStartsWithPredicateNode::Accept(IAstNodeVisitor& visitor) const {
 
 TExistsPredicateNode::TExistsPredicateNode(TPosition pos, TAstNodePtr input)
     : TAstNode(pos)
-    , Input(input)
+    , Input_(input)
 {
 }
 
 const TAstNodePtr TExistsPredicateNode::GetInput() const {
-    return Input;
+    return Input_;
 }
 
 EReturnType TExistsPredicateNode::GetReturnType() const {
@@ -341,12 +341,12 @@ void TExistsPredicateNode::Accept(IAstNodeVisitor& visitor) const {
 
 TIsUnknownPredicateNode::TIsUnknownPredicateNode(TPosition pos, TAstNodePtr input)
     : TAstNode(pos)
-    , Input(input)
+    , Input_(input)
 {
 }
 
 const TAstNodePtr TIsUnknownPredicateNode::GetInput() const {
-    return Input;
+    return Input_;
 }
 
 EReturnType TIsUnknownPredicateNode::GetReturnType() const {
@@ -359,17 +359,17 @@ void TIsUnknownPredicateNode::Accept(IAstNodeVisitor& visitor) const {
 
 TLikeRegexPredicateNode::TLikeRegexPredicateNode(TPosition pos, TAstNodePtr input, NReWrapper::IRePtr&& regex)
     : TAstNode(pos)
-    , Input(input)
-    , Regex(std::move(regex))
+    , Input_(input)
+    , Regex_(std::move(regex))
 {
 }
 
 const TAstNodePtr TLikeRegexPredicateNode::GetInput() const {
-    return Input;
+    return Input_;
 }
 
 const NReWrapper::IRePtr& TLikeRegexPredicateNode::GetRegex() const {
-    return Regex;
+    return Regex_;
 }
 
 EReturnType TLikeRegexPredicateNode::GetReturnType() const {
diff --git a/yql/essentials/minikql/jsonpath/parser/ast_nodes.h b/yql/essentials/minikql/jsonpath/parser/ast_nodes.h
index 6ccb8a56ea8..07021d973ce 100644
--- a/yql/essentials/minikql/jsonpath/parser/ast_nodes.h
+++ b/yql/essentials/minikql/jsonpath/parser/ast_nodes.h
@@ -80,7 +80,7 @@ public:
     virtual ~TAstNode() = default;
 
 private:
-    TPosition Pos;
+    TPosition Pos_;
 };
 
 using TAstNodePtr = TIntrusivePtr<TAstNode>;
@@ -98,8 +98,8 @@ public:
     EReturnType GetReturnType() const override;
 
 private:
-    TAstNodePtr Expr;
-    EJsonPathMode Mode;
+    TAstNodePtr Expr_;
+    EJsonPathMode Mode_;
 };
 
 class TContextObjectNode : public TAstNode {
@@ -118,7 +118,7 @@ public:
     void Accept(IAstNodeVisitor& visitor) const override;
 
 private:
-    TString Name;
+    TString Name_;
 };
 
 class TLastArrayIndexNode : public TAstNode {
@@ -137,7 +137,7 @@ public:
     void Accept(IAstNodeVisitor& visitor) const override;
 
 private:
-    double Value;
+    double Value_;
 };
 
 class TMemberAccessNode : public TAstNode {
@@ -151,8 +151,8 @@ public:
     void Accept(IAstNodeVisitor& visitor) const override;
 
 private:
-    TString Member;
-    TAstNodePtr Input;
+    TString Member_;
+    TAstNodePtr Input_;
 };
 
 class TWildcardMemberAccessNode : public TAstNode {
@@ -164,7 +164,7 @@ public:
     void Accept(IAstNodeVisitor& visitor) const override;
 
 private:
-    TAstNodePtr Input;
+    TAstNodePtr Input_;
 };
 
 class TArrayAccessNode : public TAstNode {
@@ -183,8 +183,8 @@ public:
     void Accept(IAstNodeVisitor& visitor) const override;
 
 private:
-    TVector<TSubscript> Subscripts;
-    TAstNodePtr Input;
+    TVector<TSubscript> Subscripts_;
+    TAstNodePtr Input_;
 };
 
 class TWildcardArrayAccessNode : public TAstNode {
@@ -196,7 +196,7 @@ public:
     void Accept(IAstNodeVisitor& visitor) const override;
 
 private:
-    TAstNodePtr Input;
+    TAstNodePtr Input_;
 };
 
 enum class EUnaryOperation {
@@ -218,8 +218,8 @@ public:
     EReturnType GetReturnType() const override;
 
 private:
-    EUnaryOperation Operation;
-    TAstNodePtr Expr;
+    EUnaryOperation Operation_;
+    TAstNodePtr Expr_;
 };
 
 enum class EBinaryOperation {
@@ -253,9 +253,9 @@ public:
     EReturnType GetReturnType() const override;
 
 private:
-    EBinaryOperation Operation;
-    TAstNodePtr LeftExpr;
-    TAstNodePtr RightExpr;
+    EBinaryOperation Operation_;
+    TAstNodePtr LeftExpr_;
+    TAstNodePtr RightExpr_;
 };
 
 class TBooleanLiteralNode : public TAstNode {
@@ -267,7 +267,7 @@ public:
     void Accept(IAstNodeVisitor& visitor) const override;
 
 private:
-    bool Value;
+    bool Value_;
 };
 
 class TNullLiteralNode : public TAstNode {
@@ -286,7 +286,7 @@ public:
     void Accept(IAstNodeVisitor& visitor) const override;
 
 private:
-    TString Value;
+    TString Value_;
 };
 
 class TFilterObjectNode : public TAstNode {
@@ -307,8 +307,8 @@ public:
     void Accept(IAstNodeVisitor& visitor) const override;
 
 private:
-    TAstNodePtr Predicate;
-    TAstNodePtr Input;
+    TAstNodePtr Predicate_;
+    TAstNodePtr Input_;
 };
 
 enum class EMethodType {
@@ -332,8 +332,8 @@ public:
     void Accept(IAstNodeVisitor& visitor) const override;
 
 private:
-    EMethodType Type;
-    TAstNodePtr Input;
+    EMethodType Type_;
+    TAstNodePtr Input_;
 };
 
 class TStartsWithPredicateNode : public TAstNode {
@@ -349,8 +349,8 @@ public:
     void Accept(IAstNodeVisitor& visitor) const override;
 
 private:
-    TAstNodePtr Input;
-    TAstNodePtr Prefix;
+    TAstNodePtr Input_;
+    TAstNodePtr Prefix_;
 };
 
 class TExistsPredicateNode : public TAstNode {
@@ -364,7 +364,7 @@ public:
     void Accept(IAstNodeVisitor& visitor) const override;
 
 private:
-    TAstNodePtr Input;
+    TAstNodePtr Input_;
 };
 
 class TIsUnknownPredicateNode : public TAstNode {
@@ -378,7 +378,7 @@ public:
     void Accept(IAstNodeVisitor& visitor) const override;
 
 private:
-    TAstNodePtr Input;
+    TAstNodePtr Input_;
 };
 
 class TLikeRegexPredicateNode : public TAstNode {
@@ -394,8 +394,8 @@ public:
     void Accept(IAstNodeVisitor& visitor) const override;
 
 private:
-    TAstNodePtr Input;
-    NReWrapper::IRePtr Regex;
+    TAstNodePtr Input_;
+    NReWrapper::IRePtr Regex_;
 };
 
 }
diff --git a/yql/essentials/minikql/jsonpath/parser/binary.cpp b/yql/essentials/minikql/jsonpath/parser/binary.cpp
index 8d75a6d3b90..cf966e29a63 100644
--- a/yql/essentials/minikql/jsonpath/parser/binary.cpp
+++ b/yql/essentials/minikql/jsonpath/parser/binary.cpp
@@ -41,14 +41,14 @@ const NReWrapper::IRePtr& TJsonPathItem::GetRegex() const {
 }
 
 TJsonPathReader::TJsonPathReader(const TJsonPathPtr path)
-    : Path(path)
-    , InitialPos(0)
-    , Mode(ReadMode(InitialPos))
+    : Path_(path)
+    , InitialPos_(0)
+    , Mode_(ReadMode(InitialPos_))
 {
 }
 
 const TJsonPathItem& TJsonPathReader::ReadFirst() {
-    return ReadFromPos(InitialPos);
+    return ReadFromPos(InitialPos_);
 }
 
 const TJsonPathItem& TJsonPathReader::ReadInput(const TJsonPathItem& item) {
@@ -82,18 +82,18 @@ const TJsonPathItem& TJsonPathReader::ReadPrefix(const TJsonPathItem& node) {
 }
 
 EJsonPathMode TJsonPathReader::GetMode() const {
-    return Mode;
+    return Mode_;
 }
 
 const TJsonPathItem& TJsonPathReader::ReadFromPos(TUint pos) {
-    YQL_ENSURE(pos < Path->Size());
+    YQL_ENSURE(pos < Path_->Size());
 
-    const auto it = ItemCache.find(pos);
-    if (it != ItemCache.end()) {
+    const auto it = ItemCache_.find(pos);
+    if (it != ItemCache_.end()) {
         return it->second;
     }
 
-    TJsonPathItem& result = ItemCache[pos];
+    TJsonPathItem& result = ItemCache_[pos];
     result.Type = ReadType(pos);
 
     const auto row = ReadUint(pos);
@@ -214,7 +214,7 @@ EJsonPathMode TJsonPathReader::ReadMode(TUint& pos) {
 
 const TStringBuf TJsonPathReader::ReadString(TUint& pos) {
     TUint length = ReadUint(pos);
-    TStringBuf result(Path->Begin() + pos, length);
+    TStringBuf result(Path_->Begin() + pos, length);
     pos += length;
     return result;
 }
@@ -448,8 +448,8 @@ void TJsonPathBuilder::VisitMethodCall(const TMethodCallNode& node) {
 }
 
 TJsonPathPtr TJsonPathBuilder::ShrinkAndGetResult() {
-    Result->ShrinkToFit();
-    return Result;
+    Result_->ShrinkToFit();
+    return Result_;
 }
 
 void TJsonPathBuilder::VisitStartsWithPredicate(const TStartsWithPredicateNode& node) {
@@ -563,25 +563,25 @@ void TJsonPathBuilder::WriteFinishPosition() {
 
 void TJsonPathBuilder::WriteString(TStringBuf value) {
     WriteUint(value.size());
-    Result->Append(value.data(), value.size());
+    Result_->Append(value.data(), value.size());
 }
 
 void TJsonPathBuilder::RewriteUintSequence(const TVector<TUint>& sequence, TUint offset) {
     const auto length = sequence.size() * sizeof(TUint);
     Y_ASSERT(offset + length < CurrentEndPos());
 
-    MemCopy(Result->Data() + offset, reinterpret_cast<const char*>(sequence.data()), length);
+    MemCopy(Result_->Data() + offset, reinterpret_cast<const char*>(sequence.data()), length);
 }
 
 void TJsonPathBuilder::WriteUintSequence(const TVector<TUint>& sequence) {
     const auto length = sequence.size() * sizeof(TUint);
-    Result->Append(reinterpret_cast<const char*>(sequence.data()), length);
+    Result_->Append(reinterpret_cast<const char*>(sequence.data()), length);
 }
 
 void TJsonPathBuilder::RewriteUint(TUint value, TUint offset) {
     Y_ASSERT(offset + sizeof(TUint) < CurrentEndPos());
 
-    MemCopy(Result->Data() + offset, reinterpret_cast<const char*>(&value), sizeof(TUint));
+    MemCopy(Result_->Data() + offset, reinterpret_cast<const char*>(&value), sizeof(TUint));
 }
 
 void TJsonPathBuilder::WriteUint(TUint value) {
@@ -597,7 +597,7 @@ void TJsonPathBuilder::WriteBool(bool value) {
 }
 
 TUint TJsonPathBuilder::CurrentEndPos() const {
-    return Result->Size();
+    return Result_->Size();
 }
 
 
diff --git a/yql/essentials/minikql/jsonpath/parser/binary.h b/yql/essentials/minikql/jsonpath/parser/binary.h
index 7ce26261527..4390996fb30 100644
--- a/yql/essentials/minikql/jsonpath/parser/binary.h
+++ b/yql/essentials/minikql/jsonpath/parser/binary.h
@@ -129,7 +129,7 @@ struct TJsonPathItem {
 class TJsonPathBuilder : public IAstNodeVisitor {
 public:
     TJsonPathBuilder()
-        : Result(new TJsonPath())
+        : Result_(new TJsonPath())
     {
     }
 
@@ -211,12 +211,12 @@ private:
     template <typename T>
     void WritePOD(const T& value) {
         static_assert(std::is_pod_v<T>, "Type must be POD");
-        Result->Append(reinterpret_cast<const char*>(&value), sizeof(T));
+        Result_->Append(reinterpret_cast<const char*>(&value), sizeof(T));
     }
 
     TUint CurrentEndPos() const;
 
-    TJsonPathPtr Result;
+    TJsonPathPtr Result_;
 };
 
 class TJsonPathReader {
@@ -261,15 +261,15 @@ private:
     template <typename T>
     T ReadPOD(TUint& pos) {
         static_assert(std::is_pod_v<T>, "Type must be POD");
-        T value = ReadUnaligned<T>(Path->Begin() + pos);
+        T value = ReadUnaligned<T>(Path_->Begin() + pos);
         pos += sizeof(T);
         return std::move(value);
     }
 
-    const TJsonPathPtr Path;
-    TUint InitialPos;
-    EJsonPathMode Mode;
-    THashMap<TUint, TJsonPathItem> ItemCache;
+    const TJsonPathPtr Path_;
+    TUint InitialPos_;
+    EJsonPathMode Mode_;
+    THashMap<TUint, TJsonPathItem> ItemCache_;
 };
 
 }
diff --git a/yql/essentials/minikql/jsonpath/parser/parser.cpp b/yql/essentials/minikql/jsonpath/parser/parser.cpp
index 105305ea3c5..39105a0c731 100644
--- a/yql/essentials/minikql/jsonpath/parser/parser.cpp
+++ b/yql/essentials/minikql/jsonpath/parser/parser.cpp
@@ -29,17 +29,17 @@ class TParseErrorsCollector : public NProtoAST::IErrorCollector {
 public:
     TParseErrorsCollector(TIssues& issues, size_t maxErrors)
         : IErrorCollector(maxErrors)
-        , Issues(issues)
+        , Issues_(issues)
     {
     }
 
 private:
     void AddError(ui32 line, ui32 column, const TString& message) override {
-        Issues.AddIssue(TPosition(column, line, "jsonpath"), StripString(message));
-        Issues.back().SetCode(TIssuesIds::JSONPATH_PARSE_ERROR, TSeverityIds::S_ERROR);
+        Issues_.AddIssue(TPosition(column, line, "jsonpath"), StripString(message));
+        Issues_.back().SetCode(TIssuesIds::JSONPATH_PARSE_ERROR, TSeverityIds::S_ERROR);
     }
 
-    TIssues& Issues;
+    TIssues& Issues_;
 };
 
 }
diff --git a/yql/essentials/minikql/jsonpath/parser/type_check.cpp b/yql/essentials/minikql/jsonpath/parser/type_check.cpp
index f6ef00c9b24..db1c2cb5866 100644
--- a/yql/essentials/minikql/jsonpath/parser/type_check.cpp
+++ b/yql/essentials/minikql/jsonpath/parser/type_check.cpp
@@ -5,7 +5,7 @@
 namespace NYql::NJsonPath {
 
 TJsonPathTypeChecker::TJsonPathTypeChecker(TIssues& issues)
-    : Issues(issues)
+    : Issues_(issues)
 {
 }
 
@@ -125,8 +125,8 @@ void TJsonPathTypeChecker::VisitLikeRegexPredicate(const TLikeRegexPredicateNode
 }
 
 void TJsonPathTypeChecker::Error(const TAstNodePtr node, const TStringBuf message) {
-    Issues.AddIssue(node->GetPos(), message);
-    Issues.back().SetCode(TIssuesIds::JSONPATH_TYPE_CHECK_ERROR, TSeverityIds::S_ERROR);
+    Issues_.AddIssue(node->GetPos(), message);
+    Issues_.back().SetCode(TIssuesIds::JSONPATH_TYPE_CHECK_ERROR, TSeverityIds::S_ERROR);
 }
 
 }
diff --git a/yql/essentials/minikql/jsonpath/parser/type_check.h b/yql/essentials/minikql/jsonpath/parser/type_check.h
index 4c56a8a72ae..6565b59182c 100644
--- a/yql/essentials/minikql/jsonpath/parser/type_check.h
+++ b/yql/essentials/minikql/jsonpath/parser/type_check.h
@@ -53,7 +53,7 @@ public:
     void Error(const TAstNodePtr node, const TStringBuf message);
 
 private:
-    TIssues& Issues;
+    TIssues& Issues_;
 };
 
 }