Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 7 additions & 11 deletions .github/workflows/rust-instrumented.yml
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ jobs:
- sanitizer: tsan
sanitizer_flags: "-Zsanitizer=thread"
name: "Rust/C++ FFI tests (${{ matrix.sanitizer }})"
timeout-minutes: 30
timeout-minutes: 5
env:
ASAN_OPTIONS: "symbolize=1:check_initialization_order=1:detect_leaks=1:leak_check_at_exit=1"
LSAN_OPTIONS: "report_objects=1"
Expand All @@ -217,9 +217,6 @@ jobs:
sccache: s3
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
- uses: ./.github/actions/setup-prebuild
- name: Install rustfilt
run: |
cargo install rustfilt
- name: Install Rust nightly toolchain
run: |
rustup toolchain install $NIGHTLY_TOOLCHAIN
Expand All @@ -241,8 +238,7 @@ jobs:
- name: Run tests
run: |
set -o pipefail
# re-enable once we can fix this hang
# ./vortex-ffi/build/test/vortex_ffi_test 2>&1 | rustfilt
./vortex-ffi/build/test/vortex_ffi_test
- name: Run examples
run: |
set -o pipefail
Expand All @@ -251,11 +247,11 @@ jobs:
# error: Unable to walk dir: File system loop found
rm -fr vortex-ffi/build/_deps/nanoarrow-src/python

./vortex-ffi/build/examples/write_sample file.vortex 2>&1 | rustfilt
./vortex-ffi/build/examples/write_sample file2.vortex 2>&1 | rustfilt
./vortex-ffi/build/examples/dtype '*.vortex' 2>&1 | rustfilt
./vortex-ffi/build/examples/scan '*.vortex' 2>&1 | rustfilt
./vortex-ffi/build/examples/scan_to_arrow '*.vortex' 2>&1 | rustfilt
./vortex-ffi/build/examples/write_sample file.vortex
./vortex-ffi/build/examples/write_sample file2.vortex
./vortex-ffi/build/examples/dtype '*.vortex'
./vortex-ffi/build/examples/scan '*.vortex'
./vortex-ffi/build/examples/scan_to_arrow '*.vortex'

miri:
name: "Rust tests (miri)"
Expand Down
6 changes: 3 additions & 3 deletions vortex-ffi/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Vortex C interface
# Vortex C bindings

## Updating Headers

Expand All @@ -20,7 +20,7 @@ target_link_libraries(my_target, vortex_ffi_shared)
# or target_link_libraries(my_target, vortex_ffi)
```

## Running C examples:
## Running C examples

```sh
cmake -Bbuild -DBUILD_EXAMPLES=1
Expand Down Expand Up @@ -99,7 +99,7 @@ cargo +nightly build -Zbuild-std --target=<target triple> \
2. Build tests with target triple:

```sh
cmake -Bbuild -DWITH_ASAN=1 -DTARGET_TRIPLE=<target triple>
cmake -Bbuild -DSANITIZER=asan -DTARGET_TRIPLE=<target triple>
Comment thread
0ax1 marked this conversation as resolved.
```

3. Run the tests (ctest doesn't output failures in detail):
Expand Down
6 changes: 4 additions & 2 deletions vortex-ffi/cbindgen.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@ header = """
#pragma once
#include <stdint.h>

//
// THIS FILE IS AUTO-GENERATED, DO NOT MAKE EDITS DIRECTLY
//

// All operations return owned types which need to be freed by calling a
// matching _free() function. This includes all arrays, data sources, scans,
// errors, error messages, and other allocated objects.

// https://arrow.apache.org/docs/format/CDataInterface.html#structure-definitions
// If you want to use your own Arrow library like nanoarrow, define this macro
Expand Down
Loading
Loading