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
@@ -135,7 +136,7 @@ are summarized below.
 - Comment every class, every non-trivial method, every member variable.
 - Do not restate the variable name. Either explain the semantic meaning or omit the comment.
   - ❌ `// A simple counter.` above `size_t count_{0};`
-- Avoid redundant comments that repeat what the code already says. Comments should explain *why*, not *what*.
+- Avoid redundant comments that repeat what the code already says. Comments should explain *why*, not *what*. "Why" means why the code is the way it is — the constraint or tradeoff a reader must respect. Not how it got that way: what the code used to be, why that was wrong, and which alternative was rejected belong in the commit message.
 - Use `// TODO: Description.` for future work. Do not include author's username.
 - Do not duplicate comments between `.h` and `.cpp`. Document the function in the header; the implementation should not repeat the same comment. Duplicated comments diverge over time.
 

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/cudf.cmake

@@ -17,48 +17,48 @@ include_guard(GLOBAL)
 # 4.0 is the minimum version required by cudf
 cmake_minimum_required(VERSION 4.0)
 
-# rapids_cmake commit 9c0829e from 2026-07-23 (release/26.08 branch)
-set(VELOX_rapids_cmake_VERSION 26.08)
-set(VELOX_rapids_cmake_COMMIT 9c0829ec73702b3df8a5c2ec43f6aaabe5f1e5ec)
+# rapids_cmake commit 5df8fd1 from 2026-09-08 (release/26.10 branch)
+set(VELOX_rapids_cmake_VERSION 26.10)
+set(VELOX_rapids_cmake_COMMIT 5df8fd1ea26515b6b50fa94844ef1855e457048c)
 set(
   VELOX_rapids_cmake_BUILD_SHA256_CHECKSUM
-  3582f621f3b3d63952aafd716985901a075f2ad85602073973f3619761723962
+  f7cb91451aeae915f066907f9ae4eb555348fb62db1857c205a67691816c78c3
 )
 set(
   VELOX_rapids_cmake_SOURCE_URL
   "https://github.com/rapidsai/rapids-cmake/archive/${VELOX_rapids_cmake_COMMIT}.tar.gz"
 )
 velox_resolve_dependency_url(rapids_cmake)
 
-# rmm commit 1a39f9e from 2026-07-24 (release/26.08 branch)
-set(VELOX_rmm_VERSION 26.08)
-set(VELOX_rmm_COMMIT 1a39f9e81c467b1a9522a4dcec8b5581ae165fef)
+# rmm commit 9a693e0 from 2026-09-10 (release/26.10 branch)
+set(VELOX_rmm_VERSION 26.10)
+set(VELOX_rmm_COMMIT 9a693e042004e1da9d2e2db018ce2c2963437d59)
 set(
   VELOX_rmm_BUILD_SHA256_CHECKSUM
-  d8b82bc491a2c5b093cdfb4e1fb99630ccf16d1cbd69bc74451fbb56efc3e68c
+  98916c2801fd9ad72eba8bb95ac45813ac933a4877d2d43445fa174402949063
 )
 set(VELOX_rmm_SOURCE_URL "https://github.com/rapidsai/rmm/archive/${VELOX_rmm_COMMIT}.tar.gz")
 velox_resolve_dependency_url(rmm)
 
-# kvikio commit 93606c0 from 2026-07-23 (release/26.08 branch)
-set(VELOX_kvikio_VERSION 26.08)
-set(VELOX_kvikio_COMMIT 93606c074f3d863a7052af25afae569f72cb3304)
+# kvikio commit 3ea0db0 from 2026-09-10 (release/26.10 branch)
+set(VELOX_kvikio_VERSION 26.10)
+set(VELOX_kvikio_COMMIT 3ea0db06a308925097e6fe84628f5888efca13b8)
 set(
   VELOX_kvikio_BUILD_SHA256_CHECKSUM
-  882e1b7c8950c0bf3520c3c317b0d85da2c91b66d90f3ff44ae81a60166979f3
+  b2c8418ef8eba3f08c4dcb859b3df44711b5ae5cbbf85fc8c5c09992bfb1f9bc
 )
 set(
   VELOX_kvikio_SOURCE_URL
   "https://github.com/rapidsai/kvikio/archive/${VELOX_kvikio_COMMIT}.tar.gz"
 )
 velox_resolve_dependency_url(kvikio)
 
