From df4b1ca60b92108e53a3d508884d3114942146fa Mon Sep 17 00:00:00 2001 From: lihangyu <15605149486@163.com> Date: Fri, 27 Sep 2024 14:23:06 +0800 Subject: [PATCH] [pick](variant) pick some serde impl (#40573) (#41390) related PR #40573 introduced by #41358 --- .../serde/data_type_nothing_serde.h | 7 +++++ .../serde/data_type_object_serde.cpp | 31 +++++++++++++++++++ .../data_types/serde/data_type_object_serde.h | 4 +++ 3 files changed, 42 insertions(+) diff --git a/be/src/vec/data_types/serde/data_type_nothing_serde.h b/be/src/vec/data_types/serde/data_type_nothing_serde.h index b39c3b5776ece4..83f7caf0579db0 100644 --- a/be/src/vec/data_types/serde/data_type_nothing_serde.h +++ b/be/src/vec/data_types/serde/data_type_nothing_serde.h @@ -107,6 +107,13 @@ class DataTypeNothingSerde : public DataTypeSerDe { std::vector& buffer_list) const override { return Status::NotSupported("write_column_to_orc with type " + column.get_name()); } + + Status write_one_cell_to_json(const IColumn& column, rapidjson::Value& result, + rapidjson::Document::AllocatorType& allocator, Arena& mem_pool, + int row_num) const override { + result.SetNull(); + return Status::OK(); + } }; } // namespace vectorized } // namespace doris diff --git a/be/src/vec/data_types/serde/data_type_object_serde.cpp b/be/src/vec/data_types/serde/data_type_object_serde.cpp index 49efa8c829c370..530646e9b4de08 100644 --- a/be/src/vec/data_types/serde/data_type_object_serde.cpp +++ b/be/src/vec/data_types/serde/data_type_object_serde.cpp @@ -160,6 +160,37 @@ void DataTypeObjectSerDe::write_column_to_arrow(const IColumn& column, const Nul } } +Status DataTypeObjectSerDe::write_one_cell_to_json(const IColumn& column, rapidjson::Value& result, + rapidjson::Document::AllocatorType& allocator, + Arena& mem_pool, int row_num) const { + const auto& var = assert_cast(column); + if (!var.is_finalized()) { + var.assume_mutable()->finalize(); + } + result.SetObject(); + // sort to make output stable, todo add a config + auto subcolumns = schema_util::get_sorted_subcolumns(var.get_subcolumns()); + for (const auto& entry : subcolumns) { + const auto& subcolumn = entry->data.get_finalized_column(); + const auto& subtype_serde = entry->data.get_least_common_type_serde(); + if (subcolumn.is_null_at(row_num)) { + continue; + } + rapidjson::Value key; + key.SetString(entry->path.get_path().data(), entry->path.get_path().size()); + rapidjson::Value val; + RETURN_IF_ERROR(subtype_serde->write_one_cell_to_json(subcolumn, val, allocator, mem_pool, + row_num)); + if (val.IsNull() && entry->path.empty()) { + // skip null value with empty key, indicate the null json value of root in variant map, + // usally padding in nested arrays + continue; + } + result.AddMember(key, val, allocator); + } + return Status::OK(); +} + } // namespace vectorized } // namespace doris diff --git a/be/src/vec/data_types/serde/data_type_object_serde.h b/be/src/vec/data_types/serde/data_type_object_serde.h index 9351b200f5344e..314922f8694f52 100644 --- a/be/src/vec/data_types/serde/data_type_object_serde.h +++ b/be/src/vec/data_types/serde/data_type_object_serde.h @@ -93,6 +93,10 @@ class DataTypeObjectSerDe : public DataTypeSerDe { return Status::NotSupported("write_column_to_orc with type " + column.get_name()); } + Status write_one_cell_to_json(const IColumn& column, rapidjson::Value& result, + rapidjson::Document::AllocatorType& allocator, Arena& mem_pool, + int row_num) const override; + private: template Status _write_column_to_mysql(const IColumn& column, MysqlRowBuffer& result,