From bc16b1109fb960d59a618bedaaa498f04820bc80 Mon Sep 17 00:00:00 2001 From: Jacob Wujciak-Jens Date: Wed, 12 Jun 2024 01:47:01 +0200 Subject: [PATCH] apply format to velox/ --- velox/common/base/CMakeLists.txt | 31 +++++++------------ velox/common/caching/CMakeLists.txt | 22 ++++++------- velox/common/compression/CMakeLists.txt | 6 ++-- velox/common/file/CMakeLists.txt | 9 ++---- velox/common/hyperloglog/CMakeLists.txt | 6 ++-- velox/common/memory/CMakeLists.txt | 23 ++++++-------- velox/common/process/CMakeLists.txt | 10 ++---- velox/common/serialization/CMakeLists.txt | 2 +- velox/common/time/CMakeLists.txt | 9 ++---- velox/connectors/hive/CMakeLists.txt | 29 +++++++++-------- .../hive/storage_adapters/abfs/CMakeLists.txt | 27 +++++++++------- .../hive/storage_adapters/hdfs/CMakeLists.txt | 8 +++-- velox/core/CMakeLists.txt | 28 ++++++++--------- velox/dwio/CMakeLists.txt | 28 ++++++++--------- velox/dwio/parquet/thrift/CMakeLists.txt | 8 +++-- .../parquet/writer/arrow/util/CMakeLists.txt | 9 ++++-- velox/examples/CMakeLists.txt | 23 ++++++++++---- velox/exec/fuzzer/CMakeLists.txt | 24 ++++++++++---- velox/experimental/wave/common/CMakeLists.txt | 9 ++++-- velox/experimental/wave/dwio/CMakeLists.txt | 8 +++-- velox/expression/CMakeLists.txt | 7 +++-- .../type_calculation/CMakeLists.txt | 7 +++-- velox/functions/CMakeLists.txt | 8 +++-- velox/functions/lib/CMakeLists.txt | 12 ++++--- velox/functions/lib/aggregates/CMakeLists.txt | 7 +++-- velox/functions/lib/string/CMakeLists.txt | 2 +- velox/functions/lib/window/CMakeLists.txt | 8 +++-- velox/functions/prestosql/json/CMakeLists.txt | 8 +++-- .../functions/prestosql/types/CMakeLists.txt | 17 +++++++--- .../functions/prestosql/window/CMakeLists.txt | 16 +++++++--- velox/functions/remote/client/CMakeLists.txt | 15 +++++---- velox/functions/remote/if/CMakeLists.txt | 5 +-- .../sparksql/aggregates/CMakeLists.txt | 9 ++++-- .../sparksql/specialforms/CMakeLists.txt | 8 +++-- .../functions/sparksql/window/CMakeLists.txt | 8 +++-- velox/parse/CMakeLists.txt | 16 +++++++--- velox/type/tz/CMakeLists.txt | 8 +++-- velox/vector/CMakeLists.txt | 9 ++++-- velox/vector/arrow/CMakeLists.txt | 8 +++-- 39 files changed, 297 insertions(+), 200 deletions(-) diff --git a/velox/common/base/CMakeLists.txt b/velox/common/base/CMakeLists.txt index d38be33559d0..6c26222ef56c 100644 --- a/velox/common/base/CMakeLists.txt +++ b/velox/common/base/CMakeLists.txt @@ -16,13 +16,12 @@ velox_add_library(velox_exception Exceptions.cpp VeloxException.cpp Exceptions.h) velox_link_libraries( velox_exception - PUBLIC - velox_flag_definitions - velox_process - Folly::folly - fmt::fmt - gflags::gflags - glog::glog) + PUBLIC velox_flag_definitions + velox_process + Folly::folly + fmt::fmt + gflags::gflags + glog::glog) velox_add_library( velox_common_base @@ -41,16 +40,8 @@ velox_add_library( velox_link_libraries( velox_common_base - PUBLIC - velox_exception - Folly::folly - fmt::fmt - xsimd - PRIVATE - velox_common_compression - velox_process - velox_test_util - glog::glog) + PUBLIC velox_exception Folly::folly fmt::fmt xsimd + PRIVATE velox_common_compression velox_process velox_test_util glog::glog) if(${VELOX_BUILD_TESTING}) add_subdirectory(tests) @@ -72,5 +63,7 @@ velox_link_libraries( gflags::gflags) velox_add_library(velox_status Status.cpp) -velox_link_libraries(velox_status PUBLIC fmt::fmt Folly::folly PRIVATE - glog::glog) +velox_link_libraries( + velox_status + PUBLIC fmt::fmt Folly::folly + PRIVATE glog::glog) diff --git a/velox/common/caching/CMakeLists.txt b/velox/common/caching/CMakeLists.txt index 0b0772157675..76d7694b0a80 100644 --- a/velox/common/caching/CMakeLists.txt +++ b/velox/common/caching/CMakeLists.txt @@ -24,18 +24,16 @@ velox_add_library( StringIdMap.cpp) velox_link_libraries( velox_caching - PUBLIC - velox_common_base - velox_exception - velox_file - velox_memory - velox_process - velox_time - Folly::folly - fmt::fmt - gflags::gflags - PRIVATE - velox_time) + PUBLIC velox_common_base + velox_exception + velox_file + velox_memory + velox_process + velox_time + Folly::folly + fmt::fmt + gflags::gflags + PRIVATE velox_time) if(${VELOX_BUILD_TESTING}) add_subdirectory(tests) diff --git a/velox/common/compression/CMakeLists.txt b/velox/common/compression/CMakeLists.txt index 5e4be6bcc502..25835c26c4bb 100644 --- a/velox/common/compression/CMakeLists.txt +++ b/velox/common/compression/CMakeLists.txt @@ -17,5 +17,7 @@ if(${VELOX_BUILD_TESTING}) endif() velox_add_library(velox_common_compression Compression.cpp LzoDecompressor.cpp) -velox_link_libraries(velox_common_compression PUBLIC Folly::folly PRIVATE - velox_exception) +velox_link_libraries( + velox_common_compression + PUBLIC Folly::folly + PRIVATE velox_exception) diff --git a/velox/common/file/CMakeLists.txt b/velox/common/file/CMakeLists.txt index 9c1421b8953c..b68e32322fe6 100644 --- a/velox/common/file/CMakeLists.txt +++ b/velox/common/file/CMakeLists.txt @@ -17,13 +17,8 @@ include_directories(.) velox_add_library(velox_file File.cpp FileSystems.cpp Utils.cpp) velox_link_libraries( velox_file - PUBLIC - velox_exception - Folly::folly - PRIVATE - velox_common_base - fmt::fmt - glog::glog) + PUBLIC velox_exception Folly::folly + PRIVATE velox_common_base fmt::fmt glog::glog) if(${VELOX_BUILD_TESTING} OR ${VELOX_BUILD_TEST_UTILS}) add_subdirectory(tests) diff --git a/velox/common/hyperloglog/CMakeLists.txt b/velox/common/hyperloglog/CMakeLists.txt index f0cbef5eaff1..27c07830b864 100644 --- a/velox/common/hyperloglog/CMakeLists.txt +++ b/velox/common/hyperloglog/CMakeLists.txt @@ -14,8 +14,10 @@ velox_add_library(velox_common_hyperloglog BiasCorrection.cpp DenseHll.cpp SparseHll.cpp) -velox_link_libraries(velox_common_hyperloglog PUBLIC velox_memory PRIVATE - velox_exception) +velox_link_libraries( + velox_common_hyperloglog + PUBLIC velox_memory + PRIVATE velox_exception) if(${VELOX_BUILD_TESTING}) add_subdirectory(tests) diff --git a/velox/common/memory/CMakeLists.txt b/velox/common/memory/CMakeLists.txt index 85cd0d3e3587..a4ea2a847f2c 100644 --- a/velox/common/memory/CMakeLists.txt +++ b/velox/common/memory/CMakeLists.txt @@ -33,16 +33,13 @@ velox_add_library( velox_link_libraries( velox_memory - PUBLIC - velox_common_base - velox_exception - velox_flag_definitions - velox_time - velox_type - Folly::folly - fmt::fmt - gflags::gflags - glog::glog - PRIVATE - velox_test_util - re2::re2) + PUBLIC velox_common_base + velox_exception + velox_flag_definitions + velox_time + velox_type + Folly::folly + fmt::fmt + gflags::gflags + glog::glog + PRIVATE velox_test_util re2::re2) diff --git a/velox/common/process/CMakeLists.txt b/velox/common/process/CMakeLists.txt index c2f268911116..0cebd335cb98 100644 --- a/velox/common/process/CMakeLists.txt +++ b/velox/common/process/CMakeLists.txt @@ -23,14 +23,8 @@ velox_add_library( velox_link_libraries( velox_process - PUBLIC - velox_file - velox_flag_definitions - Folly::folly - PRIVATE - fmt::fmt - gflags::gflags - glog::glog) + PUBLIC velox_file velox_flag_definitions Folly::folly + PRIVATE fmt::fmt gflags::gflags glog::glog) if(${VELOX_BUILD_TESTING}) add_subdirectory(tests) diff --git a/velox/common/serialization/CMakeLists.txt b/velox/common/serialization/CMakeLists.txt index f9099d5f18cf..c818597442d2 100644 --- a/velox/common/serialization/CMakeLists.txt +++ b/velox/common/serialization/CMakeLists.txt @@ -15,7 +15,7 @@ velox_add_library(velox_serialization DeserializationRegistry.cpp) velox_link_libraries(velox_serialization PUBLIC velox_exception Folly::folly - glog::glog) + glog::glog) if(${VELOX_BUILD_TESTING}) add_subdirectory(tests) diff --git a/velox/common/time/CMakeLists.txt b/velox/common/time/CMakeLists.txt index 5c2ad67771ac..8c9e39f51835 100644 --- a/velox/common/time/CMakeLists.txt +++ b/velox/common/time/CMakeLists.txt @@ -16,10 +16,5 @@ if(${VELOX_BUILD_TESTING}) endif() velox_add_library(velox_time CpuWallTimer.cpp Timer.cpp) -velox_link_libraries( - velox_time - PUBLIC - velox_process - velox_test_util - Folly::folly - fmt::fmt) +velox_link_libraries(velox_time PUBLIC velox_process velox_test_util + Folly::folly fmt::fmt) diff --git a/velox/connectors/hive/CMakeLists.txt b/velox/connectors/hive/CMakeLists.txt index f50bf01f1a36..57f94d238509 100644 --- a/velox/connectors/hive/CMakeLists.txt +++ b/velox/connectors/hive/CMakeLists.txt @@ -33,22 +33,21 @@ velox_add_library( velox_link_libraries( velox_hive_connector - PUBLIC - velox_hive_iceberg_splitreader + PUBLIC velox_hive_iceberg_splitreader PRIVATE - velox_common_io - velox_connector - velox_dwio_catalog_fbhive - velox_dwio_dwrf_reader - velox_dwio_dwrf_writer - velox_dwio_parquet_reader - velox_dwio_parquet_writer - velox_file - velox_hive_partition_function - velox_s3fs - velox_hdfs - velox_gcs - velox_abfs) + velox_common_io + velox_connector + velox_dwio_catalog_fbhive + velox_dwio_dwrf_reader + velox_dwio_dwrf_writer + velox_dwio_parquet_reader + velox_dwio_parquet_writer + velox_file + velox_hive_partition_function + velox_s3fs + velox_hdfs + velox_gcs + velox_abfs) velox_add_library(velox_hive_partition_function HivePartitionFunction.cpp) diff --git a/velox/connectors/hive/storage_adapters/abfs/CMakeLists.txt b/velox/connectors/hive/storage_adapters/abfs/CMakeLists.txt index 1a62954a764f..ec71a1353ccd 100644 --- a/velox/connectors/hive/storage_adapters/abfs/CMakeLists.txt +++ b/velox/connectors/hive/storage_adapters/abfs/CMakeLists.txt @@ -17,20 +17,23 @@ velox_add_library(velox_abfs RegisterAbfsFileSystem.cpp) if(VELOX_ENABLE_ABFS) - velox_sources(velox_abfs PRIVATE AbfsFileSystem.cpp AbfsUtils.cpp - AbfsWriteFile.cpp) + velox_sources( + velox_abfs + PRIVATE + AbfsFileSystem.cpp + AbfsUtils.cpp + AbfsWriteFile.cpp) velox_link_libraries( velox_abfs - PUBLIC - velox_file - velox_core - velox_hive_config - velox_dwio_common_exception - Azure::azure-storage-blobs - Azure::azure-storage-files-datalake - Folly::folly - glog::glog - fmt::fmt) + PUBLIC velox_file + velox_core + velox_hive_config + velox_dwio_common_exception + Azure::azure-storage-blobs + Azure::azure-storage-files-datalake + Folly::folly + glog::glog + fmt::fmt) if(${VELOX_BUILD_TESTING}) add_subdirectory(tests) diff --git a/velox/connectors/hive/storage_adapters/hdfs/CMakeLists.txt b/velox/connectors/hive/storage_adapters/hdfs/CMakeLists.txt index bbb4953badf5..6c1e84aec404 100644 --- a/velox/connectors/hive/storage_adapters/hdfs/CMakeLists.txt +++ b/velox/connectors/hive/storage_adapters/hdfs/CMakeLists.txt @@ -17,8 +17,12 @@ velox_add_library(velox_hdfs RegisterHdfsFileSystem.cpp) if(VELOX_ENABLE_HDFS) - velox_sources(velox_hdfs PRIVATE HdfsFileSystem.cpp HdfsReadFile.cpp - HdfsWriteFile.cpp) + velox_sources( + velox_hdfs + PRIVATE + HdfsFileSystem.cpp + HdfsReadFile.cpp + HdfsWriteFile.cpp) velox_link_libraries(velox_hdfs Folly::folly ${LIBHDFS3} xsimd) if(${VELOX_BUILD_TESTING}) diff --git a/velox/core/CMakeLists.txt b/velox/core/CMakeLists.txt index d2a7a13d9c10..f2a272937773 100644 --- a/velox/core/CMakeLists.txt +++ b/velox/core/CMakeLists.txt @@ -32,18 +32,16 @@ velox_add_library( velox_link_libraries( velox_core - PUBLIC - velox_arrow_bridge - velox_caching - velox_config - velox_connector - velox_exception - velox_expression_functions - velox_memory - velox_type - velox_vector - Boost::headers - Folly::folly - fmt::fmt - PRIVATE - velox_encode) + PUBLIC velox_arrow_bridge + velox_caching + velox_config + velox_connector + velox_exception + velox_expression_functions + velox_memory + velox_type + velox_vector + Boost::headers + Folly::folly + fmt::fmt + PRIVATE velox_encode) diff --git a/velox/dwio/CMakeLists.txt b/velox/dwio/CMakeLists.txt index 6c034b323832..183b411e25f9 100644 --- a/velox/dwio/CMakeLists.txt +++ b/velox/dwio/CMakeLists.txt @@ -15,20 +15,20 @@ velox_add_library(velox_link_libs INTERFACE) velox_link_libraries( velox_link_libs INTERFACE - velox_caching - velox_dwio_catalog_fbhive - velox_dwio_common - velox_dwio_common_exception - velox_encode - velox_exception - velox_memory - velox_process - velox_serialization - velox_type - velox_type_fbhive - velox_vector - Folly::folly - fmt::fmt) + velox_caching + velox_dwio_catalog_fbhive + velox_dwio_common + velox_dwio_common_exception + velox_encode + velox_exception + velox_memory + velox_process + velox_serialization + velox_type + velox_type_fbhive + velox_vector + Folly::folly + fmt::fmt) add_subdirectory(common) add_subdirectory(catalog) diff --git a/velox/dwio/parquet/thrift/CMakeLists.txt b/velox/dwio/parquet/thrift/CMakeLists.txt index a1daa57f0ecb..cb0b6ea91881 100644 --- a/velox/dwio/parquet/thrift/CMakeLists.txt +++ b/velox/dwio/parquet/thrift/CMakeLists.txt @@ -13,5 +13,9 @@ # limitations under the License. velox_add_library(velox_dwio_parquet_thrift ParquetThriftTypes.cpp) -velox_link_libraries(velox_dwio_parquet_thrift arrow thrift Boost::headers - fmt::fmt) +velox_link_libraries( + velox_dwio_parquet_thrift + arrow + thrift + Boost::headers + fmt::fmt) diff --git a/velox/dwio/parquet/writer/arrow/util/CMakeLists.txt b/velox/dwio/parquet/writer/arrow/util/CMakeLists.txt index 3d6db91deeda..e5757f81646b 100644 --- a/velox/dwio/parquet/writer/arrow/util/CMakeLists.txt +++ b/velox/dwio/parquet/writer/arrow/util/CMakeLists.txt @@ -22,5 +22,10 @@ velox_add_library( Hashing.cpp Crc32.cpp) -velox_link_libraries(velox_dwio_arrow_parquet_writer_util_lib arrow - Snappy::snappy zstd::zstd ZLIB::ZLIB lz4::lz4) +velox_link_libraries( + velox_dwio_arrow_parquet_writer_util_lib + arrow + Snappy::snappy + zstd::zstd + ZLIB::ZLIB + lz4::lz4) diff --git a/velox/examples/CMakeLists.txt b/velox/examples/CMakeLists.txt index f5b55d42cc3c..958c7c296ec0 100644 --- a/velox/examples/CMakeLists.txt +++ b/velox/examples/CMakeLists.txt @@ -15,19 +15,30 @@ add_executable(velox_example_simple_functions SimpleFunctions.cpp) target_link_libraries( - velox_example_simple_functions velox_functions_lib velox_core - velox_expression re2::re2) + velox_example_simple_functions + velox_functions_lib + velox_core + velox_expression + re2::re2) add_executable(velox_example_expression_eval ExpressionEval.cpp) target_link_libraries( - velox_example_expression_eval velox_type velox_vector velox_caching - velox_memory velox_expression) + velox_example_expression_eval + velox_type + velox_vector + velox_caching + velox_memory + velox_expression) add_executable(velox_example_opaque_type OpaqueType.cpp) target_link_libraries( - velox_example_opaque_type velox_type velox_vector velox_caching - velox_expression velox_memory) + velox_example_opaque_type + velox_type + velox_vector + velox_caching + velox_expression + velox_memory) # This is disabled temporarily until we figure out why g++ is crashing linking # it on linux builds. diff --git a/velox/exec/fuzzer/CMakeLists.txt b/velox/exec/fuzzer/CMakeLists.txt index 8dadf9c77e1d..fb3ee066586a 100644 --- a/velox/exec/fuzzer/CMakeLists.txt +++ b/velox/exec/fuzzer/CMakeLists.txt @@ -72,14 +72,22 @@ target_link_libraries( add_library(velox_row_number_fuzzer RowNumberFuzzer.cpp) target_link_libraries( - velox_row_number_fuzzer velox_fuzzer_util velox_type velox_vector_fuzzer - velox_exec_test_lib velox_expression_test_utility) + velox_row_number_fuzzer + velox_fuzzer_util + velox_type + velox_vector_fuzzer + velox_exec_test_lib + velox_expression_test_utility) add_library(velox_join_fuzzer JoinFuzzer.cpp) target_link_libraries( - velox_join_fuzzer velox_type velox_vector_fuzzer velox_fuzzer_util - velox_exec_test_lib velox_expression_test_utility) + velox_join_fuzzer + velox_type + velox_vector_fuzzer + velox_fuzzer_util + velox_exec_test_lib + velox_expression_test_utility) add_library(velox_writer_fuzzer WriterFuzzer.cpp) @@ -105,5 +113,9 @@ target_link_libraries( velox_functions_prestosql velox_aggregates) -target_link_libraries(velox_join_fuzzer velox_type velox_vector_fuzzer - velox_exec_test_lib velox_expression_test_utility) +target_link_libraries( + velox_join_fuzzer + velox_type + velox_vector_fuzzer + velox_exec_test_lib + velox_expression_test_utility) diff --git a/velox/experimental/wave/common/CMakeLists.txt b/velox/experimental/wave/common/CMakeLists.txt index 651454db19d7..a4a5298f284a 100644 --- a/velox/experimental/wave/common/CMakeLists.txt +++ b/velox/experimental/wave/common/CMakeLists.txt @@ -12,8 +12,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -velox_add_library(velox_wave_common GpuArena.cpp Buffer.cpp Cuda.cu - Exception.cpp Type.cpp) +velox_add_library( + velox_wave_common + GpuArena.cpp + Buffer.cpp + Cuda.cu + Exception.cpp + Type.cpp) velox_link_libraries(velox_wave_common velox_exception velox_common_base velox_type) diff --git a/velox/experimental/wave/dwio/CMakeLists.txt b/velox/experimental/wave/dwio/CMakeLists.txt index 3a43976e87f0..f43052462fdc 100644 --- a/velox/experimental/wave/dwio/CMakeLists.txt +++ b/velox/experimental/wave/dwio/CMakeLists.txt @@ -14,7 +14,11 @@ add_subdirectory(decode) -velox_add_library(velox_wave_dwio ColumnReader.cpp FormatData.cpp - ReadStream.cpp StructColumnReader.cpp) +velox_add_library( + velox_wave_dwio + ColumnReader.cpp + FormatData.cpp + ReadStream.cpp + StructColumnReader.cpp) velox_link_libraries(velox_wave_dwio Folly::folly fmt::fmt xsimd) diff --git a/velox/expression/CMakeLists.txt b/velox/expression/CMakeLists.txt index 011f11a93f9a..548e47720a85 100644 --- a/velox/expression/CMakeLists.txt +++ b/velox/expression/CMakeLists.txt @@ -20,8 +20,11 @@ velox_add_library(velox_expression_functions FunctionSignature.cpp SignatureBinder.cpp ReverseSignatureBinder.cpp) velox_link_libraries( - velox_expression_functions velox_common_base velox_type_calculation - velox_type_signature velox_signature_parser) + velox_expression_functions + velox_common_base + velox_type_calculation + velox_type_signature + velox_signature_parser) velox_add_library( velox_expression diff --git a/velox/expression/type_calculation/CMakeLists.txt b/velox/expression/type_calculation/CMakeLists.txt index 0d56b7365828..0c0a3b114b1c 100644 --- a/velox/expression/type_calculation/CMakeLists.txt +++ b/velox/expression/type_calculation/CMakeLists.txt @@ -35,6 +35,9 @@ endif() include_directories(${PROJECT_BINARY_DIR}) include_directories(${FLEX_INCLUDE_DIRS}) velox_add_library( - velox_type_calculation ${BISON_TypeCalculationParser_OUTPUTS} - ${FLEX_TypeCalculationScanner_OUTPUTS} Scanner.h TypeCalculation.h) + velox_type_calculation + ${BISON_TypeCalculationParser_OUTPUTS} + ${FLEX_TypeCalculationScanner_OUTPUTS} + Scanner.h + TypeCalculation.h) velox_link_libraries(velox_type_calculation velox_common_base) diff --git a/velox/functions/CMakeLists.txt b/velox/functions/CMakeLists.txt index 80f434d19f43..77e5f83428d5 100644 --- a/velox/functions/CMakeLists.txt +++ b/velox/functions/CMakeLists.txt @@ -14,8 +14,12 @@ velox_add_library(velox_function_registry FunctionRegistry.cpp) velox_add_library(velox_coverage_util CoverageUtil.cpp) -velox_link_libraries(velox_function_registry velox_expression velox_type - velox_core velox_exception) +velox_link_libraries( + velox_function_registry + velox_expression + velox_type + velox_core + velox_exception) velox_link_libraries(velox_coverage_util velox_function_registry) add_subdirectory(lib) if(${VELOX_ENABLE_PRESTO_FUNCTIONS}) diff --git a/velox/functions/lib/CMakeLists.txt b/velox/functions/lib/CMakeLists.txt index 0c13fbeea77d..26c40c68b275 100644 --- a/velox/functions/lib/CMakeLists.txt +++ b/velox/functions/lib/CMakeLists.txt @@ -21,8 +21,8 @@ velox_add_library(velox_functions_util LambdaFunctionUtil.cpp velox_link_libraries(velox_functions_util velox_vector velox_common_base) -velox_add_library(velox_functions_lib_date_time_formatter - DateTimeFormatter.cpp DateTimeFormatterBuilder.cpp) +velox_add_library(velox_functions_lib_date_time_formatter DateTimeFormatter.cpp + DateTimeFormatterBuilder.cpp) velox_link_libraries(velox_functions_lib_date_time_formatter velox_type_tz) @@ -39,8 +39,12 @@ velox_add_library( SubscriptUtil.cpp TimeUtils.cpp) -velox_link_libraries(velox_functions_lib velox_functions_util velox_vector - re2::re2 Folly::folly) +velox_link_libraries( + velox_functions_lib + velox_functions_util + velox_vector + re2::re2 + Folly::folly) add_subdirectory(aggregates) add_subdirectory(string) diff --git a/velox/functions/lib/aggregates/CMakeLists.txt b/velox/functions/lib/aggregates/CMakeLists.txt index db173c790ade..e3d04ab8333d 100644 --- a/velox/functions/lib/aggregates/CMakeLists.txt +++ b/velox/functions/lib/aggregates/CMakeLists.txt @@ -13,8 +13,11 @@ # limitations under the License. velox_add_library( - velox_functions_aggregates AverageAggregateBase.cpp - CentralMomentsAggregatesBase.cpp SingleValueAccumulator.cpp ValueList.cpp + velox_functions_aggregates + AverageAggregateBase.cpp + CentralMomentsAggregatesBase.cpp + SingleValueAccumulator.cpp + ValueList.cpp ValueSet.cpp) velox_link_libraries(velox_functions_aggregates velox_exec diff --git a/velox/functions/lib/string/CMakeLists.txt b/velox/functions/lib/string/CMakeLists.txt index 4afc5efad414..a64902a30f68 100644 --- a/velox/functions/lib/string/CMakeLists.txt +++ b/velox/functions/lib/string/CMakeLists.txt @@ -14,7 +14,7 @@ velox_add_library(velox_functions_string INTERFACE) velox_link_libraries(velox_functions_string INTERFACE velox_exception - Folly::folly) + Folly::folly) if(${VELOX_BUILD_TESTING}) add_subdirectory(tests) diff --git a/velox/functions/lib/window/CMakeLists.txt b/velox/functions/lib/window/CMakeLists.txt index f359687d20af..9594f3814569 100644 --- a/velox/functions/lib/window/CMakeLists.txt +++ b/velox/functions/lib/window/CMakeLists.txt @@ -12,8 +12,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -velox_add_library(velox_functions_window NthValue.cpp Ntile.cpp Rank.cpp - RowNumber.cpp) +velox_add_library( + velox_functions_window + NthValue.cpp + Ntile.cpp + Rank.cpp + RowNumber.cpp) velox_link_libraries(velox_functions_window velox_buffer velox_exec Folly::folly) diff --git a/velox/functions/prestosql/json/CMakeLists.txt b/velox/functions/prestosql/json/CMakeLists.txt index c85d41b9c8f0..20f4ef810a72 100644 --- a/velox/functions/prestosql/json/CMakeLists.txt +++ b/velox/functions/prestosql/json/CMakeLists.txt @@ -11,8 +11,12 @@ # 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_functions_json JsonExtractor.cpp JsonPathTokenizer.cpp - SIMDJsonExtractor.cpp SIMDJsonUtil.cpp) +velox_add_library( + velox_functions_json + JsonExtractor.cpp + JsonPathTokenizer.cpp + SIMDJsonExtractor.cpp + SIMDJsonUtil.cpp) velox_link_libraries(velox_functions_json velox_exception Folly::folly simdjson::simdjson) diff --git a/velox/functions/prestosql/types/CMakeLists.txt b/velox/functions/prestosql/types/CMakeLists.txt index 43b7bc6e6b2e..dc7c6b9c6348 100644 --- a/velox/functions/prestosql/types/CMakeLists.txt +++ b/velox/functions/prestosql/types/CMakeLists.txt @@ -11,11 +11,20 @@ # 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_presto_types HyperLogLogType.cpp JsonType.cpp - TimestampWithTimeZoneType.cpp UuidType.cpp) +velox_add_library( + velox_presto_types + HyperLogLogType.cpp + JsonType.cpp + TimestampWithTimeZoneType.cpp + UuidType.cpp) -velox_link_libraries(velox_presto_types velox_memory velox_expression velox_functions_util - velox_functions_json velox_functions_lib_date_time_formatter) +velox_link_libraries( + velox_presto_types + velox_memory + velox_expression + velox_functions_util + velox_functions_json + velox_functions_lib_date_time_formatter) if(${VELOX_BUILD_TESTING}) add_subdirectory(tests) diff --git a/velox/functions/prestosql/window/CMakeLists.txt b/velox/functions/prestosql/window/CMakeLists.txt index 97221e469c0c..2fa0b2f04f3c 100644 --- a/velox/functions/prestosql/window/CMakeLists.txt +++ b/velox/functions/prestosql/window/CMakeLists.txt @@ -15,8 +15,16 @@ if(${VELOX_BUILD_TESTING}) add_subdirectory(tests) endif() -velox_add_library(velox_window CumeDist.cpp FirstLastValue.cpp LeadLag.cpp - WindowFunctionsRegistration.cpp) +velox_add_library( + velox_window + CumeDist.cpp + FirstLastValue.cpp + LeadLag.cpp + WindowFunctionsRegistration.cpp) -velox_link_libraries(velox_window velox_buffer velox_exec - velox_functions_window Folly::folly) +velox_link_libraries( + velox_window + velox_buffer + velox_exec + velox_functions_window + Folly::folly) diff --git a/velox/functions/remote/client/CMakeLists.txt b/velox/functions/remote/client/CMakeLists.txt index 2f830daeb279..afb1722733ef 100644 --- a/velox/functions/remote/client/CMakeLists.txt +++ b/velox/functions/remote/client/CMakeLists.txt @@ -13,18 +13,17 @@ # limitations under the License. velox_add_library(velox_functions_remote_thrift_client ThriftClient.cpp) -velox_link_libraries(velox_functions_remote_thrift_client PUBLIC - velox_remote_function_thrift FBThrift::thriftcpp2) +velox_link_libraries(velox_functions_remote_thrift_client + PUBLIC velox_remote_function_thrift FBThrift::thriftcpp2) velox_add_library(velox_functions_remote Remote.cpp) velox_link_libraries( velox_functions_remote - PUBLIC - velox_expression - velox_functions_remote_thrift_client - velox_functions_remote_get_serde - velox_type_fbhive - Folly::folly) + PUBLIC velox_expression + velox_functions_remote_thrift_client + velox_functions_remote_get_serde + velox_type_fbhive + Folly::folly) if(${VELOX_BUILD_TESTING}) add_subdirectory(tests) diff --git a/velox/functions/remote/if/CMakeLists.txt b/velox/functions/remote/if/CMakeLists.txt index da46b340708b..12b3656382d3 100644 --- a/velox/functions/remote/if/CMakeLists.txt +++ b/velox/functions/remote/if/CMakeLists.txt @@ -21,5 +21,6 @@ target_compile_options(velox_remote_function_thrift PRIVATE -Wno-deprecated-declarations) velox_add_library(velox_functions_remote_get_serde GetSerde.cpp) -velox_link_libraries(velox_functions_remote_get_serde PUBLIC - velox_remote_function_thrift velox_presto_serializer) +velox_link_libraries( + velox_functions_remote_get_serde PUBLIC velox_remote_function_thrift + velox_presto_serializer) diff --git a/velox/functions/sparksql/aggregates/CMakeLists.txt b/velox/functions/sparksql/aggregates/CMakeLists.txt index 85e5cf189343..b4b965d432e3 100644 --- a/velox/functions/sparksql/aggregates/CMakeLists.txt +++ b/velox/functions/sparksql/aggregates/CMakeLists.txt @@ -24,8 +24,13 @@ velox_add_library( RegrReplacementAggregate.cpp SumAggregate.cpp) -velox_link_libraries(velox_functions_spark_aggregates fmt::fmt velox_exec - velox_expression_functions velox_aggregates velox_vector) +velox_link_libraries( + velox_functions_spark_aggregates + fmt::fmt + velox_exec + velox_expression_functions + velox_aggregates + velox_vector) if(${VELOX_BUILD_TESTING}) add_subdirectory(tests) diff --git a/velox/functions/sparksql/specialforms/CMakeLists.txt b/velox/functions/sparksql/specialforms/CMakeLists.txt index 2b5a11697e73..e134309b7b5e 100644 --- a/velox/functions/sparksql/specialforms/CMakeLists.txt +++ b/velox/functions/sparksql/specialforms/CMakeLists.txt @@ -12,8 +12,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -velox_add_library(velox_functions_spark_specialforms DecimalRound.cpp - MakeDecimal.cpp SparkCastExpr.cpp SparkCastHooks.cpp) +velox_add_library( + velox_functions_spark_specialforms + DecimalRound.cpp + MakeDecimal.cpp + SparkCastExpr.cpp + SparkCastHooks.cpp) velox_link_libraries(velox_functions_spark_specialforms fmt::fmt velox_expression) diff --git a/velox/functions/sparksql/window/CMakeLists.txt b/velox/functions/sparksql/window/CMakeLists.txt index de96547f0710..0aac94596717 100644 --- a/velox/functions/sparksql/window/CMakeLists.txt +++ b/velox/functions/sparksql/window/CMakeLists.txt @@ -13,8 +13,12 @@ # limitations under the License. velox_add_library(velox_functions_spark_window WindowFunctionsRegistration.cpp) -velox_link_libraries(velox_functions_spark_window velox_buffer velox_exec - velox_functions_window Folly::folly) +velox_link_libraries( + velox_functions_spark_window + velox_buffer + velox_exec + velox_functions_window + Folly::folly) if(${VELOX_BUILD_TESTING}) add_subdirectory(tests) diff --git a/velox/parse/CMakeLists.txt b/velox/parse/CMakeLists.txt index 1089118b5eae..75a5e835933c 100644 --- a/velox/parse/CMakeLists.txt +++ b/velox/parse/CMakeLists.txt @@ -12,16 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. velox_add_library(velox_parse_expression Expressions.cpp) -velox_link_libraries(velox_parse_expression velox_type velox_parse_utils - velox_expression velox_exec) +velox_link_libraries( + velox_parse_expression + velox_type + velox_parse_utils + velox_expression + velox_exec) velox_add_library(velox_parse_parser ExpressionsParser.cpp QueryPlanner.cpp) velox_link_libraries(velox_parse_parser velox_parse_expression velox_type velox_duckdb_parser) velox_add_library(velox_parse_utils TypeResolver.cpp) -velox_link_libraries(velox_parse_utils velox_buffer velox_type velox_vector - velox_function_registry) +velox_link_libraries( + velox_parse_utils + velox_buffer + velox_type + velox_vector + velox_function_registry) if(${VELOX_BUILD_TESTING}) add_subdirectory(tests) diff --git a/velox/type/tz/CMakeLists.txt b/velox/type/tz/CMakeLists.txt index d7c0de7a8cb3..03f3c8297859 100644 --- a/velox/type/tz/CMakeLists.txt +++ b/velox/type/tz/CMakeLists.txt @@ -17,5 +17,9 @@ endif() velox_add_library(velox_type_tz TimeZoneMap.h TimeZoneDatabase.cpp TimeZoneMap.cpp) -velox_link_libraries(velox_type_tz velox_exception Boost::regex fmt::fmt - Folly::folly) +velox_link_libraries( + velox_type_tz + velox_exception + Boost::regex + fmt::fmt + Folly::folly) diff --git a/velox/vector/CMakeLists.txt b/velox/vector/CMakeLists.txt index 4f9656c3bfb8..2f8450565950 100644 --- a/velox/vector/CMakeLists.txt +++ b/velox/vector/CMakeLists.txt @@ -30,8 +30,13 @@ velox_add_library( VectorSaver.cpp VectorStream.cpp) -velox_link_libraries(velox_vector velox_encode velox_memory velox_time - velox_type velox_buffer) +velox_link_libraries( + velox_vector + velox_encode + velox_memory + velox_time + velox_type + velox_buffer) add_subdirectory(arrow) add_subdirectory(fuzzer) diff --git a/velox/vector/arrow/CMakeLists.txt b/velox/vector/arrow/CMakeLists.txt index 810d5abac557..ed3733205fbf 100644 --- a/velox/vector/arrow/CMakeLists.txt +++ b/velox/vector/arrow/CMakeLists.txt @@ -13,8 +13,12 @@ # limitations under the License. velox_add_library(velox_arrow_bridge Bridge.cpp) -velox_link_libraries(velox_arrow_bridge velox_memory velox_type velox_buffer - velox_exception) +velox_link_libraries( + velox_arrow_bridge + velox_memory + velox_type + velox_buffer + velox_exception) if(VELOX_BUILD_TESTING AND VELOX_ENABLE_ARROW) add_subdirectory(tests)