YQL-20086 minikql

commit_hash:c35c972d6708fb1b3f34fa34a42cdae1ddf11cdc

1 files changed, 49 insertions, 49 deletions

diff --git a/yql/essentials/minikql/jsonpath/value.cpp b/yql/essentials/minikql/jsonpath/value.cpp
index 356543baf8b..bb06dea990f 100644
--- a/yql/essentials/minikql/jsonpath/value.cpp
+++ b/yql/essentials/minikql/jsonpath/value.cpp
@@ -10,40 +10,40 @@ using namespace NKikimr;
 using namespace NKikimr::NBinaryJson;
 
 TArrayIterator::TArrayIterator()
-    : Iterator(TEmptyMarker())
+    : Iterator_(TEmptyMarker())
 {
 }
 
 TArrayIterator::TArrayIterator(const TUnboxedValue& iterator)
-    : Iterator(iterator)
+    : Iterator_(iterator)
 {
 }
 
 TArrayIterator::TArrayIterator(TUnboxedValue&& iterator)
-    : Iterator(std::move(iterator))
+    : Iterator_(std::move(iterator))
 {
 }
 
 TArrayIterator::TArrayIterator(const NBinaryJson::TArrayIterator& iterator)
-    : Iterator(iterator)
+    : Iterator_(iterator)
 {
 }
 
 TArrayIterator::TArrayIterator(NBinaryJson::TArrayIterator&& iterator)
