Skip to content

Commit ba92b41

Browse files
jja725claude
andcommitted
fix(ci): install protobuf-compiler for lance-encoding build
lance-encoding's build script requires protoc. Install it via apt-get on Linux and brew on macOS. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent c2768f7 commit ba92b41

2 files changed

Lines changed: 22 additions & 12 deletions

File tree

.github/workflows/ci.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ jobs:
3838
with:
3939
components: clippy
4040
- uses: Swatinem/rust-cache@v2
41+
- name: Install dependencies
42+
run: sudo apt-get update && sudo apt-get install -y protobuf-compiler
4143
- name: Clippy
4244
run: cargo clippy --all-targets -- -D warnings
4345

@@ -52,6 +54,8 @@ jobs:
5254
- uses: actions/checkout@v4
5355
- uses: actions-rust-lang/setup-rust-toolchain@v1
5456
- uses: Swatinem/rust-cache@v2
57+
- name: Install dependencies
58+
run: sudo apt-get update && sudo apt-get install -y protobuf-compiler
5559
- name: Run tests
5660
run: cargo test
5761
- name: Run C/C++ compilation tests
@@ -65,6 +69,8 @@ jobs:
6569
- uses: actions/checkout@v4
6670
- uses: actions-rust-lang/setup-rust-toolchain@v1
6771
- uses: Swatinem/rust-cache@v2
72+
- name: Install dependencies
73+
run: brew install protobuf
6874
- name: Run tests
6975
run: cargo test
7076
- name: Run C/C++ compilation tests
@@ -78,6 +84,8 @@ jobs:
7884
- uses: actions/checkout@v4
7985
- uses: actions-rust-lang/setup-rust-toolchain@v1
8086
- uses: Swatinem/rust-cache@v2
87+
- name: Install dependencies
88+
run: sudo apt-get update && sudo apt-get install -y protobuf-compiler
8189
- name: Check documentation
8290
run: RUSTDOCFLAGS="-D warnings" cargo doc --no-deps
8391

@@ -91,6 +99,8 @@ jobs:
9199
with:
92100
toolchain: "1.91.0"
93101
- uses: Swatinem/rust-cache@v2
102+
- name: Install dependencies
103+
run: sudo apt-get update && sudo apt-get install -y protobuf-compiler
94104
- name: Check MSRV
95105
run: cargo check --all-targets
96106

src/scanner.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -294,12 +294,12 @@ pub unsafe extern "C" fn lance_scanner_next(
294294
let s = unsafe { &mut *scanner };
295295

296296
// Lazily materialize the stream on first call.
297-
if s.stream.is_none() {
298-
if let Err(err) = s.materialize_stream() {
299-
set_lance_error(&err);
300-
unsafe { *out = ptr::null_mut() };
301-
return -1;
302-
}
297+
if s.stream.is_none()
298+
&& let Err(err) = s.materialize_stream()
299+
{
300+
set_lance_error(&err);
301+
unsafe { *out = ptr::null_mut() };
302+
return -1;
303303
}
304304

305305
let stream = s.stream.as_mut().unwrap();
@@ -431,12 +431,12 @@ pub unsafe extern "C" fn lance_scanner_poll_next(
431431
let s = unsafe { &mut *scanner };
432432

433433
// Lazily materialize the stream.
434-
if s.stream.is_none() {
435-
if let Err(err) = s.materialize_stream() {
436-
set_lance_error(&err);
437-
unsafe { *out = ptr::null_mut() };
438-
return LancePollStatus::Error;
439-
}
434+
if s.stream.is_none()
435+
&& let Err(err) = s.materialize_stream()
436+
{
437+
set_lance_error(&err);
438+
unsafe { *out = ptr::null_mut() };
439+
return LancePollStatus::Error;
440440
}
441441

442442
let stream = s.stream.as_mut().unwrap();

0 commit comments

Comments
 (0)