From b95f08a8f168a5ff873fb338bf45e957d2d916a1 Mon Sep 17 00:00:00 2001 From: 09Catho Date: Mon, 9 Nov 2026 20:57:47 +0530 Subject: [PATCH 1/2] GH-55455: [C++] Make level comparison header internal --- cpp/src/parquet/level_comparison.cc | 2 +- cpp/src/parquet/level_comparison_inc.h | 2 +- .../parquet/{level_comparison.h => level_comparison_internal.h} | 0 cpp/src/parquet/level_comparison_simd_internal.h | 2 +- cpp/src/parquet/level_comparison_simd_kernel_internal.h | 2 +- cpp/src/parquet/level_conversion_benchmark.cc | 2 +- cpp/src/parquet/level_conversion_inc.h | 2 +- cpp/src/parquet/level_conversion_test.cc | 2 +- cpp/src/parquet/level_decoder_internal.h | 2 +- cpp/src/parquet/meson.build | 1 - 10 files changed, 8 insertions(+), 9 deletions(-) rename cpp/src/parquet/{level_comparison.h => level_comparison_internal.h} (100%) diff --git a/cpp/src/parquet/level_comparison.cc b/cpp/src/parquet/level_comparison.cc index c2258ccefcd8..dd8d93721a40 100644 --- a/cpp/src/parquet/level_comparison.cc +++ b/cpp/src/parquet/level_comparison.cc @@ -17,7 +17,7 @@ #include -#include "parquet/level_comparison.h" +#include "parquet/level_comparison_internal.h" #include "parquet/level_comparison_simd_internal.h" #define PARQUET_IMPL_NAMESPACE standard diff --git a/cpp/src/parquet/level_comparison_inc.h b/cpp/src/parquet/level_comparison_inc.h index 04f628d53311..de3c3bac1dc2 100644 --- a/cpp/src/parquet/level_comparison_inc.h +++ b/cpp/src/parquet/level_comparison_inc.h @@ -18,7 +18,7 @@ #include "arrow/util/bit_util.h" #include "arrow/util/endian.h" -#include "parquet/level_comparison.h" +#include "parquet/level_comparison_internal.h" // Used to make sure ODR rule isn't violated. #ifndef PARQUET_IMPL_NAMESPACE diff --git a/cpp/src/parquet/level_comparison.h b/cpp/src/parquet/level_comparison_internal.h similarity index 100% rename from cpp/src/parquet/level_comparison.h rename to cpp/src/parquet/level_comparison_internal.h diff --git a/cpp/src/parquet/level_comparison_simd_internal.h b/cpp/src/parquet/level_comparison_simd_internal.h index 205b3f83003c..224d08669cd0 100644 --- a/cpp/src/parquet/level_comparison_simd_internal.h +++ b/cpp/src/parquet/level_comparison_simd_internal.h @@ -19,7 +19,7 @@ #include -#include "parquet/level_comparison.h" +#include "parquet/level_comparison_internal.h" namespace parquet::internal { diff --git a/cpp/src/parquet/level_comparison_simd_kernel_internal.h b/cpp/src/parquet/level_comparison_simd_kernel_internal.h index eeeffd81188d..3d8ab1953dbc 100644 --- a/cpp/src/parquet/level_comparison_simd_kernel_internal.h +++ b/cpp/src/parquet/level_comparison_simd_kernel_internal.h @@ -24,7 +24,7 @@ #include #include "arrow/util/endian.h" -#include "parquet/level_comparison.h" +#include "parquet/level_comparison_internal.h" namespace parquet::internal { diff --git a/cpp/src/parquet/level_conversion_benchmark.cc b/cpp/src/parquet/level_conversion_benchmark.cc index 0702b39ec20d..08aff948ab7d 100644 --- a/cpp/src/parquet/level_conversion_benchmark.cc +++ b/cpp/src/parquet/level_conversion_benchmark.cc @@ -19,7 +19,7 @@ #include #include "benchmark/benchmark.h" -#include "parquet/level_comparison.h" +#include "parquet/level_comparison_internal.h" #include "parquet/level_conversion.h" constexpr int64_t kLevelCount = 2048; diff --git a/cpp/src/parquet/level_conversion_inc.h b/cpp/src/parquet/level_conversion_inc.h index 33b4fae08494..274f3560f7e5 100644 --- a/cpp/src/parquet/level_conversion_inc.h +++ b/cpp/src/parquet/level_conversion_inc.h @@ -29,7 +29,7 @@ #include "arrow/util/logging.h" #include "arrow/util/simd.h" #include "parquet/exception.h" -#include "parquet/level_comparison.h" +#include "parquet/level_comparison_internal.h" #ifndef PARQUET_IMPL_NAMESPACE # error "PARQUET_IMPL_NAMESPACE must be defined" diff --git a/cpp/src/parquet/level_conversion_test.cc b/cpp/src/parquet/level_conversion_test.cc index 4513573ef22f..15f5aab77cad 100644 --- a/cpp/src/parquet/level_conversion_test.cc +++ b/cpp/src/parquet/level_conversion_test.cc @@ -17,7 +17,7 @@ #include "parquet/level_conversion.h" -#include "parquet/level_comparison.h" +#include "parquet/level_comparison_internal.h" #include "parquet/test_util.h" #include diff --git a/cpp/src/parquet/level_decoder_internal.h b/cpp/src/parquet/level_decoder_internal.h index e956abc93eb1..0fe856bc8502 100644 --- a/cpp/src/parquet/level_decoder_internal.h +++ b/cpp/src/parquet/level_decoder_internal.h @@ -29,7 +29,7 @@ #include "arrow/util/rle_encoding_internal.h" #include "arrow/util/ubsan.h" #include "parquet/exception.h" -#include "parquet/level_comparison.h" +#include "parquet/level_comparison_internal.h" #include "parquet/types.h" namespace parquet { diff --git a/cpp/src/parquet/meson.build b/cpp/src/parquet/meson.build index 421ed06731c2..05066ac65b40 100644 --- a/cpp/src/parquet/meson.build +++ b/cpp/src/parquet/meson.build @@ -147,7 +147,6 @@ install_headers( 'file_writer.h', 'hasher.h', 'index_location.h', - 'level_comparison.h', 'level_comparison_inc.h', 'level_conversion.h', 'level_conversion_inc.h', From 623bae93a531ef84d7e922758022414f339eb9e1 Mon Sep 17 00:00:00 2001 From: 09Catho Date: Wed, 18 Nov 2026 16:18:36 +0530 Subject: [PATCH 2/2] Make level comparison/conversion inc headers internal --- cpp/src/parquet/CMakeLists.txt | 2 +- cpp/src/parquet/level_comparison.cc | 2 +- .../{level_comparison_inc.h => level_comparison_inc_internal.h} | 0 cpp/src/parquet/level_conversion.cc | 2 +- cpp/src/parquet/level_conversion_bmi2.cc | 2 +- .../{level_conversion_inc.h => level_conversion_inc_internal.h} | 0 cpp/src/parquet/meson.build | 2 -- 7 files changed, 4 insertions(+), 6 deletions(-) rename cpp/src/parquet/{level_comparison_inc.h => level_comparison_inc_internal.h} (100%) rename cpp/src/parquet/{level_conversion_inc.h => level_conversion_inc_internal.h} (100%) diff --git a/cpp/src/parquet/CMakeLists.txt b/cpp/src/parquet/CMakeLists.txt index 806eb544e826..0207c9288875 100644 --- a/cpp/src/parquet/CMakeLists.txt +++ b/cpp/src/parquet/CMakeLists.txt @@ -208,7 +208,7 @@ if(ARROW_HAVE_RUNTIME_AVX2) # will force inlining as much as possible. # See also: ARROW-15664 and ARROW-15678 if(ARROW_HAVE_RUNTIME_BMI2) - # Need to pass ARROW_HAVE_BMI2 for level_conversion_inc.h to compile + # Need to pass ARROW_HAVE_BMI2 for level_conversion_inc_internal.h to compile # the BMI2 path. set(BMI2_FLAGS ${AVX2_FLAGS} ${ARROW_BMI2_FLAG} -DARROW_HAVE_BMI2) set_source_files_properties(level_conversion_bmi2.cc PROPERTIES COMPILE_OPTIONS diff --git a/cpp/src/parquet/level_comparison.cc b/cpp/src/parquet/level_comparison.cc index dd8d93721a40..4820dd8f9a80 100644 --- a/cpp/src/parquet/level_comparison.cc +++ b/cpp/src/parquet/level_comparison.cc @@ -21,7 +21,7 @@ #include "parquet/level_comparison_simd_internal.h" #define PARQUET_IMPL_NAMESPACE standard -#include "parquet/level_comparison_inc.h" +#include "parquet/level_comparison_inc_internal.h" #undef PARQUET_IMPL_NAMESPACE #include "arrow/util/dispatch_internal.h" diff --git a/cpp/src/parquet/level_comparison_inc.h b/cpp/src/parquet/level_comparison_inc_internal.h similarity index 100% rename from cpp/src/parquet/level_comparison_inc.h rename to cpp/src/parquet/level_comparison_inc_internal.h diff --git a/cpp/src/parquet/level_conversion.cc b/cpp/src/parquet/level_conversion.cc index 5f0a2dd57951..5b2bda24d83a 100644 --- a/cpp/src/parquet/level_conversion.cc +++ b/cpp/src/parquet/level_conversion.cc @@ -29,7 +29,7 @@ #endif #define PARQUET_IMPL_NAMESPACE standard -#include "parquet/level_conversion_inc.h" +#include "parquet/level_conversion_inc_internal.h" #undef PARQUET_IMPL_NAMESPACE namespace parquet::internal { diff --git a/cpp/src/parquet/level_conversion_bmi2.cc b/cpp/src/parquet/level_conversion_bmi2.cc index faa88e81c64c..64ebe92619c9 100644 --- a/cpp/src/parquet/level_conversion_bmi2.cc +++ b/cpp/src/parquet/level_conversion_bmi2.cc @@ -18,7 +18,7 @@ #include "parquet/level_conversion_bmi2_internal.h" #define PARQUET_IMPL_NAMESPACE bmi2 -#include "parquet/level_conversion_inc.h" +#include "parquet/level_conversion_inc_internal.h" #undef PARQUET_IMPL_NAMESPACE namespace parquet::internal { diff --git a/cpp/src/parquet/level_conversion_inc.h b/cpp/src/parquet/level_conversion_inc_internal.h similarity index 100% rename from cpp/src/parquet/level_conversion_inc.h rename to cpp/src/parquet/level_conversion_inc_internal.h diff --git a/cpp/src/parquet/meson.build b/cpp/src/parquet/meson.build index 05066ac65b40..df2d1db7ab63 100644 --- a/cpp/src/parquet/meson.build +++ b/cpp/src/parquet/meson.build @@ -147,9 +147,7 @@ install_headers( 'file_writer.h', 'hasher.h', 'index_location.h', - 'level_comparison_inc.h', 'level_conversion.h', - 'level_conversion_inc.h', 'metadata.h', 'page_index.h', 'platform.h',