YQL-20086 sql

commit_hash:b06f3d2f5fa81e2073966eb172758758bd94fdf2

1 files changed, 12 insertions, 12 deletions

diff --git a/yql/essentials/sql/v1/sql_values.cpp b/yql/essentials/sql/v1/sql_values.cpp
index c035489387f..2375fa6ec91 100644
--- a/yql/essentials/sql/v1/sql_values.cpp
+++ b/yql/essentials/sql/v1/sql_values.cpp
@@ -11,7 +11,7 @@ using namespace NSQLv1Generated;
 
 TSourcePtr TSqlValues::Build(const TRule_values_stmt& node, TPosition& valuesPos, const TVector<TString>& derivedColumns, TPosition derivedColumnsPos) {
     Token(node.GetToken1());
-    valuesPos = Ctx.Pos();
+    valuesPos = Ctx_.Pos();
 
     TVector<TVector<TNodePtr>> rows;
     const auto& rowList = node.GetRule_values_source_row_list2();
@@ -22,13 +22,13 @@ TSourcePtr TSqlValues::Build(const TRule_values_stmt& node, TPosition& valuesPos
     YQL_ENSURE(!rows.empty());
     const size_t columnsCount = rows.back().size();
     if (derivedColumns.size() > columnsCount) {
-        Ctx.Error(derivedColumnsPos) << "Derived column list size exceeds column count in VALUES";
+        Ctx_.Error(derivedColumnsPos) << "Derived column list size exceeds column count in VALUES";
         return nullptr;
     }
 
     auto columns = derivedColumns;
-    if (Ctx.WarnUnnamedColumns && columns.size() < columnsCount) {
-        Ctx.Warning(valuesPos, TIssuesIds::YQL_UNNAMED_COLUMN)
+    if (Ctx_.WarnUnnamedColumns && columns.size() < columnsCount) {
+        Ctx_.Warning(valuesPos, TIssuesIds::YQL_UNNAMED_COLUMN)
             << "Autogenerated column names column" << columns.size() << "...column" << columnsCount - 1 << " will be used here";
     }
 
@@ -80,15 +80,15 @@ bool TSqlValues::BuildRows(const TRule_values_source_row_list& node, TVector<TVe
 }
 
 bool TSqlValues::BuildRow(const TRule_values_source_row& inRow, TVector<TNodePtr>& outRow) {
-    TSqlExpression sqlExpr(Ctx, Mode);
+    TSqlExpression sqlExpr(Ctx_, Mode_);
     return ExprList(sqlExpr, outRow, inRow.GetRule_expr_list2());
 }
 
 TSourcePtr TSqlValues::ValuesSource(const TRule_values_source& node, const TVector<TString>& columnsHint,
     const TString& operationName)
 {
-    Ctx.IncrementMonCounter("sql_features", "ValuesSource");
-    TPosition pos(Ctx.Pos());
+    Ctx_.IncrementMonCounter("sql_features", "ValuesSource");
+    TPosition pos(Ctx_.Pos());
     switch (node.Alt_case()) {
         case TRule_values_source::kAltValuesSource1: {
             TVector<TVector<TNodePtr>> rows {{}};
@@ -99,7 +99,7 @@ TSourcePtr TSqlValues::ValuesSource(const TRule_values_source& node, const TVect
             return BuildWriteValues(pos, operationName, columnsHint, rows);
         }
         case TRule_values_source::kAltValuesSource2: {
-            TSqlSelect select(Ctx, Mode);
+            TSqlSelect select(Ctx_, Mode_);
             TPosition selectPos;
             auto source = select.Build(node.GetAlt_values_source2().GetRule_select_stmt1(), selectPos);
             if (!source) {
@@ -108,7 +108,7 @@ TSourcePtr TSqlValues::ValuesSource(const TRule_values_source& node, const TVect
             return BuildWriteValues(pos, "UPDATE", columnsHint, std::move(source));
         }
         default:
-            Ctx.IncrementMonCounter("sql_errors", "UnknownValuesSource");
+            Ctx_.IncrementMonCounter("sql_errors", "UnknownValuesSource");
             AltNotImplemented("values_source", node);
             return nullptr;
     }
@@ -125,7 +125,7 @@ TSourcePtr TSqlIntoValues::Build(const TRule_into_values_source& node, const TSt
             return ValuesSource(alt.GetRule_values_source2(), columnsHint, operationName);
         }
         default:
-            Ctx.IncrementMonCounter("sql_errors", "DefaultValuesOrOther");
+            Ctx_.IncrementMonCounter("sql_errors", "DefaultValuesOrOther");
             AltNotImplemented("into_values_source", node);
             return nullptr;
     }
@@ -134,7 +134,7 @@ TSourcePtr TSqlIntoValues::Build(const TRule_into_values_source& node, const TSt
 TSourcePtr TSqlAsValues::Build(const TRule_values_source& node, const TString& operationName) {
     switch (node.Alt_case()) {
         case TRule_values_source::kAltValuesSource1: {
-            Ctx.IncrementMonCounter("sql_errors", "UnknownValuesSource");
+            Ctx_.IncrementMonCounter("sql_errors", "UnknownValuesSource");
             Error() << "AS VALUES statement is not supported for " << operationName << ".";
             return nullptr;
         }
@@ -142,7 +142,7 @@ TSourcePtr TSqlAsValues::Build(const TRule_values_source& node, const TString& o
             return ValuesSource(node, {}, operationName);
         }
         default:
-            Ctx.IncrementMonCounter("sql_errors", "UnknownValuesSource");
+            Ctx_.IncrementMonCounter("sql_errors", "UnknownValuesSource");
             AltNotImplemented("values_source", node);
             return nullptr;
     }