Skip to content

[VL] [test] test FB thrift #10856

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

[VL] [test] test FB thrift #10856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e10d306
test fbthrift
JkSelf Oct 10, 2025
93ebcc5
tmp
JkSelf Oct 10, 2025
846a03f
tmp
JkSelf Oct 10, 2025
e8b588c
Fix the compile issue in gluten with fb thrift
JkSelf Oct 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions backends-velox/src/test/scala/org/apache/gluten/utils/MySharedLibraryLoader.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
package org.apache.gluten.utils

import org.apache.gluten.jni.JniLibLoader
import org.apache.gluten.spi.SharedLibraryLoader
import org.apache.gluten.spi.{SharedLibraryLoader => SpiSharedLibraryLoader}
import org.apache.gluten.utils.MySharedLibraryLoader.LOADED

import java.util.concurrent.atomic.AtomicBoolean

class MySharedLibraryLoader extends SharedLibraryLoader {
class MySharedLibraryLoader extends SpiSharedLibraryLoader {
override def accepts(osName: String, osVersion: String): Boolean = {
osName == "My OS" && osVersion == "1.0"
}
Expand Down
167 changes: 0 additions & 167 deletions cpp/CMake/FindThrift.cmake
View file
Open in desktop

This file was deleted.

14 changes: 14 additions & 0 deletions cpp/velox/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,20 @@ if(ENABLE_GPU)
PRIVATE ${VELOX_BUILD_PATH}/_deps/cudf-build/libcudf.so)
endif()

find_package(wangle REQUIRED)
# 查找 FBThrift
find_package(FBThrift REQUIRED)

# 链接 FBThrift 库
target_link_libraries(velox PUBLIC
FBThrift::thriftcpp2
FBThrift::thriftprotocol
)

target_link_libraries(
velox
PUBLIC ${VELOX_BUILD_PATH}/velox/dwio/parquet/thrift/libvelox_dwio_parquet_thrift_raw.a)

add_custom_command(
TARGET velox
POST_BUILD
Expand Down
2 changes: 1 addition & 1 deletion dev/buildbundle-veloxbe.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ check_supported

# SPARK_VERSION is defined in builddeps-veloxbe.sh
if [ "$SPARK_VERSION" = "ALL" ]; then
for spark_version in 3.2 3.3 3.4 3.5 4.0
for spark_version in 3.5
do
build_for_spark $spark_version
done
Expand Down
8 changes: 6 additions & 2 deletions dev/vcpkg/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,10 @@
"protobuf",
"benchmark",
"icu",
"thrift",
"fizz",
"wangle",
"mvfst",
{ "name": "fbthrift", "features": ["cpp2"]},
"libstemmer",
"geos"
]
Expand Down Expand Up @@ -113,6 +116,7 @@
},
"overrides": [
{ "name": "fmt", "version": "10.1.1" },
{ "name": "xsimd", "version": "10.0.0" }
{ "name": "xsimd", "version": "10.0.0" },
{ "name": "fbthrift", "version-date": "2025-09-15"}
]
}
4 changes: 2 additions & 2 deletions ep/build-velox/src/get_velox.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
set -exu

CURRENT_DIR=$(cd "$(dirname "$BASH_SOURCE")"; pwd)
VELOX_REPO=https://github.com/oap-project/velox.git
VELOX_BRANCH=2025_10_09
VELOX_REPO=https://github.com/JkSelf/velox.git
VELOX_BRANCH=fb-thrift
VELOX_HOME=""
RUN_SETUP_SCRIPT=ON
VELOX_ENHANCED_REPO=https://github.com/IBM/velox.git
Expand Down