format

assignUser · Aug 13, 2024 · d5deff0 · d5deff0
1 parent 734c268
commit d5deff0
Show file tree

Hide file tree

Showing 10 changed files with 86 additions and 37 deletions.
diff --git a/CMake/resolve_dependency_modules/gflags.cmake b/CMake/resolve_dependency_modules/gflags.cmake
@@ -16,9 +16,10 @@ include_guard(GLOBAL)
 set(VELOX_GFLAGS_VERSION 2.2.2)
 set(VELOX_GFLAGS_BUILD_SHA256_CHECKSUM
     34af2f15cf7367513b352bdcd2493ab14ce43692d2dcd9dfc499492966c64dcf)
-string(CONCAT VELOX_GFLAGS_SOURCE_URL
-              "https://github.com/gflags/gflags/archive/refs/tags/"
-              "v${VELOX_GFLAGS_VERSION}.tar.gz")
+string(
+  CONCAT VELOX_GFLAGS_SOURCE_URL
+         "https://github.com/gflags/gflags/archive/refs/tags/"
+         "v${VELOX_GFLAGS_VERSION}.tar.gz")
 
 resolve_dependency_url(GFLAGS)
 

diff --git a/CMake/resolve_dependency_modules/glog.cmake b/CMake/resolve_dependency_modules/glog.cmake
@@ -41,7 +41,6 @@ unset(BUILD_TESTING)
 unset(BUILD_SHARED_LIBS)
 add_dependencies(glog gflags::gflags)
 
-
 # These headers are missing from the include dir but adding the src dir causes
 # issues with folly so we just copy it to the include dir
 file(COPY ${glog_SOURCE_DIR}/src/glog/platform.h

diff --git a/velox/common/hyperloglog/benchmarks/CMakeLists.txt b/velox/common/hyperloglog/benchmarks/CMakeLists.txt
@@ -14,5 +14,6 @@
 
 add_executable(velox_common_hyperloglog_dense_hll_bm DenseHll.cpp)
 
-target_link_libraries(velox_common_hyperloglog_dense_hll_bm
-                      velox_common_hyperloglog Folly::follybenchmark)
+target_link_libraries(
+  velox_common_hyperloglog_dense_hll_bm velox_common_hyperloglog
+  Folly::follybenchmark)
diff --git a/velox/dwio/common/tests/CMakeLists.txt b/velox/dwio/common/tests/CMakeLists.txt
@@ -60,13 +60,21 @@ target_link_libraries(
 add_executable(velox_dwio_common_data_buffer_benchmark DataBufferBenchmark.cpp)
 
 target_link_libraries(
-  velox_dwio_common_data_buffer_benchmark velox_dwio_common velox_memory
-  velox_dwio_common_exception Folly::folly Folly::follybenchmark)
+  velox_dwio_common_data_buffer_benchmark
+  velox_dwio_common
+  velox_memory
+  velox_dwio_common_exception
+  Folly::folly
+  Folly::follybenchmark)
 
 add_executable(velox_dwio_common_int_decoder_benchmark IntDecoderBenchmark.cpp)
 target_link_libraries(
-  velox_dwio_common_int_decoder_benchmark velox_dwio_common_exception
-  velox_exception velox_dwio_dwrf_common Folly::folly Folly::follybenchmark)
+  velox_dwio_common_int_decoder_benchmark
+  velox_dwio_common_exception
+  velox_exception
+  velox_dwio_dwrf_common
+  Folly::folly
+  Folly::follybenchmark)
 
 if(VELOX_ENABLE_ARROW AND VELOX_ENABLE_BENCHMARKS)
   add_subdirectory(Lemire/FastPFor)

diff --git a/velox/dwio/dwrf/test/CMakeLists.txt b/velox/dwio/dwrf/test/CMakeLists.txt
@@ -538,8 +538,12 @@ target_link_libraries(
 
 add_executable(velox_dwrf_int_encoder_benchmark IntEncoderBenchmark.cpp)
 target_link_libraries(
-  velox_dwrf_int_encoder_benchmark velox_dwio_dwrf_common velox_memory
-  velox_dwio_common_exception Folly::folly Folly::follybenchmark)
+  velox_dwrf_int_encoder_benchmark
+  velox_dwio_dwrf_common
+  velox_memory
+  velox_dwio_common_exception
+  Folly::folly
+  Folly::follybenchmark)
 
 add_executable(velox_dwrf_float_column_writer_benchmark
                FloatColumnWriterBenchmark.cpp)

diff --git a/velox/exec/benchmarks/CMakeLists.txt b/velox/exec/benchmarks/CMakeLists.txt
@@ -13,19 +13,27 @@
 # limitations under the License.
 add_executable(velox_exec_vector_hasher_benchmark VectorHasherBenchmark.cpp)
 
-target_link_libraries(velox_exec_vector_hasher_benchmark velox_exec
-                      velox_vector_test_lib Folly::follybenchmark)
+target_link_libraries(
+  velox_exec_vector_hasher_benchmark velox_exec velox_vector_test_lib
+  Folly::follybenchmark)
 
 add_executable(velox_filter_project_benchmark FilterProjectBenchmark.cpp)
 
 target_link_libraries(
-  velox_filter_project_benchmark velox_exec velox_vector_test_lib
-  velox_exec_test_lib Folly::follybenchmark)
+  velox_filter_project_benchmark
+  velox_exec
+  velox_vector_test_lib
+  velox_exec_test_lib
+  Folly::follybenchmark)
 
 add_executable(velox_exchange_benchmark ExchangeBenchmark.cpp)
 
