diff --git a/ydb/core/fq/libs/row_dispatcher/json_parser.cpp b/ydb/core/fq/libs/row_dispatcher/json_parser.cpp index 26d7a45388dd..be076f09d67b 100644 --- a/ydb/core/fq/libs/row_dispatcher/json_parser.cpp +++ b/ydb/core/fq/libs/row_dispatcher/json_parser.cpp @@ -73,7 +73,7 @@ struct TJsonParserBuffer { }; class TColumnParser { - using TParser = std::function; + using TParser = std::function; public: const std::string Name; @@ -97,7 +97,7 @@ class TColumnParser { } } - void ParseJsonValue(simdjson::fallback::ondemand::value jsonValue, NYql::NUdf::TUnboxedValue& resultValue) { + void ParseJsonValue(simdjson::builtin::ondemand::value jsonValue, NYql::NUdf::TUnboxedValue& resultValue) { Parser(jsonValue, resultValue); NumberValues++; } @@ -130,7 +130,7 @@ class TColumnParser { } static TParser AddOptional(TParser parser) { - return [parser](simdjson::fallback::ondemand::value jsonValue, NYql::NUdf::TUnboxedValue& resultValue) { + return [parser](simdjson::builtin::ondemand::value jsonValue, NYql::NUdf::TUnboxedValue& resultValue) { parser(std::move(jsonValue), resultValue); if (resultValue) { resultValue = resultValue.MakeOptional(); @@ -140,9 +140,9 @@ class TColumnParser { static TParser GetJsonValueParser(NYql::NUdf::EDataSlot dataSlot, bool optional) { const auto& typeInfo = NYql::NUdf::GetDataTypeInfo(dataSlot); - return [dataSlot, optional, &typeInfo](simdjson::fallback::ondemand::value jsonValue, NYql::NUdf::TUnboxedValue& resultValue) { + return [dataSlot, optional, &typeInfo](simdjson::builtin::ondemand::value jsonValue, NYql::NUdf::TUnboxedValue& resultValue) { switch (jsonValue.type()) { - case simdjson::fallback::ondemand::json_type::number: { + case simdjson::builtin::ondemand::json_type::number: { try { switch (dataSlot) { case NYql::NUdf::EDataSlot::Int8: @@ -155,7 +155,7 @@ class TColumnParser { resultValue = ParseJsonNumber(jsonValue.get_int64().value()); break; case NYql::NUdf::EDataSlot::Int64: - resultValue = NYql::NUdf::TUnboxedValuePod(jsonValue.get_int64().value()); + resultValue = ParseJsonNumber(jsonValue.get_int64().value()); break; case NYql::NUdf::EDataSlot::Uint8: @@ -168,7 +168,7 @@ class TColumnParser { resultValue = ParseJsonNumber(jsonValue.get_uint64().value()); break; case NYql::NUdf::EDataSlot::Uint64: - resultValue = NYql::NUdf::TUnboxedValuePod(jsonValue.get_uint64().value()); + resultValue = ParseJsonNumber(jsonValue.get_uint64().value()); break; case NYql::NUdf::EDataSlot::Double: @@ -187,7 +187,7 @@ class TColumnParser { break; } - case simdjson::fallback::ondemand::json_type::string: { + case simdjson::builtin::ondemand::json_type::string: { const auto rawString = jsonValue.get_string().value(); resultValue = NKikimr::NMiniKQL::ValueFromString(dataSlot, rawString); if (Y_UNLIKELY(!resultValue)) { @@ -197,8 +197,8 @@ class TColumnParser { break; } - case simdjson::fallback::ondemand::json_type::array: - case simdjson::fallback::ondemand::json_type::object: { + case simdjson::builtin::ondemand::json_type::array: + case simdjson::builtin::ondemand::json_type::object: { const auto rawJson = jsonValue.raw_json().value(); if (Y_UNLIKELY(dataSlot != NYql::NUdf::EDataSlot::Json)) { throw yexception() << "found unexpected nested value (raw: '" << TruncateString(rawJson) << "'), expected data type " <