Skip to content

Commit 5a1f424

Browse files
committed
apacheGH-50859: [C++][Parquet] Move JsonWriter to simdjson utilities
Parquet uses JsonWriter independently of the Arrow JSON module. Move the writer into the simdjson utilities so it is available whenever simdjson is enabled, including ARROW_JSON=OFF builds. Preserve the writer files as renames and update CMake, Meson, callers, and tests.
1 parent 2e448f9 commit 5a1f424

26 files changed

Lines changed: 313 additions & 231 deletions

‎cpp/src/arrow/CMakeLists.txt‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -644,6 +644,9 @@ endif()
644644
if(ARROW_WITH_OPENTELEMETRY)
645645
list(APPEND ARROW_UTIL_SRCS util/tracing_internal.cc)
646646
endif()
647+
if(ARROW_WITH_SIMDJSON)
648+
list(APPEND ARROW_UTIL_SRCS util/json_writer_internal.cc util/simdjson_internal.cc)
649+
endif()
647650
if(ARROW_WITH_SNAPPY)
648651
list(APPEND ARROW_UTIL_SRCS util/compression_snappy.cc)
649652
endif()
@@ -664,6 +667,12 @@ foreach(ARROW_UTIL_TARGET ${ARROW_UTIL_TARGETS})
664667
target_link_libraries(${ARROW_UTIL_TARGET} PRIVATE ${ARROW_XSIMD})
665668
endforeach()
666669

670+
if(ARROW_WITH_SIMDJSON)
671+
foreach(ARROW_UTIL_TARGET ${ARROW_UTIL_TARGETS})
672+
target_link_libraries(${ARROW_UTIL_TARGET} PRIVATE arrow::simdjson)
673+
endforeach()
674+
endif()
675+
667676
if(ARROW_USE_BOOST)
668677
foreach(ARROW_UTIL_TARGET ${ARROW_UTIL_TARGETS})
669678
target_link_libraries(${ARROW_UTIL_TARGET} PRIVATE Boost::headers)
@@ -1088,7 +1097,6 @@ if(ARROW_JSON)
10881097
json/chunker.cc
10891098
json/converter.cc
10901099
json/from_string.cc
1091-
json/json_writer_internal.cc
10921100
json/object_parser.cc
10931101
json/parser.cc
10941102
json/reader.cc)

‎cpp/src/arrow/dataset/file_json_test.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
#include "arrow/dataset/plan.h"
2121
#include "arrow/dataset/test_util_internal.h"
2222
#include "arrow/filesystem/mockfs.h"
23-
#include "arrow/json/json_writer_internal.h"
2423
#include "arrow/json/parser.h"
2524
#include "arrow/testing/gtest_util.h"
2625
#include "arrow/testing/util.h"
26+
#include "arrow/util/json_writer_internal.h"
2727
#include "arrow/util/logging_internal.h"
2828

2929
namespace arrow {

‎cpp/src/arrow/extension/fixed_shape_tensor.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727

2828
#include "arrow/array/array_nested.h"
2929
#include "arrow/array/array_primitive.h"
30-
#include "arrow/json/json_writer_internal.h"
3130
#include "arrow/tensor.h"
31+
#include "arrow/util/json_writer_internal.h"
3232
#include "arrow/util/logging_internal.h"
3333
#include "arrow/util/print_internal.h"
3434
#include "arrow/util/simdjson_internal.h"

‎cpp/src/arrow/extension/opaque.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
#include <sstream>
2121

22-
#include "arrow/json/json_writer_internal.h"
22+
#include "arrow/util/json_writer_internal.h"
2323
#include "arrow/util/logging_internal.h"
2424
#include "arrow/util/simdjson_internal.h"
2525

‎cpp/src/arrow/extension/variable_shape_tensor.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
#include "arrow/extension/variable_shape_tensor.h"
2424

2525
#include "arrow/array/array_primitive.h"
26-
#include "arrow/json/json_writer_internal.h"
2726
#include "arrow/scalar.h"
2827
#include "arrow/tensor.h"
28+
#include "arrow/util/json_writer_internal.h"
2929
#include "arrow/util/logging_internal.h"
3030
#include "arrow/util/print_internal.h"
3131
#include "arrow/util/simdjson_internal.h"

‎cpp/src/arrow/flight/sql/odbc/odbc_impl/json_converter.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
#include <boost/beast/core/detail/base64.hpp>
2121
#include "arrow/builder.h"
2222
#include "arrow/flight/sql/odbc/odbc_impl/util.h"
23-
#include "arrow/json/json_writer_internal.h"
2423
#include "arrow/scalar.h"
24+
#include "arrow/util/json_writer_internal.h"
2525
#include "arrow/visitor.h"
2626

2727
using boost::beast::detail::base64::encode;

‎cpp/src/arrow/integration/json_integration.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929
#include "arrow/integration/json_internal.h"
3030
#include "arrow/io/file.h"
3131
#include "arrow/ipc/dictionary.h"
32-
#include "arrow/json/json_writer_internal.h"
3332
#include "arrow/record_batch.h"
3433
#include "arrow/result.h"
3534
#include "arrow/status.h"
3635
#include "arrow/type.h"
36+
#include "arrow/util/json_writer_internal.h"
3737
#include "arrow/util/logging_internal.h"
3838
#include "arrow/util/simdjson_internal.h"
3939

‎cpp/src/arrow/integration/json_integration_test.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
#include "arrow/ipc/reader.h"
3939
#include "arrow/ipc/test_common.h"
4040
#include "arrow/ipc/writer.h"
41-
#include "arrow/json/json_writer_internal.h"
4241
#include "arrow/pretty_print.h"
4342
#include "arrow/status.h"
4443
#include "arrow/testing/builder.h"
@@ -49,6 +48,7 @@
4948
#include "arrow/type.h"
5049
#include "arrow/type_fwd.h"
5150
#include "arrow/util/io_util.h"
51+
#include "arrow/util/json_writer_internal.h"
5252
#include "arrow/util/simdjson_internal.h"
5353

5454
DEFINE_string(arrow, "", "Arrow file name");

‎cpp/src/arrow/integration/json_internal.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
#include "arrow/array/builder_time.h"
3737
#include "arrow/extension_type.h"
3838
#include "arrow/ipc/dictionary.h"
39-
#include "arrow/json/json_writer_internal.h"
4039
#include "arrow/record_batch.h"
4140
#include "arrow/result.h"
4241
#include "arrow/scalar.h"
@@ -48,6 +47,7 @@
4847
#include "arrow/util/checked_cast.h"
4948
#include "arrow/util/decimal.h"
5049
#include "arrow/util/formatting.h"
50+
#include "arrow/util/json_writer_internal.h"
5151
#include "arrow/util/key_value_metadata.h"
5252
#include "arrow/util/logging_internal.h"
5353
#include "arrow/util/range.h"

‎cpp/src/arrow/json/CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ add_arrow_test(test
2121
chunker_test.cc
2222
converter_test.cc
2323
from_string_test.cc
24-
json_writer_internal_test.cc
2524
object_parser_test.cc
2625
parser_test.cc
2726
reader_test.cc

0 commit comments

Comments
 (0)