-target_link_libraries(velox_exchange_benchmark velox_exec velox_exec_test_lib
-                      velox_vector_test_lib Folly::follybenchmark)
+target_link_libraries(
+  velox_exchange_benchmark
+  velox_exec
+  velox_exec_test_lib
+  velox_vector_test_lib
+  Folly::follybenchmark)
 
 add_executable(velox_merge_benchmark MergeBenchmark.cpp)
 
@@ -39,22 +47,32 @@ target_link_libraries(
 
 add_executable(velox_hash_benchmark HashTableBenchmark.cpp)
 
-target_link_libraries(velox_hash_benchmark velox_exec velox_exec_test_lib
-                      velox_vector_test_lib Folly::follybenchmark)
+target_link_libraries(
+  velox_hash_benchmark
+  velox_exec
+  velox_exec_test_lib
+  velox_vector_test_lib
+  Folly::follybenchmark)
 
 add_executable(velox_hash_join_list_result_benchmark
                HashJoinListResultBenchmark.cpp)
 
 target_link_libraries(
-  velox_hash_join_list_result_benchmark velox_exec velox_exec_test_lib
-  velox_vector_test_lib Folly::follybenchmark)
+  velox_hash_join_list_result_benchmark
+  velox_exec
+  velox_exec_test_lib
+  velox_vector_test_lib
+  Folly::follybenchmark)
 
 add_executable(velox_hash_join_prepare_join_table_benchmark
                HashJoinPrepareJoinTableBenchmark.cpp)
 
 target_link_libraries(
-  velox_hash_join_prepare_join_table_benchmark velox_exec velox_exec_test_lib
-  velox_vector_test_lib Folly::follybenchmark)
+  velox_hash_join_prepare_join_table_benchmark
+  velox_exec
+  velox_exec_test_lib
+  velox_vector_test_lib
+  Folly::follybenchmark)
 
 if(${VELOX_ENABLE_PARQUET})
   add_executable(velox_sort_benchmark RowContainerSortBenchmark.cpp)
@@ -71,5 +89,9 @@ endif()
 
 add_executable(velox_prefixsort_benchmark PrefixSortBenchmark.cpp)
 
-target_link_libraries(velox_prefixsort_benchmark velox_exec velox_vector_fuzzer
-                      velox_vector_test_lib Folly::follybenchmark)
+target_link_libraries(
+  velox_prefixsort_benchmark
+  velox_exec
+  velox_vector_fuzzer
+  velox_vector_test_lib
+  Folly::follybenchmark)
diff --git a/velox/exec/tests/utils/CMakeLists.txt b/velox/exec/tests/utils/CMakeLists.txt
@@ -35,6 +35,7 @@ add_library(
 target_link_libraries(
   velox_exec_test_lib
   velox_vector_test_lib
+  velox_vector_fuzzer
   velox_temp_path
   velox_core
   velox_exception

diff --git a/velox/expression/benchmarks/CMakeLists.txt b/velox/expression/benchmarks/CMakeLists.txt
@@ -13,8 +13,12 @@
 # limitations under the License.
 
 set(BENCHMARK_DEPENDENCIES
-    velox_functions_test_lib velox_exec velox_exec_test_lib gflags::gflags
-    Folly::folly Folly::follybenchmark)
+    velox_functions_test_lib
+    velox_exec
+    velox_exec_test_lib
+    gflags::gflags
+    Folly::folly
+    Folly::follybenchmark)
 
 add_executable(velox_benchmark_call_null_free_no_nulls
                CallNullFreeBenchmark.cpp)

diff --git a/velox/flag_definitions/CMakeLists.txt b/velox/flag_definitions/CMakeLists.txt
@@ -11,5 +11,5 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-velox_add_library(velox_flag_definitions OBJECT flags.cpp)
+velox_add_library(velox_flag_definitions flags.cpp)
 velox_link_libraries(velox_flag_definitions PRIVATE gflags::gflags)
diff --git a/velox/vector/benchmarks/CMakeLists.txt b/velox/vector/benchmarks/CMakeLists.txt
@@ -13,24 +13,33 @@
 # limitations under the License.
 add_executable(velox_vector_hash_all_benchmark SimpleVectorHashAllBenchmark.cpp)
 
-target_link_libraries(velox_vector_hash_all_benchmark velox_vector Folly::folly
-                      Folly::follybenchmark fmt::fmt)
+target_link_libraries(
+  velox_vector_hash_all_benchmark
+  velox_vector
+  Folly::folly
+  Folly::follybenchmark
+  fmt::fmt)
 # This is a workaround for the use of VectorTestUtils.h which include gtest.h
 target_link_libraries(
   velox_vector_hash_all_benchmark GTest::gtest)
 
 add_executable(velox_vector_selectivity_vector_benchmark
                SelectivityVectorBenchmark.cpp)
 
-target_link_libraries(velox_vector_selectivity_vector_benchmark velox_vector
-                      Folly::folly Folly::follybenchmark)
+target_link_libraries(
+  velox_vector_selectivity_vector_benchmark velox_vector Folly::folly
+  Folly::follybenchmark)
 
 add_executable(copy_benchmark CopyBenchmark.cpp)
 
-target_link_libraries(copy_benchmark velox_vector_test_lib Folly::folly
-                      Folly::follybenchmark)
+target_link_libraries(
+  copy_benchmark velox_vector_test_lib Folly::folly Folly::follybenchmark)
 
 add_executable(velox_vector_map_update_benchmark MapUpdateBenchmark.cpp)
 target_link_libraries(
-  velox_vector_map_update_benchmark velox_vector_test_lib Folly::folly
-  Folly::follybenchmark gflags::gflags glog::glog)
+  velox_vector_map_update_benchmark
+  velox_vector_test_lib
+  Folly::folly
+  Folly::follybenchmark
+  gflags::gflags
+  glog::glog)