Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion cpp/src/parquet/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions cpp/src/parquet/level_comparison.cc
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@

#include <array>

#include "parquet/level_comparison.h"
#include "parquet/level_comparison_internal.h"
#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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/parquet/level_comparison_simd_internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

#include <cstdint>

#include "parquet/level_comparison.h"
#include "parquet/level_comparison_internal.h"

namespace parquet::internal {

Expand Down
2 changes: 1 addition & 1 deletion cpp/src/parquet/level_comparison_simd_kernel_internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <limits>

#include "arrow/util/endian.h"
#include "parquet/level_comparison.h"
#include "parquet/level_comparison_internal.h"

namespace parquet::internal {

Expand Down
2 changes: 1 addition & 1 deletion cpp/src/parquet/level_conversion.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/parquet/level_conversion_benchmark.cc
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <vector>

#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;
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/parquet/level_conversion_bmi2.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/parquet/level_conversion_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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 <gmock/gmock.h>
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/parquet/level_decoder_internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
3 changes: 0 additions & 3 deletions cpp/src/parquet/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -147,10 +147,7 @@ install_headers(
'file_writer.h',
'hasher.h',
'index_location.h',
'level_comparison.h',
'level_comparison_inc.h',
'level_conversion.h',
'level_conversion_inc.h',
'metadata.h',
'page_index.h',
'platform.h',
Expand Down