Merge 57dcd68 into 680b542

ydb-platform · Sep 16, 2024 · 0b43a07 · 0b43a07
2 parents 680b542 + 57dcd68
commit 0b43a07
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/ydb/library/yql/minikql/computation/mkql_value_builder.cpp b/ydb/library/yql/minikql/computation/mkql_value_builder.cpp
@@ -89,13 +89,13 @@ NUdf::TUnboxedValue TDefaultValueBuilder::SubString(NUdf::TUnboxedValuePod value
 NUdf::TUnboxedValue TDefaultValueBuilder::NewList(NUdf::TUnboxedValue* items, ui64 count) const {
     if (items == nullptr || count == 0) {
         return HolderFactory_.GetEmptyContainerLazy();
-    }
 
-    NUdf::TUnboxedValue* inplace = nullptr;
-    auto array = HolderFactory_.CreateDirectArrayHolder(count, inplace);
-    std::copy_n(std::make_move_iterator(items), count, inplace);
+    TUnboxedValueVector list;
+    for (ui64 i = 0; i < count; ++i) {
+        list.emplace_back(std::move(*items++));
+    }
 
-    return array;
+    return HolderFactory_.VectorAsVectorHolder(std::move(list));
 }
 
 NUdf::TUnboxedValue TDefaultValueBuilder::ReverseList(const NUdf::TUnboxedValuePod& list) const

diff --git a/ydb/library/yql/minikql/jsonpath/value.cpp b/ydb/library/yql/minikql/jsonpath/value.cpp
@@ -277,7 +277,7 @@ ui32 TValue::GetSize() const {
             return value->GetDictLength();
         }
     } else {
-        Y_ABORT("Unexpected variant case in GetString");
+        Y_ABORT("Unexpected variant case in GetSize");
     }
 }
 
@@ -287,9 +287,9 @@ TValue TValue::GetElement(ui32 index) const {
     if (const auto* value = std::get_if<TContainerCursor>(&Value)) {
         return TValue(value->GetElement(index));
     } else if (const auto* value = std::get_if<TUnboxedValue>(&Value)) {
-        return TValue(value->GetElement(index));
+        return TValue(value->Lookup(TUnboxedValuePod(index)));
     } else {
-        Y_ABORT("Unexpected variant case in GetString");
+        Y_ABORT("Unexpected variant case in GetElement");
     }
 }
 
@@ -304,7 +304,7 @@ TArrayIterator TValue::GetArrayIterator() const {
         }
         return TArrayIterator(value->GetListIterator());
     } else {
-        Y_ABORT("Unexpected variant case in GetString");
+        Y_ABORT("Unexpected variant case in GetArrayIterator");
     }
 }
 
@@ -332,7 +332,7 @@ TMaybe<TValue> TValue::Lookup(const TStringBuf key) const {
             return Nothing();
         }
     } else {
-        Y_ABORT("Unexpected variant case in GetString");
+        Y_ABORT("Unexpected variant case in Lookup");
     }
 }
 
@@ -347,7 +347,7 @@ TObjectIterator TValue::GetObjectIterator() const {
         }
         return TObjectIterator(value->GetDictIterator());
     } else {
-        Y_ABORT("Unexpected variant case in GetString");
+        Y_ABORT("Unexpected variant case in GetObjectIterator");
     }
 }
 

diff --git a/ydb/library/yql/udfs/common/yson2/yson2_udf.cpp b/ydb/library/yql/udfs/common/yson2/yson2_udf.cpp
@@ -313,9 +313,9 @@ TUnboxedValuePod LookupImpl(TUnboxedValuePod dict, const TUnboxedValuePod key, c
                         if (index < 0)
                             index += size;
                         if constexpr (Converter != nullptr) {
-                            return Converter(dict.GetElement(index).Release(), valueBuilder, pos);
+                            return Converter(dict.Lookup(TUnboxedValuePod(index)).Release(), valueBuilder, pos);
                         }
-                        return dict.GetElement(index).Release();
+                        return dict.Lookup(TUnboxedValuePod(index)).Release();
                     }
                 }
             }