diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index b763cfbbbca..59171ddcaae 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -41,8 +41,8 @@ jobs: lint: name: Lint C++, Python, R, Docker, RAT - # Use Ubuntu 22.04 to ensure working pre-commit on Ubuntu 22.04. - runs-on: ubuntu-22.04 + # Use Ubuntu 24.04 to ensure working pre-commit on Ubuntu 24.04. + runs-on: ubuntu-24.04 if: ${{ !contains(github.event.pull_request.title, 'WIP') }} timeout-minutes: 15 steps: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 186277edf40..556c9f70d8c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -50,7 +50,7 @@ repos: ) types: [] - repo: https://github.com/pre-commit/mirrors-clang-format - rev: v14.0.6 + rev: v18.1.8 hooks: - id: clang-format name: C++ Format @@ -93,7 +93,7 @@ repos: ?^cpp/thirdparty/| ) - repo: https://github.com/pre-commit/mirrors-clang-format - rev: v14.0.6 + rev: v18.1.8 hooks: - id: clang-format alias: c-glib @@ -101,7 +101,7 @@ repos: files: >- ^c_glib/ - repo: https://github.com/pre-commit/mirrors-clang-format - rev: v14.0.6 + rev: v18.1.8 hooks: - id: clang-format name: MATLAB (C++) Format @@ -156,7 +156,7 @@ repos: files: >- ^python/ - repo: https://github.com/pre-commit/mirrors-clang-format - rev: v14.0.6 + rev: v18.1.8 hooks: - id: clang-format alias: python @@ -213,7 +213,7 @@ repos: files: >- ^r/.*\.R$ - repo: https://github.com/pre-commit/mirrors-clang-format - rev: v14.0.6 + rev: v18.1.8 hooks: - id: clang-format alias: r diff --git a/cpp/src/arrow/acero/exec_plan.cc b/cpp/src/arrow/acero/exec_plan.cc index ff5e5d8bdd9..2aa5532a0cd 100644 --- a/cpp/src/arrow/acero/exec_plan.cc +++ b/cpp/src/arrow/acero/exec_plan.cc @@ -137,7 +137,7 @@ struct ExecPlanImpl : public ExecPlan { opentelemetry::nostd::shared_ptr span = ::arrow::internal::tracing::UnwrapSpan(span_.details.get()); std::for_each(std::begin(pairs), std::end(pairs), - [span](std::pair const& pair) { + [span](const std::pair& pair) { span->SetAttribute(pair.first, pair.second); }); } diff --git a/cpp/src/arrow/compute/kernels/aggregate_test.cc b/cpp/src/arrow/compute/kernels/aggregate_test.cc index cdc62f946a9..c5ba012d767 100644 --- a/cpp/src/arrow/compute/kernels/aggregate_test.cc +++ b/cpp/src/arrow/compute/kernels/aggregate_test.cc @@ -3889,8 +3889,7 @@ class TestPrimitiveQuantileKernel : public ::testing::Test { #define INTYPE(x) Datum(static_cast(x)) #define DOUBLE(x) Datum(static_cast(x)) // output type per interpolation: linear, lower, higher, nearest, midpoint -#define O(a, b, c, d, e) \ - { DOUBLE(a), INTYPE(b), INTYPE(c), INTYPE(d), DOUBLE(e) } +#define O(a, b, c, d, e) {DOUBLE(a), INTYPE(b), INTYPE(c), INTYPE(d), DOUBLE(e)} template class TestIntegerQuantileKernel : public TestPrimitiveQuantileKernel {}; diff --git a/cpp/src/arrow/compute/kernels/hash_aggregate.cc b/cpp/src/arrow/compute/kernels/hash_aggregate.cc index 2ab5e574e22..ed50025ef5f 100644 --- a/cpp/src/arrow/compute/kernels/hash_aggregate.cc +++ b/cpp/src/arrow/compute/kernels/hash_aggregate.cc @@ -282,7 +282,7 @@ concept CFloatingPointConcept = std::floating_point || std::same_as concept CDecimalConcept = std::same_as || std::same_as || - std::same_as || std::same_as; + std::same_as || std::same_as; template struct AntiExtrema { diff --git a/cpp/src/arrow/compute/kernels/temporal_internal.h b/cpp/src/arrow/compute/kernels/temporal_internal.h index 3674c233dc9..139cc134bde 100644 --- a/cpp/src/arrow/compute/kernels/temporal_internal.h +++ b/cpp/src/arrow/compute/kernels/temporal_internal.h @@ -45,8 +45,8 @@ using std::chrono::duration_cast; using ArrowTimeZone = std::variant; template -auto ApplyTimeZone(const ArrowTimeZone& tz, sys_time st, Func&& func) - -> decltype(func(zoned_time{})) { +auto ApplyTimeZone(const ArrowTimeZone& tz, sys_time st, + Func&& func) -> decltype(func(zoned_time{})) { return std::visit( [&](auto&& zone) { if constexpr (std::is_pointer_v >) { @@ -60,8 +60,8 @@ auto ApplyTimeZone(const ArrowTimeZone& tz, sys_time st, Func&& func) template auto ApplyTimeZone(const ArrowTimeZone& tz, local_time lt, - std::optional c, Func&& func) - -> decltype(func(zoned_time{})) { + std::optional c, + Func&& func) -> decltype(func(zoned_time{})) { return std::visit( [&](auto&& zone) { if constexpr (std::is_pointer_v >) { diff --git a/cpp/src/arrow/compute/kernels/vector_selection_filter_internal.cc b/cpp/src/arrow/compute/kernels/vector_selection_filter_internal.cc index 1c2eacb9a76..cca8c7ae745 100644 --- a/cpp/src/arrow/compute/kernels/vector_selection_filter_internal.cc +++ b/cpp/src/arrow/compute/kernels/vector_selection_filter_internal.cc @@ -368,7 +368,7 @@ class PrimitiveFilterImpl { } } } // !filter_block.AllSet() - } // while(in_position < values_length_) + } // while(in_position < values_length_) } // Write the next out_position given the selected in_position for the input diff --git a/cpp/src/arrow/compute/kernels/vector_sort_test.cc b/cpp/src/arrow/compute/kernels/vector_sort_test.cc index 0569f1f2abb..90f8eb7a56b 100644 --- a/cpp/src/arrow/compute/kernels/vector_sort_test.cc +++ b/cpp/src/arrow/compute/kernels/vector_sort_test.cc @@ -76,8 +76,8 @@ std::ostream& operator<<(std::ostream& os, NullPlacement null_placement) { // Tests for NthToIndices template -auto GetLogicalValue(const ArrayType& array, uint64_t index) - -> decltype(array.GetView(index)) { +auto GetLogicalValue(const ArrayType& array, + uint64_t index) -> decltype(array.GetView(index)) { return array.GetView(index); } diff --git a/cpp/src/arrow/dataset/dataset_writer_test.cc b/cpp/src/arrow/dataset/dataset_writer_test.cc index 2f34c21aec9..45a36deccea 100644 --- a/cpp/src/arrow/dataset/dataset_writer_test.cc +++ b/cpp/src/arrow/dataset/dataset_writer_test.cc @@ -613,8 +613,8 @@ TEST_F(DatasetWriterTestFixture, ErrOnExistingData) { fs::File("testdir/chunk-5.arrow"), fs::File("testdir/blah.txt")})); filesystem_ = std::dynamic_pointer_cast(fs); write_options_.filesystem = filesystem_; - ASSERT_RAISES(Invalid, DatasetWriter::Make( - write_options_, scheduler_, [] {}, [] {}, [] {})); + ASSERT_RAISES(Invalid, + DatasetWriter::Make(write_options_, scheduler_, [] {}, [] {}, [] {})); AssertEmptyFiles( {"testdir/chunk-0.arrow", "testdir/chunk-5.arrow", "testdir/blah.txt"}); @@ -627,8 +627,8 @@ TEST_F(DatasetWriterTestFixture, ErrOnExistingData) { filesystem_ = std::dynamic_pointer_cast(fs2); write_options_.filesystem = filesystem_; write_options_.base_dir = "testdir"; - ASSERT_RAISES(Invalid, DatasetWriter::Make( - write_options_, scheduler_, [] {}, [] {}, [] {})); + ASSERT_RAISES(Invalid, + DatasetWriter::Make(write_options_, scheduler_, [] {}, [] {}, [] {})); AssertEmptyFiles({"testdir/part-0.arrow"}); } diff --git a/cpp/src/arrow/dataset/file_test.cc b/cpp/src/arrow/dataset/file_test.cc index 8904531200d..2e2561203be 100644 --- a/cpp/src/arrow/dataset/file_test.cc +++ b/cpp/src/arrow/dataset/file_test.cc @@ -594,11 +594,12 @@ class FileSystemWriteTest : public testing::TestWithParam }; TEST_P(FileSystemWriteTest, Write) { - auto plan_factory = [](const FileSystemDatasetWriteOptions& write_options, - std::function>()>* - sink_gen) { - return std::vector{{"write", WriteNodeOptions{write_options}}}; - }; + auto plan_factory = + [](const FileSystemDatasetWriteOptions& write_options, + std::function>()>* sink_gen) { + return std::vector{ + {"write", WriteNodeOptions{write_options}}}; + }; TestDatasetWriteRoundTrip(plan_factory, /*has_output=*/false); } diff --git a/cpp/src/arrow/device.cc b/cpp/src/arrow/device.cc index 05bd6790404..fd4503c5f22 100644 --- a/cpp/src/arrow/device.cc +++ b/cpp/src/arrow/device.cc @@ -42,8 +42,7 @@ Result> MemoryManager::WrapDeviceSyncEvent( return nullptr; } -Device::~Device() {} - +Device::~Device(){} #define COPY_BUFFER_SUCCESS(maybe_buffer) \ ((maybe_buffer).ok() && *(maybe_buffer) != nullptr) diff --git a/cpp/src/arrow/engine/substrait/serde_test.cc b/cpp/src/arrow/engine/substrait/serde_test.cc index f92aee8eaad..138d03b2479 100644 --- a/cpp/src/arrow/engine/substrait/serde_test.cc +++ b/cpp/src/arrow/engine/substrait/serde_test.cc @@ -1229,9 +1229,9 @@ TEST(Substrait, ExtensionSetFromPlan) { {std::shared_ptr(), MakeExtensionIdRegistry()}) { ExtensionIdRegistry* ext_id_reg = sp_ext_id_reg.get(); ExtensionSet ext_set(ext_id_reg); - ASSERT_OK_AND_ASSIGN(auto sink_decls, - DeserializePlans( - *buf, [] { return kNullConsumer; }, ext_id_reg, &ext_set)); + ASSERT_OK_AND_ASSIGN( + auto sink_decls, + DeserializePlans(*buf, [] { return kNullConsumer; }, ext_id_reg, &ext_set)); EXPECT_OK_AND_ASSIGN(auto decoded_null_type, ext_set.DecodeType(42)); EXPECT_EQ(decoded_null_type.id.uri, kArrowExtTypesUri); @@ -1665,9 +1665,9 @@ TEST(Substrait, JoinPlanBasic) { {std::shared_ptr(), MakeExtensionIdRegistry()}) { ExtensionIdRegistry* ext_id_reg = sp_ext_id_reg.get(); ExtensionSet ext_set(ext_id_reg); - ASSERT_OK_AND_ASSIGN(auto sink_decls, - DeserializePlans( - *buf, [] { return kNullConsumer; }, ext_id_reg, &ext_set)); + ASSERT_OK_AND_ASSIGN( + auto sink_decls, + DeserializePlans(*buf, [] { return kNullConsumer; }, ext_id_reg, &ext_set)); auto join_decl = sink_decls[0].inputs[0]; diff --git a/cpp/src/arrow/flight/serialization_internal.cc b/cpp/src/arrow/flight/serialization_internal.cc index 34fcef1f837..604375311d3 100644 --- a/cpp/src/arrow/flight/serialization_internal.cc +++ b/cpp/src/arrow/flight/serialization_internal.cc @@ -36,7 +36,7 @@ struct overloaded : Ts... { using Ts::operator()...; }; template // CTAD will not be needed for >=C++20 -overloaded(Ts...)->overloaded; +overloaded(Ts...) -> overloaded; namespace arrow { namespace flight { diff --git a/cpp/src/arrow/io/memory_test.cc b/cpp/src/arrow/io/memory_test.cc index eabee87146d..1b2c7bdbf39 100644 --- a/cpp/src/arrow/io/memory_test.cc +++ b/cpp/src/arrow/io/memory_test.cc @@ -580,8 +580,7 @@ class TestTransformInputStream : public ::testing::Test { auto stream = std::make_shared( std::make_shared(src), this->transform()); std::shared_ptr actual; - AccumulateReads( - stream, [&]() -> int64_t { return chunk_sizes(gen); }, &actual); + AccumulateReads(stream, [&]() -> int64_t { return chunk_sizes(gen); }, &actual); AssertBufferEqual(*actual, *expected); } @@ -613,8 +612,7 @@ class TestTransformInputStream : public ::testing::Test { void AccumulateReads(const std::shared_ptr& stream, int64_t chunk_size, std::shared_ptr* out) { - return AccumulateReads( - stream, [=]() { return chunk_size; }, out); + return AccumulateReads(stream, [=]() { return chunk_size; }, out); } protected: diff --git a/cpp/src/arrow/json/test_common.h b/cpp/src/arrow/json/test_common.h index 2f819779bdb..423a0123c05 100644 --- a/cpp/src/arrow/json/test_common.h +++ b/cpp/src/arrow/json/test_common.h @@ -89,7 +89,7 @@ struct GenerateImpl { Status Visit(const NullType&) { return OK(writer.Null()); } Status Visit(const BooleanType&) { - return OK(writer.Bool(std::uniform_int_distribution{}(e)&1)); + return OK(writer.Bool(std::uniform_int_distribution{}(e) & 1)); } template diff --git a/cpp/src/arrow/scalar.cc b/cpp/src/arrow/scalar.cc index ad2c66a928a..71ac25e1c2a 100644 --- a/cpp/src/arrow/scalar.cc +++ b/cpp/src/arrow/scalar.cc @@ -565,7 +565,7 @@ struct ScalarValidateImpl { }; template -void FillScalarScratchSpace(void* scratch_space, T const (&arr)[N]) { +void FillScalarScratchSpace(void* scratch_space, const T (&arr)[N]) { static_assert(sizeof(arr) <= internal::kScalarScratchSpaceSize); std::memcpy(scratch_space, arr, sizeof(arr)); } diff --git a/cpp/src/arrow/util/async_generator.h b/cpp/src/arrow/util/async_generator.h index 57c6d9b5dde..056b842bb73 100644 --- a/cpp/src/arrow/util/async_generator.h +++ b/cpp/src/arrow/util/async_generator.h @@ -1439,9 +1439,8 @@ class MergedGenerator { immediate_inner(next_item.result()); if (immediate_inner.was_empty) { Future> next_source = state->PullSource(); - if (next_source.TryAddCallback([this] { - return OuterCallback{state, index}; - })) { + if (next_source.TryAddCallback( + [this] { return OuterCallback{state, index}; })) { // We hit an unfinished future so we can stop looping return; } diff --git a/cpp/src/arrow/util/bpacking.cc b/cpp/src/arrow/util/bpacking.cc index fdb1c5a52ac..277fe7b0408 100644 --- a/cpp/src/arrow/util/bpacking.cc +++ b/cpp/src/arrow/util/bpacking.cc @@ -33,15 +33,15 @@ struct UnpackDynamicFunction { using Implementation = std::pair; static constexpr auto implementations() { - return std::array { - // Current SIMD unpack algorithm works terribly on SSE4.2 due to lack of variable - // rhsift and poor xsimd fallback. - Implementation{DispatchLevel::NONE, &unpack_scalar}, + return std::array{ + // Current SIMD unpack algorithm works terribly on SSE4.2 due to lack of variable + // rhsift and poor xsimd fallback. + Implementation{DispatchLevel::NONE, &unpack_scalar}, #if defined(ARROW_HAVE_RUNTIME_AVX2) - Implementation{DispatchLevel::AVX2, &unpack_avx2}, + Implementation{DispatchLevel::AVX2, &unpack_avx2}, #endif #if defined(ARROW_HAVE_RUNTIME_AVX512) - Implementation{DispatchLevel::AVX512, &unpack_avx512}, + Implementation{DispatchLevel::AVX512, &unpack_avx512}, #endif }; } diff --git a/cpp/src/arrow/util/byte_stream_split_internal.cc b/cpp/src/arrow/util/byte_stream_split_internal.cc index 7e9e339cffd..f9f64747e1e 100644 --- a/cpp/src/arrow/util/byte_stream_split_internal.cc +++ b/cpp/src/arrow/util/byte_stream_split_internal.cc @@ -35,9 +35,9 @@ struct ByteStreamSplitDecodeDynamic { using Implementation = std::pair; constexpr static auto implementations() { - return std::array { - Implementation { - DispatchLevel::NONE, + return std::array{ + Implementation{ + DispatchLevel::NONE, #if defined(ARROW_HAVE_NEON) // We always expect Neon to be available on Arm64 &ByteStreamSplitDecodeSimd, @@ -47,13 +47,12 @@ struct ByteStreamSplitDecodeDynamic { #else &ByteStreamSplitDecodeScalar, #endif - } - , + }, #if defined(ARROW_HAVE_RUNTIME_AVX2) - Implementation{ - DispatchLevel::AVX2, - &ByteStreamSplitDecodeSimd, - }, + Implementation{ + DispatchLevel::AVX2, + &ByteStreamSplitDecodeSimd, + }, #endif }; } @@ -83,9 +82,9 @@ struct ByteStreamSplitEncodeDynamic { using Implementation = std::pair; constexpr static auto implementations() { - return std::array { - Implementation { - DispatchLevel::NONE, + return std::array{ + Implementation{ + DispatchLevel::NONE, #if defined(ARROW_HAVE_NEON) // We always expect Neon to be available on Arm64 &ByteStreamSplitEncodeSimd, @@ -95,10 +94,9 @@ struct ByteStreamSplitEncodeDynamic { #else &ByteStreamSplitEncodeScalar, #endif - } - , + }, #if defined(ARROW_HAVE_RUNTIME_AVX2) - Implementation{DispatchLevel::AVX2, &ByteStreamSplitEncodeAvx2}, + Implementation{DispatchLevel::AVX2, &ByteStreamSplitEncodeAvx2}, #endif }; } diff --git a/cpp/src/arrow/util/byte_stream_split_internal.h b/cpp/src/arrow/util/byte_stream_split_internal.h index 33e9f4b28e1..e237beb7913 100644 --- a/cpp/src/arrow/util/byte_stream_split_internal.h +++ b/cpp/src/arrow/util/byte_stream_split_internal.h @@ -122,8 +122,8 @@ void ByteStreamSplitDecodeSimd(const uint8_t* data, int width, int64_t num_value // Like xsimd::zip_lo, but zip groups of kNumBytes at once. template -auto zip_lo_n(const xsimd::batch& a, const xsimd::batch& b) - -> xsimd::batch { +auto zip_lo_n(const xsimd::batch& a, + const xsimd::batch& b) -> xsimd::batch { using arrow::internal::SizedInt; using simd_batch = xsimd::batch; // For signed arithmetic @@ -146,8 +146,8 @@ auto zip_lo_n(const xsimd::batch& a, const xsimd::batch -auto zip_hi_n(const xsimd::batch& a, const xsimd::batch& b) - -> xsimd::batch { +auto zip_hi_n(const xsimd::batch& a, + const xsimd::batch& b) -> xsimd::batch { using simd_batch = xsimd::batch; using arrow::internal::SizedInt; // For signed arithmetic diff --git a/cpp/src/arrow/util/compare.h b/cpp/src/arrow/util/compare.h index 0594b6002ff..e6deb4f6acf 100644 --- a/cpp/src/arrow/util/compare.h +++ b/cpp/src/arrow/util/compare.h @@ -51,8 +51,8 @@ class EqualityComparable { } }; - friend bool operator==(T const& a, T const& b) { return a.Equals(b); } - friend bool operator!=(T const& a, T const& b) { return !(a == b); } + friend bool operator==(const T& a, const T& b) { return a.Equals(b); } + friend bool operator!=(const T& a, const T& b) { return !(a == b); } private: const T& cast() const { return static_cast(*this); } diff --git a/cpp/src/arrow/util/cpu_info.cc b/cpp/src/arrow/util/cpu_info.cc index 8bcc814d480..fdd0728c8e7 100644 --- a/cpp/src/arrow/util/cpu_info.cc +++ b/cpp/src/arrow/util/cpu_info.cc @@ -266,20 +266,20 @@ void OsRetrieveCpuInfo(int64_t* hardware_flags, CpuInfo::Vendor* vendor, }; std::vector features = { # if defined(CPUINFO_ARCH_X86) - {"hw.optional.sse4_2", - CpuInfo::SSSE3 | CpuInfo::SSE4_1 | CpuInfo::SSE4_2 | CpuInfo::POPCNT}, - {"hw.optional.avx1_0", CpuInfo::AVX}, - {"hw.optional.avx2_0", CpuInfo::AVX2}, - {"hw.optional.bmi1", CpuInfo::BMI1}, - {"hw.optional.bmi2", CpuInfo::BMI2}, - {"hw.optional.avx512f", CpuInfo::AVX512F}, - {"hw.optional.avx512cd", CpuInfo::AVX512CD}, - {"hw.optional.avx512dq", CpuInfo::AVX512DQ}, - {"hw.optional.avx512bw", CpuInfo::AVX512BW}, - {"hw.optional.avx512vl", CpuInfo::AVX512VL}, + {"hw.optional.sse4_2", + CpuInfo::SSSE3 | CpuInfo::SSE4_1 | CpuInfo::SSE4_2 | CpuInfo::POPCNT}, + {"hw.optional.avx1_0", CpuInfo::AVX}, + {"hw.optional.avx2_0", CpuInfo::AVX2}, + {"hw.optional.bmi1", CpuInfo::BMI1}, + {"hw.optional.bmi2", CpuInfo::BMI2}, + {"hw.optional.avx512f", CpuInfo::AVX512F}, + {"hw.optional.avx512cd", CpuInfo::AVX512CD}, + {"hw.optional.avx512dq", CpuInfo::AVX512DQ}, + {"hw.optional.avx512bw", CpuInfo::AVX512BW}, + {"hw.optional.avx512vl", CpuInfo::AVX512VL}, # elif defined(CPUINFO_ARCH_ARM) - // ARM64 (note that this is exposed under Rosetta as well) - {"hw.optional.neon", CpuInfo::ASIMD}, + // ARM64 (note that this is exposed under Rosetta as well) + {"hw.optional.neon", CpuInfo::ASIMD}, # endif }; for (const auto& feature : features) { @@ -351,21 +351,15 @@ int64_t LinuxParseCpuFlags(const std::string& values) { int64_t flag; } flag_mappings[] = { # if defined(CPUINFO_ARCH_X86) - {"ssse3", CpuInfo::SSSE3}, - {"sse4_1", CpuInfo::SSE4_1}, - {"sse4_2", CpuInfo::SSE4_2}, - {"popcnt", CpuInfo::POPCNT}, - {"avx", CpuInfo::AVX}, - {"avx2", CpuInfo::AVX2}, - {"avx512f", CpuInfo::AVX512F}, - {"avx512cd", CpuInfo::AVX512CD}, - {"avx512vl", CpuInfo::AVX512VL}, - {"avx512dq", CpuInfo::AVX512DQ}, - {"avx512bw", CpuInfo::AVX512BW}, - {"bmi1", CpuInfo::BMI1}, - {"bmi2", CpuInfo::BMI2}, + {"ssse3", CpuInfo::SSSE3}, {"sse4_1", CpuInfo::SSE4_1}, + {"sse4_2", CpuInfo::SSE4_2}, {"popcnt", CpuInfo::POPCNT}, + {"avx", CpuInfo::AVX}, {"avx2", CpuInfo::AVX2}, + {"avx512f", CpuInfo::AVX512F}, {"avx512cd", CpuInfo::AVX512CD}, + {"avx512vl", CpuInfo::AVX512VL}, {"avx512dq", CpuInfo::AVX512DQ}, + {"avx512bw", CpuInfo::AVX512BW}, {"bmi1", CpuInfo::BMI1}, + {"bmi2", CpuInfo::BMI2}, # elif defined(CPUINFO_ARCH_ARM) - {"asimd", CpuInfo::ASIMD}, + {"asimd", CpuInfo::ASIMD}, # endif }; const int64_t num_flags = sizeof(flag_mappings) / sizeof(flag_mappings[0]); diff --git a/cpp/src/arrow/util/hash_util.h b/cpp/src/arrow/util/hash_util.h index 7b3de220893..3052ddf5a75 100644 --- a/cpp/src/arrow/util/hash_util.h +++ b/cpp/src/arrow/util/hash_util.h @@ -54,7 +54,7 @@ inline void hash_combine_impl(uint32_t& h1, uint32_t k1) { } // namespace detail template -inline void hash_combine(std::size_t& seed, T const& v) { +inline void hash_combine(std::size_t& seed, const T& v) { std::hash hasher; return ::arrow::internal::detail::hash_combine_impl(seed, hasher(v)); } diff --git a/cpp/src/arrow/util/hashing.h b/cpp/src/arrow/util/hashing.h index ac3beea2660..53f92c8f23d 100644 --- a/cpp/src/arrow/util/hashing.h +++ b/cpp/src/arrow/util/hashing.h @@ -461,8 +461,7 @@ class ScalarMemoTable : public MemoTable { template Status GetOrInsert(Value&& value, int32_t* out_memo_index) { - return GetOrInsert( - value, [](int32_t i) {}, [](int32_t i) {}, out_memo_index); + return GetOrInsert(value, [](int32_t i) {}, [](int32_t i) {}, out_memo_index); } int32_t GetNull() const { return null_index_; } @@ -599,8 +598,7 @@ class SmallScalarMemoTable : public MemoTable { } Status GetOrInsert(const Scalar value, int32_t* out_memo_index) { - return GetOrInsert( - value, [](int32_t i) {}, [](int32_t i) {}, out_memo_index); + return GetOrInsert(value, [](int32_t i) {}, [](int32_t i) {}, out_memo_index); } int32_t GetNull() const { return value_to_index_[cardinality]; } @@ -722,8 +720,7 @@ class BinaryMemoTable : public MemoTable { Status GetOrInsert(const void* data, builder_offset_type length, int32_t* out_memo_index) { - return GetOrInsert( - data, length, [](int32_t i) {}, [](int32_t i) {}, out_memo_index); + return GetOrInsert(data, length, [](int32_t i) {}, [](int32_t i) {}, out_memo_index); } Status GetOrInsert(std::string_view value, int32_t* out_memo_index) { diff --git a/cpp/src/arrow/util/rle_encoding_internal.h b/cpp/src/arrow/util/rle_encoding_internal.h index 2c084e0b4c8..984cd35b129 100644 --- a/cpp/src/arrow/util/rle_encoding_internal.h +++ b/cpp/src/arrow/util/rle_encoding_internal.h @@ -753,8 +753,8 @@ bool RleBitPackedDecoder::Get(value_type* val) { } template -auto RleBitPackedDecoder::GetBatch(value_type* out, rle_size_t batch_size) - -> rle_size_t { +auto RleBitPackedDecoder::GetBatch(value_type* out, + rle_size_t batch_size) -> rle_size_t { using ControlFlow = RleBitPackedParser::ControlFlow; rle_size_t values_read = 0; @@ -867,8 +867,8 @@ template * decoder) - -> GetSpacedResult { + BitRun* validity_run, + RleRunDecoder* decoder) -> GetSpacedResult { ARROW_DCHECK_GT(batch_size, 0); // The equality case is handled in the main loop in GetSpaced ARROW_DCHECK_LT(null_count, batch_size); @@ -1147,8 +1147,8 @@ struct NoOpConverter { template auto RleBitPackedDecoder::GetBatchSpaced(rle_size_t batch_size, rle_size_t null_count, const uint8_t* valid_bits, - int64_t valid_bits_offset, value_type* out) - -> rle_size_t { + int64_t valid_bits_offset, + value_type* out) -> rle_size_t { if (null_count == 0) { return GetBatch(out, batch_size); } @@ -1296,8 +1296,8 @@ template template auto RleBitPackedDecoder::GetBatchWithDictSpaced( const V* dictionary, int32_t dictionary_length, V* out, rle_size_t batch_size, - rle_size_t null_count, const uint8_t* valid_bits, int64_t valid_bits_offset) - -> rle_size_t { + rle_size_t null_count, const uint8_t* valid_bits, + int64_t valid_bits_offset) -> rle_size_t { if (null_count == 0) { return GetBatchWithDict(dictionary, dictionary_length, out, batch_size); } diff --git a/cpp/src/arrow/util/span.h b/cpp/src/arrow/util/span.h index 1e57ee8c8d1..abe8e61bebb 100644 --- a/cpp/src/arrow/util/span.h +++ b/cpp/src/arrow/util/span.h @@ -44,13 +44,13 @@ writing code which would break when it is replaced by std::span.)"); using element_type = T; using value_type = std::remove_cv_t; using iterator = T*; - using const_iterator = T const*; + using const_iterator = const T*; span() = default; span(const span&) = default; span& operator=(const span&) = default; - template >> + template >> // NOLINTNEXTLINE runtime/explicit constexpr span(span mut) : span{mut.data(), mut.size()} {} @@ -100,7 +100,7 @@ writing code which would break when it is replaced by std::span.)"); return std::memcmp(data_, other.data_, size_bytes()) == 0; } else { T* ptr = data_; - for (T const& e : other) { + for (const T& e : other) { if (*ptr++ != e) return false; } return true; @@ -120,7 +120,7 @@ template span(T*, size_t) -> span; template -constexpr span as_bytes(span s) { +constexpr span as_bytes(span s) { return {reinterpret_cast(s.data()), s.size_bytes()}; } diff --git a/cpp/src/arrow/util/tracing.cc b/cpp/src/arrow/util/tracing.cc index 18257eced72..d775d3712c3 100644 --- a/cpp/src/arrow/util/tracing.cc +++ b/cpp/src/arrow/util/tracing.cc @@ -43,8 +43,7 @@ void Span::reset() { #else -Span::Span() noexcept { /* details is left a nullptr */ -} +Span::Span() noexcept { /* details is left a nullptr */ } bool Span::valid() const { return false; } void Span::reset() {} diff --git a/cpp/src/arrow/util/value_parsing_test.cc b/cpp/src/arrow/util/value_parsing_test.cc index a67f1d97f17..b9e3b18444f 100644 --- a/cpp/src/arrow/util/value_parsing_test.cc +++ b/cpp/src/arrow/util/value_parsing_test.cc @@ -876,20 +876,18 @@ TEST(TimestampParser, StrptimeZoneOffset) { std::string format = "%Y-%d-%m %H:%M:%S%z"; auto parser = TimestampParser::MakeStrptime(format); - std::vector values = { - "2018-01-01 00:00:00+0000", - "2018-01-01 00:00:00+0100", + std::vector values = {"2018-01-01 00:00:00+0000", + "2018-01-01 00:00:00+0100", #if defined(__GLIBC__) && defined(__GLIBC_MINOR__) // glibc < 2.28 doesn't support "-0117" timezone offset. // See also: https://github.com/apache/arrow/issues/43808 # if ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 28)) || (__GLIBC__ >= 3) - "2018-01-01 00:00:00-0117", + "2018-01-01 00:00:00-0117", # endif #else - "2018-01-01 00:00:00-0117", + "2018-01-01 00:00:00-0117", #endif - "2018-01-01 00:00:00+0130" - }; + "2018-01-01 00:00:00+0130"}; // N.B. GNU %z supports ISO8601 format while BSD %z supports only // +HHMM or -HHMM and POSIX doesn't appear to define %z at all diff --git a/cpp/src/gandiva/encrypt_utils_test.cc b/cpp/src/gandiva/encrypt_utils_test.cc index 5bc4c3957f2..c5dd76be930 100644 --- a/cpp/src/gandiva/encrypt_utils_test.cc +++ b/cpp/src/gandiva/encrypt_utils_test.cc @@ -94,8 +94,9 @@ TEST(TestShaEncryptUtils, TestAesEncryptDecrypt) { { gandiva::aes_encrypt(to_encrypt, to_encrypt_len, key, key_len, cipher_4); }, std::runtime_error); - ASSERT_THROW({ gandiva::aes_decrypt(cipher, cipher_len, key, key_len, plain_text); }, - std::runtime_error); + ASSERT_THROW( + { gandiva::aes_decrypt(cipher, cipher_len, key, key_len, plain_text); }, + std::runtime_error); key = "12345678"; to_encrypt = "New\ntest\nstring"; @@ -107,6 +108,7 @@ TEST(TestShaEncryptUtils, TestAesEncryptDecrypt) { ASSERT_THROW( { gandiva::aes_encrypt(to_encrypt, to_encrypt_len, key, key_len, cipher_5); }, std::runtime_error); - ASSERT_THROW({ gandiva::aes_decrypt(cipher, cipher_len, key, key_len, plain_text); }, - std::runtime_error); + ASSERT_THROW( + { gandiva::aes_decrypt(cipher, cipher_len, key, key_len, plain_text); }, + std::runtime_error); } diff --git a/cpp/src/gandiva/gdv_hash_function_stubs.cc b/cpp/src/gandiva/gdv_hash_function_stubs.cc index 41eef324450..0663601aca6 100644 --- a/cpp/src/gandiva/gdv_hash_function_stubs.cc +++ b/cpp/src/gandiva/gdv_hash_function_stubs.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -//#pragma once +// #pragma once #include "gandiva/engine.h" #include "gandiva/exported_funcs.h" diff --git a/cpp/src/gandiva/precompiled/string_ops_test.cc b/cpp/src/gandiva/precompiled/string_ops_test.cc index aaa25db0a9f..9d0a4d71afe 100644 --- a/cpp/src/gandiva/precompiled/string_ops_test.cc +++ b/cpp/src/gandiva/precompiled/string_ops_test.cc @@ -103,15 +103,15 @@ TEST(TestStringOps, TestChrBigInt) { out = chr_int64(ctx_ptr, -66, &out_len); EXPECT_EQ(std::string(out, out_len), "\xBE"); - //€ + // € out = chr_int32(ctx_ptr, 128, &out_len); EXPECT_EQ(std::string(out, out_len), "\x80"); - //œ + // œ out = chr_int64(ctx_ptr, 156, &out_len); EXPECT_EQ(std::string(out, out_len), "\x9C"); - //ÿ + // ÿ out = chr_int32(ctx_ptr, 255, &out_len); EXPECT_EQ(std::string(out, out_len), "\xFF"); diff --git a/cpp/src/parquet/arrow/arrow_reader_writer_test.cc b/cpp/src/parquet/arrow/arrow_reader_writer_test.cc index 0831fb62675..6f310f815cd 100644 --- a/cpp/src/parquet/arrow/arrow_reader_writer_test.cc +++ b/cpp/src/parquet/arrow/arrow_reader_writer_test.cc @@ -378,19 +378,19 @@ const double test_traits<::arrow::DoubleType>::value(4.2); template <> struct test_traits<::arrow::StringType> { static constexpr ParquetType::type parquet_enum = ParquetType::BYTE_ARRAY; - static std::string const value; + static const std::string value; }; template <> struct test_traits<::arrow::BinaryType> { static constexpr ParquetType::type parquet_enum = ParquetType::BYTE_ARRAY; - static std::string const value; + static const std::string value; }; template <> struct test_traits<::arrow::FixedSizeBinaryType> { static constexpr ParquetType::type parquet_enum = ParquetType::FIXED_LEN_BYTE_ARRAY; - static std::string const value; + static const std::string value; }; const std::string test_traits<::arrow::StringType>::value("Test"); // NOLINT