diff --git a/.github/actions/setup-rust/action.yml b/.github/actions/setup-rust/action.yml index 4116a71ce9..1a6942404f 100644 --- a/.github/actions/setup-rust/action.yml +++ b/.github/actions/setup-rust/action.yml @@ -32,6 +32,13 @@ runs: echo "RUSTC_WRAPPER=sccache" >> $GITHUB_ENV echo "CARGO_INCREMENTAL=0" >> $GITHUB_ENV + - name: Download flatc + shell: bash + run: | + curl -sL https://github.com/google/flatbuffers/releases/download/v24.3.25/Linux.flatc.binary.clang++-15.zip > ${{ runner.temp }}/flatc.zip + unzip ${{ runner.temp }}/flatc.zip -d ${{ runner.temp }}/flatc + echo "PATH=${{ runner.temp }}/flatc:$PATH" >> $GITHUB_ENV + - name: Export Path shell: bash run: echo "PATH=$PATH" >> $GITHUB_ENV diff --git a/Cargo.lock b/Cargo.lock index 1818342891..fec0c1439c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1115,7 +1115,6 @@ name = "build-vortex" version = "0.1.0" dependencies = [ "cargo_metadata 0.18.1", - "flatc", "prost-build", "walkdir", ] @@ -1381,15 +1380,6 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" -[[package]] -name = "cmake" -version = "0.1.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" -dependencies = [ - "cc", -] - [[package]] name = "comfy-table" version = "7.1.1" @@ -2212,15 +2202,6 @@ dependencies = [ "rustc_version", ] -[[package]] -name = "flatc" -version = "0.2.2+23.5.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4bba3050358223ece3d79720f9800139503b600e93b1d68493500a2d8c3721e" -dependencies = [ - "cmake", -] - [[package]] name = "flate2" version = "1.0.30" @@ -5684,7 +5665,7 @@ dependencies = [ "build-vortex", "criterion", "enum-iterator", - "flatbuffers 23.5.26", + "flatbuffers 24.3.25", "flexbuffers", "futures-util", "getrandom", @@ -5751,7 +5732,7 @@ name = "vortex-dtype" version = "0.1.0" dependencies = [ "build-vortex", - "flatbuffers 23.5.26", + "flatbuffers 24.3.25", "half", "itertools 0.13.0", "num-traits", @@ -5768,7 +5749,7 @@ name = "vortex-error" version = "0.1.0" dependencies = [ "arrow-schema 51.0.0", - "flatbuffers 23.5.26", + "flatbuffers 24.3.25", "flexbuffers", "parquet", "thiserror", @@ -5811,7 +5792,7 @@ dependencies = [ name = "vortex-flatbuffers" version = "0.1.0" dependencies = [ - "flatbuffers 23.5.26", + "flatbuffers 24.3.25", ] [[package]] @@ -5827,7 +5808,7 @@ dependencies = [ "bytes", "criterion", "derive_builder", - "flatbuffers 23.5.26", + "flatbuffers 24.3.25", "futures-executor", "futures-util", "itertools 0.13.0", @@ -5881,7 +5862,7 @@ version = "0.1.0" dependencies = [ "build-vortex", "datafusion-common 39.0.0", - "flatbuffers 23.5.26", + "flatbuffers 24.3.25", "flexbuffers", "itertools 0.13.0", "num-traits", diff --git a/Cargo.toml b/Cargo.toml index 9114f6fb61..e629a5e8f8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -64,8 +64,7 @@ duckdb = { version = "0.10.1", features = ["bundled"] } enum-iterator = "2.0.0" enum_dispatch = "0.3.13" fallible-iterator = "0.3.0" -flatbuffers = "23.5.26" -flatc = "0.2.2" +flatbuffers = "24.3.25" flexbuffers = "2.0.0" fs_extra = "1.3.0" futures = { version = "0.3.30", default-features = false } diff --git a/README.md b/README.md index 825c0a5ff0..384ff32aed 100644 --- a/README.md +++ b/README.md @@ -169,6 +169,13 @@ git submodule update --init --recursive rye sync ``` +You will also need to install flatbuffer compiler (flatc): + +### Mac +```bash +brew install flatbuffers +``` + ## License Licensed under the Apache License, Version 2.0 (the "License"). diff --git a/build-vortex/Cargo.toml b/build-vortex/Cargo.toml index a90ceaf7bc..45df92dbba 100644 --- a/build-vortex/Cargo.toml +++ b/build-vortex/Cargo.toml @@ -12,7 +12,6 @@ rust-version.workspace = true [dependencies] cargo_metadata = { workspace = true } -flatc = { workspace = true } prost-build = { workspace = true } walkdir = { workspace = true } diff --git a/build-vortex/src/lib.rs b/build-vortex/src/lib.rs index 49b15e6797..16c9e121d1 100644 --- a/build-vortex/src/lib.rs +++ b/build-vortex/src/lib.rs @@ -5,7 +5,6 @@ use std::path::{Path, PathBuf}; use std::process::Command; use cargo_metadata::MetadataCommand; -use flatc::flatc; use walkdir::WalkDir; fn manifest_dir() -> PathBuf { @@ -66,7 +65,7 @@ pub fn build_flatbuffers() { let flatbuffers_dir = manifest_dir().join("flatbuffers"); let fbs_files = walk_files(&flatbuffers_dir, "fbs"); check_call( - Command::new(flatc()) + Command::new("flatc") .arg("--rust") .arg("--filename-suffix") .arg("")