Skip to content

Commit e19cc5e

Browse files
committed
lint
1 parent 603a076 commit e19cc5e

File tree

4 files changed

+31
-16
lines changed

4 files changed

+31
-16
lines changed

cpp/cmake_modules/ThirdpartyToolchain.cmake

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@ set(ARROW_THIRDPARTY_DEPENDENCIES
7373
ZLIB
7474
zstd)
7575

76-
set(fsst_SOURCE "BUNDLED" CACHE STRING "Source of fsst dependency")
76+
set(fsst_SOURCE
77+
"BUNDLED"
78+
CACHE STRING "Source of fsst dependency")
7779

7880
# For backward compatibility. We use "BOOST_SOURCE" if "Boost_SOURCE"
7981
# isn't specified and "BOOST_SOURCE" is specified.
@@ -2613,16 +2615,22 @@ endif()
26132615
function(build_fsst)
26142616
message(STATUS "Configuring vendored FSST sources")
26152617

2616-
set(ARROW_FSST_INCLUDE_DIR "${ARROW_SOURCE_DIR}/thirdparty/fsst" PARENT_SCOPE)
2618+
set(ARROW_FSST_INCLUDE_DIR
2619+
"${ARROW_SOURCE_DIR}/thirdparty/fsst"
2620+
PARENT_SCOPE)
26172621
set(ARROW_FSST_SOURCES
26182622
"${ARROW_SOURCE_DIR}/thirdparty/fsst/libfsst.cpp;${ARROW_SOURCE_DIR}/thirdparty/fsst/fsst_avx512.cpp"
26192623
PARENT_SCOPE)
2620-
set(FSST_VENDORED TRUE PARENT_SCOPE)
2624+
set(FSST_VENDORED
2625+
TRUE
2626+
PARENT_SCOPE)
26212627
endfunction()
26222628

26232629
if(ARROW_WITH_FSST)
26242630
if(NOT fsst_SOURCE STREQUAL "BUNDLED")
2625-
message(FATAL_ERROR "FSST must currently be built from source. Set fsst_SOURCE=BUNDLED.")
2631+
message(
2632+
FATAL_ERROR
2633+
"FSST must currently be built from source. Set fsst_SOURCE=BUNDLED.")
26262634
endif()
26272635
resolve_dependency(fsst IS_RUNTIME_DEPENDENCY FALSE)
26282636
endif()

cpp/src/parquet/CMakeLists.txt

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -206,13 +206,19 @@ if(DEFINED ARROW_FSST_INCLUDE_DIR)
206206
list(APPEND PARQUET_TEST_EXTRA_INCLUDES ${ARROW_FSST_INCLUDE_DIR})
207207
endif()
208208
if(DEFINED ARROW_FSST_SOURCES)
209-
set_property(SOURCE ${ARROW_FSST_SOURCES} APPEND PROPERTY COMPILE_OPTIONS
210-
"$<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>>:-Wno-error=shorten-64-to-32;-Wno-shorten-64-to-32>"
211-
"$<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,$<CXX_COMPILER_ID:GNU>>:-Wno-error=missing-declarations;-Wno-missing-declarations>"
212-
"$<$<CXX_COMPILER_ID:MSVC>:/wd4244>")
213-
set_property(SOURCE ${ARROW_FSST_SOURCES} APPEND PROPERTY COMPILE_OPTIONS
214-
"$<$<AND:$<PLATFORM_ID:Windows>,$<NOT:$<CXX_COMPILER_ID:MSVC>>>:-include>"
215-
"$<$<AND:$<PLATFORM_ID:Windows>,$<NOT:$<CXX_COMPILER_ID:MSVC>>>:${CMAKE_CURRENT_SOURCE_DIR}/fsst_compat.h>")
209+
set_property(
210+
SOURCE ${ARROW_FSST_SOURCES}
211+
APPEND
212+
PROPERTY COMPILE_OPTIONS
213+
"$<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>>:-Wno-error=shorten-64-to-32;-Wno-shorten-64-to-32>"
214+
"$<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,$<CXX_COMPILER_ID:GNU>>:-Wno-error=missing-declarations;-Wno-missing-declarations>"
215+
"$<$<CXX_COMPILER_ID:MSVC>:/wd4244>")
216+
set_property(
217+
SOURCE ${ARROW_FSST_SOURCES}
218+
APPEND
219+
PROPERTY COMPILE_OPTIONS
220+
"$<$<AND:$<PLATFORM_ID:Windows>,$<NOT:$<CXX_COMPILER_ID:MSVC>>>:-include>"
221+
"$<$<AND:$<PLATFORM_ID:Windows>,$<NOT:$<CXX_COMPILER_ID:MSVC>>>:${CMAKE_CURRENT_SOURCE_DIR}/fsst_compat.h>")
216222
endif()
217223

218224
if(ARROW_HAVE_RUNTIME_AVX2)
@@ -333,7 +339,8 @@ add_arrow_lib(parquet
333339
if(PARQUET_PRIVATE_INCLUDE_DIRS)
334340
foreach(_parquet_target parquet_objlib parquet_shared parquet_static)
335341
if(TARGET ${_parquet_target})
336-
target_include_directories(${_parquet_target} PRIVATE ${PARQUET_PRIVATE_INCLUDE_DIRS})
342+
target_include_directories(
343+
${_parquet_target} PRIVATE ${PARQUET_PRIVATE_INCLUDE_DIRS})
337344
endif()
338345
endforeach()
339346
endif()

cpp/src/parquet/decoder.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include <cstdint>
2222
#include <cstdlib>
2323
#include <cstring>
24+
#include <deque>
2425
#include <iostream>
2526
#include <limits>
2627
#include <memory>
@@ -29,7 +30,6 @@
2930
#include <type_traits>
3031
#include <utility>
3132
#include <vector>
32-
#include <deque>
3333

3434
#include "arrow/array.h"
3535
#include "arrow/array/builder_binary.h"

cpp/src/parquet/fsst_compat.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
// can be compiled with the compilers Arrow supports.
2222

2323
#if defined(_WIN32) && !defined(_MSC_VER)
24-
#include <cpuid.h>
24+
# include <cpuid.h>
2525

2626
// MinGW does not provide __cpuidex, but FSST only needs the CPUID
2727
// leaf/sub-leaf variant that __cpuid_count implements.
2828
static inline void arrow_fsst_cpuidex(int info[4], int function_id, int subfunction_id) {
2929
__cpuid_count(function_id, subfunction_id, info[0], info[1], info[2], info[3]);
3030
}
31-
#define __cpuidex(info, function_id, subfunction_id) \
32-
arrow_fsst_cpuidex(info, function_id, subfunction_id)
31+
# define __cpuidex(info, function_id, subfunction_id) \
32+
arrow_fsst_cpuidex(info, function_id, subfunction_id)
3333
#endif

0 commit comments

Comments
 (0)