Skip to content

Remove double BinaryJson parsing #28992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Vladilen merged 10 commits into from
Nov 21, 2025
Merged

Remove double BinaryJson parsing #28992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f7a297c
Remove double BinaryJson parsing
Vladilen Nov 14, 2025
608b53c
Add array and object parsing
Vladilen Nov 17, 2025
1fba8e7
Refactoring
Vladilen Nov 17, 2025
dfd73df
Fix review notes
Vladilen Nov 18, 2025
10a497b
Fix review notes
Vladilen Nov 18, 2025
85196e1
Fix review notes
Vladilen Nov 19, 2025
c8f8bb1
Fix review notes
Vladilen Nov 19, 2025
2e7191a
Merge remote-tracking branch 'official/main' into json-binary-parsing
Vladilen Nov 19, 2025
db6d2f6
Fix first level double parsing
Vladilen Nov 21, 2025
1064744
Merge remote-tracking branch 'official/main' into json-binary-parsing
Vladilen Nov 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 4 additions & 27 deletions ydb/core/formats/arrow/accessor/sub_columns/json_extractors.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,33 +39,14 @@ TConclusionStatus TKVExtractor::DoFill(TDataBuilder& dataBuilder, std::deque<std
}

TConclusionStatus IJsonObjectExtractor::AddDataToBuilder(TDataBuilder& dataBuilder,
std::deque<std::unique_ptr<IJsonObjectExtractor>>& iterators, const TStringBuf key, NBinaryJson::TEntryCursor& value) const {
std::deque<std::unique_ptr<IJsonObjectExtractor>>& iterators, const TStringBuf key, const NBinaryJson::TEntryCursor& value) const {
std::variant<NBinaryJson::TBinaryJson, TString> res;
bool addRes = true;

if (value.GetType() == NBinaryJson::EEntryType::String) {
NJson::TJsonValue jsonValue(value.GetString());
NJsonWriter::TBuf sout;
sout.WriteJsonValue(&jsonValue);
res = NBinaryJson::SerializeToBinaryJson(sout.Str(), false);
} else if (value.GetType() == NBinaryJson::EEntryType::Number) {
const double val = value.GetNumber();
double integer;
if (modf(val, &integer)) {
res = NBinaryJson::SerializeToBinaryJson(std::to_string(val), false);
} else {
res = NBinaryJson::SerializeToBinaryJson(std::to_string((i64)integer), false);
}
} else if (value.GetType() == NBinaryJson::EEntryType::BoolFalse) {
static const TString falseString = "false";
res = NBinaryJson::SerializeToBinaryJson(falseString, false);
} else if (value.GetType() == NBinaryJson::EEntryType::BoolTrue) {
static const TString trueString = "true";
res = NBinaryJson::SerializeToBinaryJson(trueString, false);
} else if (value.GetType() == NBinaryJson::EEntryType::Container) {
if (value.GetType() == NBinaryJson::EEntryType::Container) {
auto container = value.GetContainer();
if (FirstLevelOnly || container.GetType() == NBinaryJson::EContainerType::Array) {
res = NBinaryJson::SerializeToBinaryJson(NBinaryJson::SerializeToJson(container), false);
res = NBinaryJson::SerializeToBinaryJson(value);
// TODO: add support for arrays if needed
// } else if (container.GetType() == NBinaryJson::EContainerType::Array) {
// iterators.emplace_back(std::make_unique<TArrayExtractor>(container.GetArrayIterator(), key));
Expand All @@ -76,12 +57,8 @@ TConclusionStatus IJsonObjectExtractor::AddDataToBuilder(TDataBuilder& dataBuild
} else {
return TConclusionStatus::Fail("unexpected top value scalar in container iterator");
}

} else if (value.GetType() == NBinaryJson::EEntryType::Null) {
static const TString nullString = "null";
res = NBinaryJson::SerializeToBinaryJson(nullString, false);
} else {
return TConclusionStatus::Fail("unexpected json value type: " + ::ToString((int)value.GetType()));
res = NBinaryJson::SerializeToBinaryJson(value);
}

if (addRes) {
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/formats/arrow/accessor/sub_columns/json_extractors.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class IJsonObjectExtractor {
}

[[nodiscard]] TConclusionStatus AddDataToBuilder(TDataBuilder& dataBuilder, std::deque<std::unique_ptr<IJsonObjectExtractor>>& iterators,
const TStringBuf key, NBinaryJson::TEntryCursor& value) const;
const TStringBuf key, const NBinaryJson::TEntryCursor& value) const;

public:
virtual ~IJsonObjectExtractor() = default;
Expand Down
Loading