Skip to content

GH-50911: [C++][FlightSQL][ODBC] Replace RapidJSON with JsonWriter #50912

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
kou merged 1 commit into from
Aug 19, 2026
+24 −25
Merged

GH-50911: [C++][FlightSQL][ODBC] Replace RapidJSON with JsonWriter #50912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions cpp/src/arrow/flight/sql/odbc/odbc_impl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,10 @@ if(WIN32)
find_package(ODBC REQUIRED)
target_include_directories(arrow_odbc_spi_impl PUBLIC ${ODBC_INCLUDE_DIR})
target_link_libraries(arrow_odbc_spi_impl
PUBLIC arrow_flight_sql_shared arrow_compute_shared Boost::locale
PUBLIC arrow_flight_sql_shared
arrow_compute_shared
Boost::locale
arrow::simdjson
${ODBCINST})
else()
# Unix
Expand All @@ -144,7 +147,7 @@ else()
arrow_compute_static
Boost::locale
Boost::headers
RapidJSON)
arrow::simdjson)

if(NOT APPLE)
# Explicitly link to unix-odbc on Linux
Expand Down
42 changes: 19 additions & 23 deletions cpp/src/arrow/flight/sql/odbc/odbc_impl/json_converter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,10 @@

#include "arrow/flight/sql/odbc/odbc_impl/json_converter.h"

#include <rapidjson/rapidjson.h>
#include <rapidjson/writer.h>
#include <boost/beast/core/detail/base64.hpp>
#include "arrow/builder.h"
#include "arrow/flight/sql/odbc/odbc_impl/util.h"
#include "arrow/json/json_writer_internal.h"
#include "arrow/scalar.h"
#include "arrow/visitor.h"

Expand All @@ -31,32 +30,31 @@ namespace base64 = boost::beast::detail::base64;

namespace arrow::flight::sql::odbc {

using ::arrow::json::JsonWriter;
using util::ThrowIfNotOK;

namespace {
template <typename ScalarT>
Status ConvertScalarToStringAndWrite(const ScalarT& scalar,
rapidjson::Writer<rapidjson::StringBuffer>& writer) {
Status ConvertScalarToStringAndWrite(const ScalarT& scalar, JsonWriter& writer) {
ARROW_ASSIGN_OR_RAISE(auto string_scalar, scalar.CastTo(arrow::utf8()))
const auto& view = reinterpret_cast<StringScalar*>(string_scalar.get())->view();
writer.String(view.data(), static_cast<rapidjson::SizeType>(view.length()), true);
writer.String(view);
return Status::OK();
}

template <typename BinaryScalarT>
Status ConvertBinaryToBase64StringAndWrite(
const BinaryScalarT& scalar, rapidjson::Writer<rapidjson::StringBuffer>& writer) {
Status ConvertBinaryToBase64StringAndWrite(const BinaryScalarT& scalar,
JsonWriter& writer) {
const auto& view = scalar.view();
size_t encoded_size = base64::encoded_size(view.length());
std::vector<char> encoded(std::max(encoded_size, static_cast<size_t>(1)));
base64::encode(&encoded[0], view.data(), view.length());
writer.String(&encoded[0], static_cast<rapidjson::SizeType>(encoded_size), true);
writer.String(std::string_view(encoded.data(), encoded_size));
return Status::OK();
}

template <typename ListScalarT>
Status WriteListScalar(const ListScalarT& scalar,
rapidjson::Writer<rapidjson::StringBuffer>& writer,
Status WriteListScalar(const ListScalarT& scalar, JsonWriter& writer,
ScalarVisitor* visitor) {
writer.StartArray();
for (int64_t i = 0; i < scalar.value->length(); ++i) {
Expand All @@ -75,16 +73,16 @@ Status WriteListScalar(const ListScalarT& scalar,

class ScalarToJson : public ScalarVisitor {
private:
rapidjson::StringBuffer string_buffer_;
rapidjson::Writer<rapidjson::StringBuffer> writer_{string_buffer_};
JsonWriter writer_;

public:
void Reset() {
string_buffer_.Clear();
writer_.Reset(string_buffer_);
}
void Reset() { writer_.Clear(); }

std::string ToString() { return string_buffer_.GetString(); }
std::string ToString() {
auto result = writer_.GetString();
ThrowIfNotOK(result.status());
return std::string(*result);
}

Status Visit(const NullScalar& scalar) override {
writer_.Null();
Expand Down Expand Up @@ -164,7 +162,7 @@ class ScalarToJson : public ScalarVisitor {

Status Visit(const StringScalar& scalar) override {
const auto& view = scalar.view();
writer_.String(view.data(), static_cast<rapidjson::SizeType>(view.length()));
writer_.String(view);

return Status::OK();
}
Expand All @@ -175,7 +173,7 @@ class ScalarToJson : public ScalarVisitor {

Status Visit(const LargeStringScalar& scalar) override {
const auto& view = scalar.view();
writer_.String(view.data(), static_cast<rapidjson::SizeType>(view.length()));
writer_.String(view);

return Status::OK();
}
Expand Down Expand Up @@ -227,16 +225,14 @@ class ScalarToJson : public ScalarVisitor {

Status Visit(const Decimal128Scalar& scalar) override {
const auto& view = scalar.ToString();
writer_.RawValue(view.data(), static_cast<rapidjson::SizeType>(view.length()),
rapidjson::kNumberType);
writer_.RawValue(view);

return Status::OK();
}

Status Visit(const Decimal256Scalar& scalar) override {
const auto& view = scalar.ToString();
writer_.RawValue(view.data(), static_cast<rapidjson::SizeType>(view.length()),
rapidjson::kNumberType);
writer_.RawValue(view);

return Status::OK();
}
Expand Down
Loading