misc: Sync upstream Velox main

.claude/CLAUDE.md

@@ -116,7 +116,8 @@ or lightweight dependencies, use `add_executable` / `add_test`.
 ## Formatting
 
 ```bash
-make format  # format all changed files
+pre-commit run --files <paths>  # format/lint specific files
+pre-commit run --all-files      # sweep the whole repo
 ```
 
 ## Coding Style

CMake/resolve_dependency_modules/README.md

@@ -32,18 +32,20 @@ by Velox. See details on bundling below.
 | fmt               | 11.2.0          | Yes      | Used API must be fmt 9 compatible |
 | simdjson          | 4.1.0           | Yes      ||
 | faiss             | 1.11.0          | Yes      ||
-| folly             | v2026.01.05.00  | Yes      ||
-| fizz              | v2026.01.05.00  | No       ||
-| wangle            | v2026.01.05.00  | No       ||
-| mvfst             | v2026.01.05.00  | No       ||
-| fbthrift          | v2026.01.05.00  | No       ||
+| folly             | v2026.07.13.00  | Yes      ||
+| fizz              | v2026.07.13.00  | No       ||
+| wangle            | v2026.07.13.00  | No       ||
+| mvfst             | v2026.07.13.00  | No       ||
+| fbthrift          | v2026.07.13.00  | No       ||
 | libstemmer        | 2.2.0           | Yes      ||
 | DuckDB (testing)  | 0.8.1           | Yes      ||
 | arrow             | 15.0.0          | Yes      ||
 | geos              | 3.10.7          | Yes      ||
 | s2geometry        | 0.12.0          | Yes      ||
 | fast_float        | v8.0.2          | Yes      ||
 | xxhash            | default         | No       ||
+| flatbuffers       | 24.3.25         | Yes      | Only with `VELOX_ENABLE_NIMBLE=ON`. `flatc` is required, not just the runtime. Held at the version cuDF expects |
+| openzl            | 6b48fa48        | Yes      | Only with `VELOX_ENABLE_NIMBLE=ON`. Pinned to a commit; no suitable release tag |
 
 # Bundled Dependency Management
 This module provides a dependency management system that allows us to automatically fetch and build dependencies from source if needed.

CMake/resolve_dependency_modules/flatbuffers.cmake

@@ -0,0 +1,71 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+include_guard(GLOBAL)
+
+# Held at the version cuDF expects; do not bump on its own. cuDF resolves
+# FlatBuffers through rapids_cpm_find(flatbuffers 24.3.25), which calls
+# find_package() before falling back to its own download, and FlatBuffers'
+# config-version file reports every newer version as compatible. Any later
+# version visible to that find_package() is therefore used in place of 24.3.25,
+# and cuDF's checked-in generated headers static_assert on major 24 / minor 3.
+# Nimble itself only requires 22.9.4 or later, for build_flatbuffers().
+set(VELOX_FLATBUFFERS_VERSION 24.3.25)
+set(
+  VELOX_FLATBUFFERS_BUILD_SHA256_CHECKSUM
+  4157c5cacdb59737c5d627e47ac26b140e9ee28b1102f812b36068aab728c1ed
+)
+string(
+  CONCAT
+  VELOX_FLATBUFFERS_SOURCE_URL
+  "https://github.com/google/flatbuffers/archive/refs/tags/"
+  "v${VELOX_FLATBUFFERS_VERSION}.tar.gz"
+)
+
+velox_resolve_dependency_url(FLATBUFFERS)
+
+message(STATUS "Building FlatBuffers from source")
+
+# The flatc code generator is required, not just the runtime library: Nimble
+# generates C++ headers from .fbs schemas at build time via build_flatbuffers().
+# This version exports it as the plain `flatc` target, which build_flatbuffers()
+# falls back to on its own, so there is no need to set
+# FLATBUFFERS_FLATC_EXECUTABLE here. FlatBuffers does set that variable itself,
+# but only in its own directory scope, so it never reaches Velox.
+set(FLATBUFFERS_BUILD_FLATC ON)
+set(FLATBUFFERS_BUILD_FLATLIB ON)
+set(FLATBUFFERS_BUILD_SHAREDLIB OFF)
+set(FLATBUFFERS_BUILD_FLATHASH OFF)
+set(FLATBUFFERS_BUILD_TESTS OFF)
+set(FLATBUFFERS_INSTALL OFF)
+
+FetchContent_Declare(
+  flatbuffers
+  URL ${VELOX_FLATBUFFERS_SOURCE_URL}
+  URL_HASH ${VELOX_FLATBUFFERS_BUILD_SHA256_CHECKSUM}
+  OVERRIDE_FIND_PACKAGE
+  SYSTEM
+  EXCLUDE_FROM_ALL
+)
+
+FetchContent_MakeAvailable(flatbuffers)
+
+# Consumers written against a system FlatBuffers use FLATBUFFERS_INCLUDE_DIR,
+# which only FindFlatBuffers.cmake defines. Export it for the bundled build too
+# so the same target_include_directories() call works either way.
+set(
+  FLATBUFFERS_INCLUDE_DIR
+  "${flatbuffers_SOURCE_DIR}/include"
+  CACHE INTERNAL
+  "FlatBuffers include directory"
+)