-    : Iterator(std::move(iterator))
+    : Iterator_(std::move(iterator))
 {
 }
 
 bool TArrayIterator::Next(TValue& value) {
-    if (std::holds_alternative<TEmptyMarker>(Iterator)) {
+    if (std::holds_alternative<TEmptyMarker>(Iterator_)) {
         return false;
-    } else if (auto* iterator = std::get_if<NBinaryJson::TArrayIterator>(&Iterator)) {
+    } else if (auto* iterator = std::get_if<NBinaryJson::TArrayIterator>(&Iterator_)) {
         if (!iterator->HasNext()) {
             return false;
         }
         value = TValue(iterator->Next());
         return true;
-    } else if (auto* iterator = std::get_if<TUnboxedValue>(&Iterator)) {
+    } else if (auto* iterator = std::get_if<TUnboxedValue>(&Iterator_)) {
         TUnboxedValue result;
         const bool success = iterator->Next(result);
         if (success) {
@@ -56,34 +56,34 @@ bool TArrayIterator::Next(TValue& value) {
 }
 
 TObjectIterator::TObjectIterator()
-    : Iterator(TEmptyMarker())
+    : Iterator_(TEmptyMarker())
 {
 }
 
 TObjectIterator::TObjectIterator(const TUnboxedValue& iterator)
-    : Iterator(iterator)
+    : Iterator_(iterator)
 {
 }
 
 TObjectIterator::TObjectIterator(TUnboxedValue&& iterator)
-    : Iterator(std::move(iterator))
+    : Iterator_(std::move(iterator))
 {
 }
 
 TObjectIterator::TObjectIterator(const NBinaryJson::TObjectIterator& iterator)
-    : Iterator(iterator)
+    : Iterator_(iterator)
 {
 }
 
 TObjectIterator::TObjectIterator(NBinaryJson::TObjectIterator&& iterator)
-    : Iterator(std::move(iterator))
+    : Iterator_(std::move(iterator))
 {
 }
 
 bool TObjectIterator::Next(TValue& key, TValue& value) {
-    if (std::holds_alternative<TEmptyMarker>(Iterator)) {
+    if (std::holds_alternative<TEmptyMarker>(Iterator_)) {
         return false;
-    } else if (auto* iterator = std::get_if<NBinaryJson::TObjectIterator>(&Iterator)) {
+    } else if (auto* iterator = std::get_if<NBinaryJson::TObjectIterator>(&Iterator_)) {
         if (!iterator->HasNext()) {
             return false;
         }
@@ -91,7 +91,7 @@ bool TObjectIterator::Next(TValue& key, TValue& value) {
         key = TValue(itKey);
         value = TValue(itValue);
         return true;
-    } else if (auto* iterator = std::get_if<TUnboxedValue>(&Iterator)) {
+    } else if (auto* iterator = std::get_if<TUnboxedValue>(&Iterator_)) {
         TUnboxedValue itKey;
         TUnboxedValue itValue;
         const bool success = iterator->NextPair(itKey, itValue);
@@ -106,46 +106,46 @@ bool TObjectIterator::Next(TValue& key, TValue& value) {
 }
 
 TValue::TValue()
-    : Value(MakeEntity())
+    : Value_(MakeEntity())
 {
 }
 
 TValue::TValue(const TUnboxedValue& value)
-    : Value(value)
+    : Value_(value)
 {
 }
 
 TValue::TValue(TUnboxedValue&& value)
-    : Value(std::move(value))
+    : Value_(std::move(value))
 {
 }
 
 TValue::TValue(const TEntryCursor& value)
-    : Value(value)
+    : Value_(value)
 {
     UnpackInnerValue();
 }
 
 TValue::TValue(TEntryCursor&& value)
-    : Value(std::move(value))
+    : Value_(std::move(value))
 {
     UnpackInnerValue();
 }
 
 TValue::TValue(const TContainerCursor& value)
-    : Value(value)
+    : Value_(value)
 {
     UnpackInnerValue();
 }
 
 TValue::TValue(TContainerCursor&& value)
-    : Value(std::move(value))
+    : Value_(std::move(value))
 {
     UnpackInnerValue();
 }
 
 EValueType TValue::GetType() const {
-    if (const auto* value = std::get_if<TEntryCursor>(&Value)) {
+    if (const auto* value = std::get_if<TEntryCursor>(&Value_)) {
         switch (value->GetType()) {
             case EEntryType::BoolFalse:
             case EEntryType::BoolTrue:
@@ -159,7 +159,7 @@ EValueType TValue::GetType() const {
             case EEntryType::Container:
                 Y_ABORT("Logical error: TEntryCursor with Container type must be converted to TContainerCursor");
         }
-    } else if (const auto* value = std::get_if<TContainerCursor>(&Value)) {
+    } else if (const auto* value = std::get_if<TContainerCursor>(&Value_)) {
         switch (value->GetType()) {
             case EContainerType::Array:
                 return EValueType::Array;
@@ -168,7 +168,7 @@ EValueType TValue::GetType() const {
             case EContainerType::TopLevelScalar:
                 Y_ABORT("Logical error: TContainerCursor with TopLevelScalar type must be converted to TEntryCursor");
         }
-    } else if (const auto* value = std::get_if<TUnboxedValue>(&Value)) {
+    } else if (const auto* value = std::get_if<TUnboxedValue>(&Value_)) {
         switch (GetNodeType(*value)) {
             case ENodeType::Bool:
                 return EValueType::Bool;
@@ -222,9 +222,9 @@ bool TValue::IsArray() const {
 double TValue::GetNumber() const {
     Y_DEBUG_ABORT_UNLESS(IsNumber());
 
-    if (const auto* value = std::get_if<TEntryCursor>(&Value)) {
+    if (const auto* value = std::get_if<TEntryCursor>(&Value_)) {
         return value->GetNumber();
-    } else if (const auto* value = std::get_if<TUnboxedValue>(&Value)) {
+    } else if (const auto* value = std::get_if<TUnboxedValue>(&Value_)) {
         if (IsNodeType(*value, ENodeType::Double)) {
             return value->Get<double>();
         } else if (IsNodeType(*value, ENodeType::Int64)) {
@@ -240,9 +240,9 @@ double TValue::GetNumber() const {
 bool TValue::GetBool() const {
     Y_DEBUG_ABORT_UNLESS(IsBool());
 
-    if (const auto* value = std::get_if<TEntryCursor>(&Value)) {
+    if (const auto* value = std::get_if<TEntryCursor>(&Value_)) {
         return value->GetType() == EEntryType::BoolTrue;
-    } else if (const auto* value = std::get_if<TUnboxedValue>(&Value)) {
+    } else if (const auto* value = std::get_if<TUnboxedValue>(&Value_)) {
         return value->Get<bool>();
     } else {
         Y_ABORT("Unexpected variant case in GetBool");
@@ -252,9 +252,9 @@ bool TValue::GetBool() const {
 const TStringBuf TValue::GetString() const {
     Y_DEBUG_ABORT_UNLESS(IsString());
 
-    if (const auto* value = std::get_if<TEntryCursor>(&Value)) {
+    if (const auto* value = std::get_if<TEntryCursor>(&Value_)) {
         return value->GetString();
-    } else if (const auto* value = std::get_if<TUnboxedValue>(&Value)) {
+    } else if (const auto* value = std::get_if<TUnboxedValue>(&Value_)) {
         return value->AsStringRef();
     } else {
         Y_ABORT("Unexpected variant case in GetString");
@@ -264,9 +264,9 @@ const TStringBuf TValue::GetString() const {
 ui32 TValue::GetSize() const {
     Y_DEBUG_ABORT_UNLESS(IsArray() || IsObject());
 
-    if (const auto* value = std::get_if<TContainerCursor>(&Value)) {
+    if (const auto* value = std::get_if<TContainerCursor>(&Value_)) {
         return value->GetSize();
-    } else if (const auto* value = std::get_if<TUnboxedValue>(&Value)) {
+    } else if (const auto* value = std::get_if<TUnboxedValue>(&Value_)) {
         if (value->IsEmbedded()) {
             return 0;
         }
@@ -284,9 +284,9 @@ ui32 TValue::GetSize() const {
 TValue TValue::GetElement(ui32 index) const {
     Y_DEBUG_ABORT_UNLESS(IsArray());
 
-    if (const auto* value = std::get_if<TContainerCursor>(&Value)) {
+    if (const auto* value = std::get_if<TContainerCursor>(&Value_)) {
         return TValue(value->GetElement(index));
-    } else if (const auto* value = std::get_if<TUnboxedValue>(&Value)) {
+    } else if (const auto* value = std::get_if<TUnboxedValue>(&Value_)) {
         return TValue(value->Lookup(TUnboxedValuePod(index)));
     } else {
         Y_ABORT("Unexpected variant case in GetElement");
@@ -296,9 +296,9 @@ TValue TValue::GetElement(ui32 index) const {
 TArrayIterator TValue::GetArrayIterator() const {
     Y_DEBUG_ABORT_UNLESS(IsArray());
 
-    if (const auto* value = std::get_if<TContainerCursor>(&Value)) {
+    if (const auto* value = std::get_if<TContainerCursor>(&Value_)) {
         return TArrayIterator(value->GetArrayIterator());
-    } else if (const auto* value = std::get_if<TUnboxedValue>(&Value)) {
+    } else if (const auto* value = std::get_if<TUnboxedValue>(&Value_)) {
         if (value->IsEmbedded()) {
             return TArrayIterator();
         }
@@ -311,13 +311,13 @@ TArrayIterator TValue::GetArrayIterator() const {
 TMaybe<TValue> TValue::Lookup(const TStringBuf key) const {
     Y_DEBUG_ABORT_UNLESS(IsObject());
 
-    if (const auto* value = std::get_if<TContainerCursor>(&Value)) {
+    if (const auto* value = std::get_if<TContainerCursor>(&Value_)) {
         const auto payload = value->Lookup(key);
         if (!payload.Defined()) {
             return Nothing();
         }
         return TValue(*payload);
-    } else if (const auto* value = std::get_if<TUnboxedValue>(&Value)) {
+    } else if (const auto* value = std::get_if<TUnboxedValue>(&Value_)) {
         if (value->IsEmbedded()) {
             return Nothing();
         }
@@ -339,9 +339,9 @@ TMaybe<TValue> TValue::Lookup(const TStringBuf key) const {
 TObjectIterator TValue::GetObjectIterator() const {
     Y_DEBUG_ABORT_UNLESS(IsObject());
 
-    if (const auto* value = std::get_if<TContainerCursor>(&Value)) {
+    if (const auto* value = std::get_if<TContainerCursor>(&Value_)) {
         return TObjectIterator(value->GetObjectIterator());
-    } else if (const auto* value = std::get_if<TUnboxedValue>(&Value)) {
+    } else if (const auto* value = std::get_if<TUnboxedValue>(&Value_)) {
         if (value->IsEmbedded()) {
             return TObjectIterator();
         }
@@ -352,11 +352,11 @@ TObjectIterator TValue::GetObjectIterator() const {
 }
 
 TUnboxedValue TValue::ConvertToUnboxedValue(const NUdf::IValueBuilder* valueBuilder) const {
-    if (const auto* value = std::get_if<TEntryCursor>(&Value)) {
+    if (const auto* value = std::get_if<TEntryCursor>(&Value_)) {
         return ReadElementToJsonDom(*value, valueBuilder);
-    } else if (const auto* value = std::get_if<TContainerCursor>(&Value)) {
+    } else if (const auto* value = std::get_if<TContainerCursor>(&Value_)) {
         return ReadContainerToJsonDom(*value, valueBuilder);
-    } else if (const auto* value = std::get_if<TUnboxedValue>(&Value)) {
+    } else if (const auto* value = std::get_if<TUnboxedValue>(&Value_)) {
         return *value;
     } else {
         Y_ABORT("Unexpected variant case in ConvertToUnboxedValue");
@@ -365,16 +365,16 @@ TUnboxedValue TValue::ConvertToUnboxedValue(const NUdf::IValueBuilder* valueBuil
 
 void TValue::UnpackInnerValue() {
     // If TEntryCursor points to container, we need to extract TContainerCursor
-    if (const auto* value = std::get_if<TEntryCursor>(&Value)) {
+    if (const auto* value = std::get_if<TEntryCursor>(&Value_)) {
         if (value->GetType() == EEntryType::Container) {
-            Value = value->GetContainer();
+            Value_ = value->GetContainer();
         }
     }
 
     // If TContainerCursor points to top level scalar, we need to extract TEntryCursor
-    if (const auto* value = std::get_if<TContainerCursor>(&Value)) {
+    if (const auto* value = std::get_if<TContainerCursor>(&Value_)) {
         if (value->GetType() == EContainerType::TopLevelScalar) {
-            Value = value->GetElement(0);
+            Value_ = value->GetElement(0);
         }
     }
 }