-# cudf commit 5beaa59 from 2026-07-27 (release/26.08 branch)
-set(VELOX_cudf_VERSION 26.08 CACHE STRING "cudf version")
-set(VELOX_cudf_COMMIT 5beaa5954688fcb12236ffb434e192ea2c77db30)
+# cudf commit 456580f from 2026-09-11 (release/26.10 branch)
+set(VELOX_cudf_VERSION 26.10 CACHE STRING "cudf version")
+set(VELOX_cudf_COMMIT 456580fcdd726380dcb3de6b9686e7d47d6dd0a2)
 set(
   VELOX_cudf_BUILD_SHA256_CHECKSUM
-  1fc77d1ddf97ede67b783bbabacf69d658254be30b2859299f4255525443b1d3
+  160ff8be040c434c9f51fe3e41f08d26421c41710a8adabe559b1f994ad06959
 )
 set(VELOX_cudf_SOURCE_URL "https://github.com/rapidsai/cudf/archive/${VELOX_cudf_COMMIT}.tar.gz")
 velox_resolve_dependency_url(cudf)
@@ -72,14 +72,17 @@ if(UCX_LIBRARY AND UCX_INCLUDE_DIR)
 else()
   set(UCX_FOUND FALSE)
 endif()
-if(UCX_FOUND)
+# Configuring cuDF can overwrite UCX_FOUND before ucxx is declared below.
+# Preserve this outer probe so a detected UCX installation always fetches ucxx.
+set(VELOX_cudf_UCX_FOUND ${UCX_FOUND})
+if(VELOX_cudf_UCX_FOUND)
   message(STATUS "Found UCX: ${UCX_LIBRARY} (headers: ${UCX_INCLUDE_DIR}) -- ucxx will be fetched")
-  # ucxx commit b7faed1 from 2026-07-23 (release/0.51 branch)
-  set(VELOX_ucxx_VERSION 0.51)
-  set(VELOX_ucxx_COMMIT b7faed1a2e8038f63676183cdb056c3b69daa15d)
+  # ucxx commit 22d9c90 from 2026-09-09 (release/0.52 branch)
+  set(VELOX_ucxx_VERSION 0.52)
+  set(VELOX_ucxx_COMMIT 22d9c90a40055d439c3ec58f2606f2af620c5d71)
   set(
     VELOX_ucxx_BUILD_SHA256_CHECKSUM
-    3eb5ff5459dde31edf344f24f0b3086550be70961038b69229b05973b6f37524
+    cfb042ede89913744033aadacbe6768700a8ee8fe357cb80cbf47f14c9d4df5c
   )
   set(VELOX_ucxx_SOURCE_URL "https://github.com/rapidsai/ucxx/archive/${VELOX_ucxx_COMMIT}.tar.gz")
   velox_resolve_dependency_url(ucxx)
@@ -93,17 +96,10 @@ block(SCOPE_FOR VARIABLES)
   set(BUILD_TESTS OFF)
   set(CUDF_BUILD_TESTUTIL OFF)
   set(CUDF_BUILD_STREAMS_TEST_UTIL OFF)
+  # Keep spdlog/nvcomp shared to avoid multiple copies of spdlog in the final binary.
+  set(CUDF_BUILD_STATIC_DEPS OFF)
   set(BUILD_SHARED_LIBS ON)
-
-  # TODO(mh,bd): Remove this once we have a permanent solution for the spdlog/fmt
-  # incompatibility.
-
-  # cuDF (via rapids_logger) pins spdlog 1.14.1, which is incompatible with
-  # the fmt 11.2.0 that Velox builds. Override the rapids-cmake/CPM spdlog
-  # version to 1.15.3, which is fmt 11.2 compatible.
-  # RAPIDS_CMAKE_CPM_OVERRIDE_VERSION_FILE is honored by every rapids_cpm_init,
-  # so the override applies before rapids_logger fetches spdlog.
-  set(RAPIDS_CMAKE_CPM_OVERRIDE_VERSION_FILE "${CMAKE_CURRENT_LIST_DIR}/cudf-cpm-overrides.json")
+  set(KvikIO_BUILD_NSYS_PLUGIN OFF)
 
   FetchContent_Declare(
     rapids-cmake
@@ -139,7 +135,7 @@ block(SCOPE_FOR VARIABLES)
     UPDATE_DISCONNECTED 1
   )
 
-  if(UCX_FOUND)
+  if(VELOX_cudf_UCX_FOUND)
     FetchContent_Declare(
       ucxx
       URL ${VELOX_ucxx_SOURCE_URL}
@@ -152,7 +148,7 @@ block(SCOPE_FOR VARIABLES)
 
   FetchContent_MakeAvailable(cudf)
 
-  if(UCX_FOUND)
+  if(VELOX_cudf_UCX_FOUND)
     FetchContent_MakeAvailable(ucxx)
   endif()
 
@@ -163,7 +159,6 @@ block(SCOPE_FOR VARIABLES)
     cudf
     PRIVATE -Wno-non-virtual-dtor -Wno-missing-field-initializers -Wno-deprecated-copy -Wno-restrict
   )
-
   unset(BUILD_SHARED_LIBS)
   unset(BUILD_TESTING CACHE)
 endblock()

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
  )