Skip to content

GH-46459: [C++] Make some arrow/util headers internal #46721

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
pitrou merged 3 commits into from
Jun 9, 2025
Merged

GH-46459: [C++] Make some arrow/util headers internal #46721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47915f9
GH-46459: [C++] Make some arrow/util headers internal
pitrou Jun 5, 2025
f207c87
Remove tdigest.h
kou Jun 6, 2025
42a32c0
Remove trie.h
kou Jun 6, 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
1 change: 1 addition & 0 deletions cpp/src/arrow/acero/partition_util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <cstdint>
#include <functional>
#include <random>

#include "arrow/acero/util.h"
#include "arrow/buffer.h"
#include "arrow/util/pcg_random.h"
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/array/data.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include "arrow/type_traits.h"
#include "arrow/util/binary_view_util.h"
#include "arrow/util/bitmap_ops.h"
#include "arrow/util/dict_util.h"
#include "arrow/util/dict_util_internal.h"
#include "arrow/util/logging_internal.h"
#include "arrow/util/macros.h"
#include "arrow/util/range.h"
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/array/util.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
#include "arrow/util/decimal.h"
#include "arrow/util/endian.h"
#include "arrow/util/logging_internal.h"
#include "arrow/util/sort.h"
#include "arrow/util/sort_internal.h"
#include "arrow/util/span.h"
#include "arrow/visit_data_inline.h"
#include "arrow/visit_type_inline.h"
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/array/validate.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include "arrow/util/int_util_overflow.h"
#include "arrow/util/logging_internal.h"
#include "arrow/util/ree_util.h"
#include "arrow/util/sort.h"
#include "arrow/util/sort_internal.h"
#include "arrow/util/string.h"
#include "arrow/util/unreachable.h"
#include "arrow/util/utf8.h"
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/compare.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
#include "arrow/util/key_value_metadata.h"
#include "arrow/util/logging_internal.h"
#include "arrow/util/macros.h"
#include "arrow/util/memory.h"
#include "arrow/util/memory_internal.h"
#include "arrow/util/ree_util.h"
#include "arrow/visit_scalar_inline.h"
#include "arrow/visit_type_inline.h"
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/compute/kernels/aggregate_tdigest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "arrow/compute/kernels/aggregate_internal.h"
#include "arrow/compute/kernels/common_internal.h"
#include "arrow/util/bit_run_reader.h"
#include "arrow/util/tdigest.h"
#include "arrow/util/tdigest_internal.h"

