apply format to velox/

facebookincubator · Jun 11, 2024 · 72c885f · 72c885f
1 parent f94e3e6
commit 72c885f
Show file tree

Hide file tree

Showing 41 changed files with 379 additions and 200 deletions.
diff --git 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/base/CMakeLists.txt.rej b/velox/common/base/CMakeLists.txt.rej
@@ -0,0 +1,51 @@
+--- velox/common/base/CMakeLists.txt
++++ 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()
+   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
@@ -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/caching/CMakeLists.txt.rej b/velox/common/caching/CMakeLists.txt.rej
@@ -0,0 +1,31 @@
+--- velox/common/caching/CMakeLists.txt
++++ 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()
+   add_subdirectory(tests)
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)