From 47a71a513c3a47a60340f08f67e310902e5d9b2f Mon Sep 17 00:00:00 2001 From: Evgeny Zverev Date: Thu, 7 Dec 2023 18:30:40 +0300 Subject: [PATCH 1/2] YQ-2651 use ChildPtr instead of ChildRef --- ydb/library/yql/core/yql_match_recognize.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ydb/library/yql/core/yql_match_recognize.h b/ydb/library/yql/core/yql_match_recognize.h index 5c623cf8604f..df22769f0177 100644 --- a/ydb/library/yql/core/yql_match_recognize.h +++ b/ydb/library/yql/core/yql_match_recognize.h @@ -12,14 +12,14 @@ inline TRowPattern ConvertPattern(const TExprNode::TPtr& pattern, TExprContext & for (const auto& factor: term->Children()) { YQL_ENSURE(factor->ChildrenSize() == 6, "Expect 6 args"); result.back().push_back(TRowPatternFactor{ - factor->ChildRef(0)->IsAtom() ? - TRowPatternPrimary(TString(factor->ChildRef(0)->Content())) : - ConvertPattern(factor->ChildRef(0), ctx, nestingLevel + 1), - FromString(factor->ChildRef(1)->Content()), - FromString(factor->ChildRef(2)->Content()), - FromString(factor->ChildRef(3)->Content()), - FromString(factor->ChildRef(4)->Content()), - FromString(factor->ChildRef(5)->Content()) + factor->ChildPtr(0)->IsAtom() ? + TRowPatternPrimary(TString(factor->ChildPtr(0)->Content())) : + ConvertPattern(factor->ChildPtr(0), ctx, nestingLevel + 1), + FromString(factor->ChildPtr(1)->Content()), + FromString(factor->ChildPtr(2)->Content()), + FromString(factor->ChildPtr(3)->Content()), + FromString(factor->ChildPtr(4)->Content()), + FromString(factor->ChildPtr(5)->Content()) }); } } From 7c0932f6ecb50591518fd077ce099b15b8b36783 Mon Sep 17 00:00:00 2001 From: Evgeny Zverev Date: Tue, 26 Dec 2023 17:33:08 +0300 Subject: [PATCH 2/2] use Child instead of ChildPtr --- ydb/library/yql/core/yql_match_recognize.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ydb/library/yql/core/yql_match_recognize.h b/ydb/library/yql/core/yql_match_recognize.h index df22769f0177..aace73430eea 100644 --- a/ydb/library/yql/core/yql_match_recognize.h +++ b/ydb/library/yql/core/yql_match_recognize.h @@ -12,14 +12,14 @@ inline TRowPattern ConvertPattern(const TExprNode::TPtr& pattern, TExprContext & for (const auto& factor: term->Children()) { YQL_ENSURE(factor->ChildrenSize() == 6, "Expect 6 args"); result.back().push_back(TRowPatternFactor{ - factor->ChildPtr(0)->IsAtom() ? - TRowPatternPrimary(TString(factor->ChildPtr(0)->Content())) : - ConvertPattern(factor->ChildPtr(0), ctx, nestingLevel + 1), - FromString(factor->ChildPtr(1)->Content()), - FromString(factor->ChildPtr(2)->Content()), - FromString(factor->ChildPtr(3)->Content()), - FromString(factor->ChildPtr(4)->Content()), - FromString(factor->ChildPtr(5)->Content()) + factor->Child(0)->IsAtom() ? + TRowPatternPrimary(TString(factor->Child(0)->Content())) : + ConvertPattern(factor->Child(0), ctx, nestingLevel + 1), + FromString(factor->Child(1)->Content()), + FromString(factor->Child(2)->Content()), + FromString(factor->Child(3)->Content()), + FromString(factor->Child(4)->Content()), + FromString(factor->Child(5)->Content()) }); } }