namespace arrow {
namespace compute {
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/compute/kernels/hash_aggregate_numeric.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#include "arrow/util/checked_cast.h"
#include "arrow/util/int128_internal.h"
#include "arrow/util/span.h"
#include "arrow/util/tdigest.h"
#include "arrow/util/tdigest_internal.h"
#include "arrow/visit_type_inline.h"

namespace arrow::compute::internal {
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/csv/converter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#include "arrow/type_traits.h"
#include "arrow/util/checked_cast.h"
#include "arrow/util/decimal.h"
#include "arrow/util/trie.h"
#include "arrow/util/trie_internal.h"
#include "arrow/util/utf8_internal.h"
#include "arrow/util/value_parsing.h" // IWYU pragma: keep

Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/dataset/dataset_writer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include "arrow/table.h"
#include "arrow/util/future.h"
#include "arrow/util/logging_internal.h"
#include "arrow/util/map.h"
#include "arrow/util/map_internal.h"
#include "arrow/util/string.h"
#include "arrow/util/tracing_internal.h"

Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/dataset/file_base.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
#include "arrow/util/iterator.h"
#include "arrow/util/logging_internal.h"
#include "arrow/util/macros.h"
#include "arrow/util/map.h"
#include "arrow/util/map_internal.h"
#include "arrow/util/string.h"
#include "arrow/util/task_group.h"
#include "arrow/util/tracing_internal.h"
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/datum.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#include "arrow/table.h"
#include "arrow/util/byte_size.h"
#include "arrow/util/logging_internal.h"
#include "arrow/util/memory.h"
#include "arrow/util/memory_internal.h"

namespace arrow {

Expand Down
4 changes: 2 additions & 2 deletions cpp/src/arrow/extension/fixed_shape_tensor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
#include "arrow/tensor.h"
#include "arrow/util/int_util_overflow.h"
#include "arrow/util/logging_internal.h"
#include "arrow/util/print.h"
#include "arrow/util/sort.h"
#include "arrow/util/print_internal.h"
#include "arrow/util/sort_internal.h"
#include "arrow/util/string.h"

#include <rapidjson/document.h>
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/extension/fixed_shape_tensor_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include "arrow/tensor.h"
#include "arrow/testing/gtest_util.h"
#include "arrow/util/key_value_metadata.h"
#include "arrow/util/sort.h"
#include "arrow/util/sort_internal.h"

namespace arrow {

Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/extension/tensor_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <vector>

#include "arrow/status.h"
#include "arrow/util/print.h"
#include "arrow/util/print_internal.h"

namespace arrow::internal {

Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/filesystem/s3_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#include "arrow/status.h"
#include "arrow/util/base64.h"
#include "arrow/util/logging.h"
#include "arrow/util/print.h"
#include "arrow/util/print_internal.h"
#include "arrow/util/string.h"

#ifndef ARROW_AWS_SDK_VERSION_CHECK
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/filesystem/test_util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include "arrow/filesystem/filesystem.h"
#include "arrow/filesystem/mockfs.h"
#include "arrow/testing/visibility.h"
#include "arrow/util/counting_semaphore.h"
#include "arrow/util/counting_semaphore_internal.h"

namespace arrow {
namespace fs {
Expand Down
4 changes: 2 additions & 2 deletions cpp/src/arrow/flight/flight_benchmark.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
#include "arrow/testing/gtest_util.h"
#include "arrow/util/compression.h"
#include "arrow/util/config.h"
#include "arrow/util/stopwatch.h"
#include "arrow/util/tdigest.h"
#include "arrow/util/stopwatch_internal.h"
#include "arrow/util/tdigest_internal.h"
#include "arrow/util/thread_pool.h"

#include "arrow/flight/api.h"
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/io/memory.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#include "arrow/util/io_util.h"
#include "arrow/util/logging_internal.h"
#include "arrow/util/macros.h"
#include "arrow/util/memory.h"
#include "arrow/util/memory_internal.h"

namespace arrow {
namespace io {
Expand Down
4 changes: 2 additions & 2 deletions cpp/src/arrow/json/parser.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@
#include "arrow/array/builder_binary.h"
#include "arrow/buffer_builder.h"
#include "arrow/type.h"
#include "arrow/util/bitset_stack.h"
#include "arrow/util/bitset_stack_internal.h"
#include "arrow/util/checked_cast.h"
#include "arrow/util/logging_internal.h"
#include "arrow/util/trie.h"
#include "arrow/util/trie_internal.h"
#include "arrow/visit_type_inline.h"

namespace arrow {
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/sparse_tensor_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include "arrow/testing/util.h"
#include "arrow/type.h"
#include "arrow/util/logging_internal.h"
#include "arrow/util/sort.h"
#include "arrow/util/sort_internal.h"

namespace arrow {

Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/tensor/csf_converter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include "arrow/status.h"
#include "arrow/type.h"
#include "arrow/util/checked_cast.h"
#include "arrow/util/sort.h"
#include "arrow/util/sort_internal.h"
#include "arrow/visit_type_inline.h"

namespace arrow {
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/util/bit_stream_utils_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <cstring>

#include "arrow/util/bit_util.h"
#include "arrow/util/bpacking.h"
#include "arrow/util/bpacking_internal.h"
#include "arrow/util/logging.h"
#include "arrow/util/macros.h"
#include "arrow/util/ubsan.h"
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/util/bit_util_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
#include "arrow/util/bitmap_reader.h"
#include "arrow/util/bitmap_visit.h"
#include "arrow/util/bitmap_writer.h"
#include "arrow/util/bitset_stack.h"
#include "arrow/util/bitset_stack_internal.h"
#include "arrow/util/endian.h"
#include "arrow/util/ubsan.h"

Expand Down
0 cpp/src/arrow/util/bitset_stack.h → cpp/src/arrow/util/bitset_stack_internal.h
View file
Open in desktop
File renamed without changes.
14 changes: 7 additions & 7 deletions cpp/src/arrow/util/bpacking.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,22 @@
// specific language governing permissions and limitations
// under the License.

#include "arrow/util/bpacking.h"
#include "arrow/util/bpacking_internal.h"

#include "arrow/util/bpacking64_default.h"
#include "arrow/util/bpacking_default.h"
#include "arrow/util/bpacking64_default_internal.h"
#include "arrow/util/bpacking_default_internal.h"
#include "arrow/util/cpu_info.h"
#include "arrow/util/dispatch.h"
#include "arrow/util/dispatch_internal.h"
#include "arrow/util/logging_internal.h"

#if defined(ARROW_HAVE_RUNTIME_AVX2)
# include "arrow/util/bpacking_avx2.h"
# include "arrow/util/bpacking_avx2_internal.h"
#endif
#if defined(ARROW_HAVE_RUNTIME_AVX512)
# include "arrow/util/bpacking_avx512.h"
# include "arrow/util/bpacking_avx512_internal.h"
#endif
#if defined(ARROW_HAVE_NEON)
# include "arrow/util/bpacking_neon.h"
# include "arrow/util/bpacking_neon_internal.h"
#endif

namespace arrow {
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/util/bpacking64_codegen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
# https://github.com/lemire/FrameOfReference/blob/146948b6058a976bc7767262ad3a2ce201486b93/scripts/turbopacking64.py

# Usage:
# python bpacking64_codegen.py > bpacking64_default.h
# python bpacking64_codegen.py > bpacking64_default_internal.h

def howmany(bit):
""" how many values are we going to pack? """
Expand Down
0 cpp/src/arrow/util/bpacking64_default.h → .../arrow/util/bpacking64_default_internal.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion cpp/src/arrow/util/bpacking_avx2.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

#include "arrow/util/bpacking_avx2.h"
#include "arrow/util/bpacking_avx2_internal.h"
#include "arrow/util/bpacking_simd256_generated_internal.h"
#include "arrow/util/bpacking_simd_internal.h"

Expand Down
0 cpp/src/arrow/util/bpacking_avx2.h → cpp/src/arrow/util/bpacking_avx2_internal.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion cpp/src/arrow/util/bpacking_avx512.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

#include "arrow/util/bpacking_avx512.h"
#include "arrow/util/bpacking_avx512_internal.h"
#include "arrow/util/bpacking_simd512_generated_internal.h"
#include "arrow/util/bpacking_simd_internal.h"

Expand Down
0 cpp/src/arrow/util/bpacking_avx512.h → ...src/arrow/util/bpacking_avx512_internal.h
View file
Open in desktop
File renamed without changes.
0 cpp/src/arrow/util/bpacking_default.h → ...rc/arrow/util/bpacking_default_internal.h
View file
Open in desktop
File renamed without changes.
0 cpp/src/arrow/util/bpacking.h → cpp/src/arrow/util/bpacking_internal.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion cpp/src/arrow/util/bpacking_neon.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

#include "arrow/util/bpacking_neon.h"
#include "arrow/util/bpacking_neon_internal.h"
#include "arrow/util/bpacking_simd128_generated_internal.h"
#include "arrow/util/bpacking_simd_internal.h"

Expand Down
0 cpp/src/arrow/util/bpacking_neon.h → cpp/src/arrow/util/bpacking_neon_internal.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion cpp/src/arrow/util/bpacking_simd128_generated_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

#include <xsimd/xsimd.hpp>

#include "arrow/util/dispatch.h"
#include "arrow/util/dispatch_internal.h"
#include "arrow/util/ubsan.h"

namespace arrow {
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/util/bpacking_simd256_generated_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

#include <xsimd/xsimd.hpp>

#include "arrow/util/dispatch.h"
#include "arrow/util/dispatch_internal.h"
#include "arrow/util/ubsan.h"

namespace arrow {
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/util/bpacking_simd512_generated_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

#include <xsimd/xsimd.hpp>

#include "arrow/util/dispatch.h"
#include "arrow/util/dispatch_internal.h"
#include "arrow/util/ubsan.h"

namespace arrow {
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/util/bpacking_simd_codegen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ def main(simd_width):

#include <xsimd/xsimd.hpp>

#include "arrow/util/dispatch.h"
#include "arrow/util/dispatch_internal.h"
#include "arrow/util/ubsan.h"

namespace arrow {{
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/util/bpacking_simd_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

#include "arrow/util/dispatch.h"
#include "arrow/util/dispatch_internal.h"
#include "arrow/util/logging.h"

namespace arrow {
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/util/counting_semaphore.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

#include "arrow/util/counting_semaphore.h"
#include "arrow/util/counting_semaphore_internal.h"

#include <chrono>
#include <condition_variable>
Expand Down
0 cpp/src/arrow/util/counting_semaphore.h → .../arrow/util/counting_semaphore_internal.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion cpp/src/arrow/util/counting_semaphore_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

#include "arrow/util/counting_semaphore.h"
#include "arrow/util/counting_semaphore_internal.h"

#include <atomic>
#include <thread>
Expand Down
1 change: 1 addition & 0 deletions cpp/src/arrow/util/delimiting.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
// under the License.

#include "arrow/util/delimiting.h"

#include "arrow/buffer.h"
#include "arrow/util/logging_internal.h"

Expand Down
3 changes: 2 additions & 1 deletion cpp/src/arrow/util/dict_util.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
// specific language governing permissions and limitations
// under the License.

#include "arrow/util/dict_util.h"
#include "arrow/util/dict_util_internal.h"

#include "arrow/array/array_dict.h"
#include "arrow/util/bit_util.h"
#include "arrow/util/checked_cast.h"
Expand Down
0 cpp/src/arrow/util/dict_util.h → cpp/src/arrow/util/dict_util_internal.h
View file
Open in desktop
File renamed without changes.
0 cpp/src/arrow/util/dispatch.h → cpp/src/arrow/util/dispatch_internal.h
View file
Open in desktop
File renamed without changes.
0 cpp/src/arrow/util/double_conversion.h → ...c/arrow/util/double_conversion_internal.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion cpp/src/arrow/util/formatting.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#include "arrow/util/formatting.h"
#include "arrow/util/config.h"
#include "arrow/util/double_conversion.h"
#include "arrow/util/double_conversion_internal.h"
#include "arrow/util/float16.h"
#include "arrow/util/logging_internal.h"

Expand Down
3 changes: 1 addition & 2 deletions cpp/src/arrow/util/formatting.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,8 @@
#include <utility>

#include "arrow/status.h"
#include "arrow/type.h"
#include "arrow/type_fwd.h"
#include "arrow/type_traits.h"
#include "arrow/util/double_conversion.h"
#include "arrow/util/macros.h"
#include "arrow/util/string.h"
#include "arrow/util/time.h"
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/util/key_value_metadata.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include "arrow/status.h"
#include "arrow/util/key_value_metadata.h"
#include "arrow/util/logging_internal.h"
#include "arrow/util/sort.h"
#include "arrow/util/sort_internal.h"

using std::size_t;

Expand Down
0 cpp/src/arrow/util/map.h → cpp/src/arrow/util/map_internal.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion cpp/src/arrow/util/memory.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <vector>

#include "arrow/util/logging.h"
#include "arrow/util/memory.h"
#include "arrow/util/memory_internal.h"
#include "arrow/util/thread_pool.h"

namespace arrow {
Expand Down
0 cpp/src/arrow/util/memory.h → cpp/src/arrow/util/memory_internal.h
View file
Open in desktop
File renamed without changes.
Loading
Loading