wip: D7 cleanup

Author: jainxrohit

velox/dwio/nimble/CMakeLists.txt

@@ -12,38 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Nimble has two entry points: the Velox build reaches it through
-# velox/dwio/CMakeLists.txt when VELOX_ENABLE_NIMBLE=ON, and the standalone
-# Nimble repository builds Velox as a submodule and adds this directory
-# directly. Dependency resolution and option handling therefore live here, so
-# both entry points configure Nimble identically.
+# Nimble is reached only through velox/dwio/CMakeLists.txt when
+# VELOX_ENABLE_NIMBLE=ON. FlatBuffers, OpenZL and the vendored FSST are all
+# resolved by the top-level Velox CMakeLists before this point, so this file
+# only configures what is specific to Nimble.
 
-# FlatBuffers is not a Velox dependency; Nimble is its only consumer.
-find_package(flatbuffers QUIET)
-set(NIMBLE_NEED_BUNDLED_BUILD_FLAT_BUFFERS FALSE)
-if(flatbuffers_FOUND)
-  if(flatbuffers_VERSION VERSION_LESS "22.9.4")
-    set(NIMBLE_NEED_BUNDLED_BUILD_FLAT_BUFFERS TRUE)
-  endif()
-else()
-  # Fallback to old FlatBuffers (< 2.0.0), which used a capitalised name.
-  find_package(Flatbuffers QUIET)
-  if(NOT Flatbuffers_FOUND)
-    message(
-      FATAL_ERROR
-      "Nimble requires FlatBuffers, which was not found. Install it (the "
-      "scripts/setup-*.sh scripts do this) or reconfigure with "
-      "-DVELOX_ENABLE_NIMBLE=OFF."
-    )
-  endif()
-  set(NIMBLE_NEED_BUNDLED_BUILD_FLAT_BUFFERS TRUE)
-endif()
-if(NIMBLE_NEED_BUNDLED_BUILD_FLAT_BUFFERS)
-  # Old FlatBuffers (< 22.9.4) doesn't provide build_flatbuffers(). So we will
-  # use the bundled one. We can remove CMake/BuildFlatBuffers once we drop
-  # support for FlatBuffers < 22.9.4.
-  include(BuildFlatBuffers)
-endif()
 # Nimble code expects an upper case suffix to the generated file.
 set(FLATBUFFERS_FLATC_SCHEMA_EXTRA_ARGS "--filename-suffix" "Generated")
 
@@ -54,13 +27,6 @@ if(NOT TARGET absl::flat_hash_map)
   velox_resolve_dependency(absl)
 endif()
 
-# The standalone Nimble build vendors OpenZL as a git submodule and has already
-# added it by this point; the Velox build fetches it instead.
-if(NOT TARGET openzl_cpp)
-  velox_set_source(openzl)
-  velox_resolve_dependency(openzl)
-endif()
-
 # Nimble's OSS build has no access to the Meta-internal compressor. This is read
 # by widely included headers (compression/CompressionPolicy.h,
 # encodings/legacy/EncodingSelectionPolicy.h), so every translation unit that
@@ -83,9 +49,8 @@ if(VELOX_MONO_LIBRARY AND TARGET velox)
   endif()
 endif()
 
-# Nimble builds its own tests even when the surrounding Velox build has testing
-# disabled: the standalone repo sets VELOX_BUILD_MINIMAL_WITH_DWIO=ON, which
-# forces VELOX_BUILD_TESTING=OFF, yet still needs `make unittest` to work.
+# Nimble's tests follow Velox's testing switch. The separate variable is kept so
+# a build can opt into Nimble's tests alone.
 if(NOT DEFINED NIMBLE_BUILD_TESTING)
   set(NIMBLE_BUILD_TESTING ${VELOX_BUILD_TESTING})
 endif()

velox/dwio/nimble/compression/CMakeLists.txt

@@ -25,6 +25,6 @@ target_link_libraries(
   nimble_common
   Folly::folly
   lz4
-  openzl
-  openzl_cpp
+  OpenZL::openzl
+  OpenZL::openzl_cpp
 )

velox/dwio/nimble/encodings/CMakeLists.txt

@@ -43,44 +43,22 @@ add_library(
   views/HuffmanEncodingView.h
 )
 
-set(FSST_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../../third-party/fsst")
-if(NOT TARGET fsst AND EXISTS "${FSST_SOURCE_DIR}/CMakeLists.txt")
-  add_subdirectory("${FSST_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/fsst")
-endif()
-if(NOT TARGET fsst)
-  include(FetchContent)
-  FetchContent_Declare(
-    fsst
-    GIT_REPOSITORY https://github.com/cwida/fsst.git
-    GIT_TAG 50dd308befd5121bd1121428a833f42cce6e1f9d
-  )
-  FetchContent_MakeAvailable(fsst)
-  set(FSST_SOURCE_DIR "${fsst_SOURCE_DIR}")
-endif()
-
-if(TARGET fsst)
-  target_include_directories(fsst PUBLIC "${FSST_SOURCE_DIR}")
-  target_compile_definitions(
-    fsst
-    PRIVATE
-      fsst_create=nimble_fsst_create
-      fsst_duplicate=nimble_fsst_duplicate
-      fsst_export=nimble_fsst_export
-      fsst_destroy=nimble_fsst_destroy
-      fsst_import=nimble_fsst_import
-      fsst_decoder=nimble_fsst_decoder
-      fsst_compress=nimble_fsst_compress
-      fsst_decompress=nimble_fsst_decompress
-  )
-  if(TARGET binary)
-    set_target_properties(binary PROPERTIES EXCLUDE_FROM_ALL TRUE)
-  endif()
-  if(TARGET binary12)
-    set_target_properties(binary12 PROPERTIES EXCLUDE_FROM_ALL TRUE)
-  endif()
-else()
-  target_include_directories(nimble_encodings PUBLIC "${FSST_SOURCE_DIR}")
-endif()
+# FSST is vendored at velox/external/fsst and added by velox/CMakeLists.txt
+# before this directory, so the target always exists here. Nimble renames FSST's
+# exported symbols to avoid clashing with any other copy linked into the same
+# binary; PRIVATE keeps the renames on FSST's own translation units.
+target_compile_definitions(
+  fsst
+  PRIVATE
+    fsst_create=nimble_fsst_create
+    fsst_duplicate=nimble_fsst_duplicate
+    fsst_export=nimble_fsst_export
+    fsst_destroy=nimble_fsst_destroy
+    fsst_import=nimble_fsst_import
+    fsst_decoder=nimble_fsst_decoder
+    fsst_compress=nimble_fsst_compress
+    fsst_decompress=nimble_fsst_decompress
+)
 
 target_link_libraries(
   nimble_encodings