CMake/resolve_dependency_modules/folly/CMakeLists.txt

@@ -17,10 +17,10 @@ cmake_minimum_required(VERSION 3.28)
 velox_set_source(FastFloat)
 velox_resolve_dependency(FastFloat CONFIG REQUIRED)
 
-set(VELOX_FOLLY_BUILD_VERSION v2026.01.05.00)
+set(VELOX_FOLLY_BUILD_VERSION v2026.07.13.00)
 set(
   VELOX_FOLLY_BUILD_SHA256_CHECKSUM
-  8b41494b664fcde3d02f652d6a27381ec5e938ef58cf986d8ce4958d424af101
+  b2d4bc0029d466328e807efa673ad01c1086c385ffa800f2055543c3b9640a72
 )
 set(
   VELOX_FOLLY_SOURCE_URL
@@ -57,10 +57,6 @@ set(FOLLY_HAVE_INT128_T ON)
 
 FetchContent_MakeAvailable(folly)
 
-# Folly::folly is not valid for FC but we want to match FindFolly
-add_library(Folly::folly ALIAS folly)
-add_library(Folly::follybenchmark ALIAS follybenchmark)
-
 if(gflags_SOURCE STREQUAL "BUNDLED")
   add_dependencies(folly glog::glog gflags::gflags fmt::fmt)
 endif()

CMake/resolve_dependency_modules/folly/folly-no-export.patch

@@ -13,7 +13,7 @@
 # limitations under the License.
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -500,14 +500,14 @@ target_link_libraries(folly_test_util
+@@ -296,15 +296,15 @@ target_link_libraries(folly_test_util
  apply_folly_compile_options_to_target(folly_test_util)
  list(APPEND FOLLY_INSTALL_TARGETS folly_test_util)
 
@@ -22,6 +22,7 @@
 -  RUNTIME DESTINATION bin
 -  LIBRARY DESTINATION ${LIB_INSTALL_DIR}
 -  ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
+-
 -auto_install_files(folly ${FOLLY_DIR}
 -  ${hfiles}
 -)
@@ -30,13 +31,14 @@
 +#  RUNTIME DESTINATION bin
 +#  LIBRARY DESTINATION ${LIB_INSTALL_DIR}
 +#  ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
++#
 +#auto_install_files(folly ${FOLLY_DIR}
 +#  ${hfiles}
 +#)
  install(
    FILES ${CMAKE_CURRENT_BINARY_DIR}/folly/folly-config.h
    DESTINATION ${INCLUDE_INSTALL_DIR}/folly
-@@ -531,13 +531,13 @@ install(
+@@ -328,13 +328,13 @@ install(
    DESTINATION ${CMAKE_INSTALL_DIR}
    COMPONENT dev
  )

CMake/resolve_dependency_modules/openzl.cmake

@@ -0,0 +1,83 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+include_guard(GLOBAL)
+
+# Pinned to a raw commit rather than to the v0.2.0 tag, which predates both the
+# cross-platform zstd/xxhash dependency handling OpenZL needs to configure
+# cleanly here and the current descriptor API. The revision tracks what fbcode
+# builds Nimble against, so that velox/dwio/nimble compiles identically in both
+# trees; a pin older than fbcode's OpenZL breaks the internal build. OpenZL
+# ships from fbcode to GitHub, so there is no tag to follow. Keep in sync with
+# OPENZL_VERSION in scripts/setup-versions.sh, which installs the same revision
+# for builds that resolve OpenZL as a system package.
+set(VELOX_OPENZL_VERSION 7340a712cce1b8331bec3467600dba99a562e052)
+set(
+  VELOX_OPENZL_BUILD_SHA256_CHECKSUM
+  ace6a975c3bb28da0f211c86b3f172b427acec4a2044ab637e66649cb022a953
+)
+string(
+  CONCAT
+  VELOX_OPENZL_SOURCE_URL
+  "https://github.com/facebook/openzl/archive/"
+  "${VELOX_OPENZL_VERSION}.tar.gz"
+)
+
+velox_resolve_dependency_url(OPENZL)
+
+message(STATUS "Building OpenZL from source")
+
+# Only the core `openzl` and `openzl_cpp` libraries are consumed. Everything
+# else OpenZL can build pulls in dependencies Velox does not otherwise need.
+set(OPENZL_BUILD_CLI OFF)
+set(OPENZL_BUILD_EXAMPLES OFF)
+set(OPENZL_BUILD_TOOLS OFF)
+set(OPENZL_BUILD_CUSTOM_PARSERS OFF)
+set(OPENZL_BUILD_TESTS OFF)
+set(OPENZL_BUILD_BENCHMARKS OFF)
+set(OPENZL_BUILD_PYTHON_EXT OFF)
+set(OPENZL_INSTALL OFF)
+
+# OpenZL hard-codes CMAKE_CXX_STANDARD to 17, but Velox builds with C++20. Its
+# C++ bindings select between std:: types and internal polyfills (poly::span,
+# poly::source_location, poly::string_view, ...) at compile time via
+# feature-test macros in openzl/cpp/include/openzl/cpp/detail/Portability.hpp.
+# If openzl_cpp is compiled as C++17 while Velox consumes its headers as C++20,
+# the same poly:: aliases resolve to different underlying types on either side
+# of the ABI, producing mismatched mangled symbols and undefined-reference link
+# errors. The patch makes OpenZL honor an externally provided standard, so this
+# build inherits Velox's C++20 and scripts/setup-common.sh can install a
+# matching copy. The tarball is not a git repository, hence the `git init`.
+FetchContent_Declare(
+  openzl
+  URL ${VELOX_OPENZL_SOURCE_URL}
+  URL_HASH ${VELOX_OPENZL_BUILD_SHA256_CHECKSUM}
+  PATCH_COMMAND git init -q && git apply ${CMAKE_CURRENT_LIST_DIR}/openzl/openzl-cxx-standard.patch
+  OVERRIDE_FIND_PACKAGE
+  SYSTEM
+  EXCLUDE_FROM_ALL
+)
+
+# OpenZL's C++ bindings brace initialize several descriptor structs without
+# naming every member. TREAT_WARNINGS_AS_ERRORS puts -Werror into the global
+# CMAKE_CXX_FLAGS, which FetchContent subprojects inherit, so those become build
+# failures. Velox holds its own code to that standard, not its third party
+# dependencies. Relax just this warning while OpenZL is configured and restore
+# the flags afterwards, as duckdb and geos already do. Only the C++ bindings are
+# affected; -Werror is never added to CMAKE_C_FLAGS.
+set(PREVIOUS_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-missing-field-initializers")
+
+FetchContent_MakeAvailable(openzl)
+
+set(CMAKE_CXX_FLAGS ${PREVIOUS_CMAKE_CXX_FLAGS})

CMake/resolve_dependency_modules/openzl/openzl-cxx-standard.patch

@@ -0,0 +1,17 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -67,7 +67,13 @@
+ # ---- Compiler Settings ----
+ set(CMAKE_C_STANDARD 11)
+ set(CMAKE_C_STANDARD_REQUIRED ON)
+-set(CMAKE_CXX_STANDARD 17)
++# Honor an externally provided C++ standard so the C++ bindings compile at the
++# consumer's standard (Velox is C++20). OpenZL's poly:: types select between
++# std:: and internal polyfills by standard, so the bindings must be built at
++# the same standard the consumer uses to avoid mismatched mangled symbols.
++if(NOT DEFINED CMAKE_CXX_STANDARD)
++  set(CMAKE_CXX_STANDARD 17)
++endif()
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+ # ---- Platform Checks ----