Skip to content

Commit

Permalink
Merge remote-tracking branch 'apache/master' into encode-skip-iter
Browse files Browse the repository at this point in the history
  • Loading branch information
alamb committed Jun 11, 2024
2 parents f640b59 + 298bf48 commit f409cf4
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 6 deletions.
15 changes: 9 additions & 6 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,17 +119,20 @@ jobs:
run: cargo update -p ahash --precise 0.8.7
- name: Check arrow
working-directory: arrow
run: cargo msrv verify
run: cargo msrv --log-target stdout verify
- name: Check parquet
working-directory: parquet
run: cargo msrv verify
run: cargo msrv --log-target stdout verify
- name: Check arrow-flight
working-directory: arrow-flight
run: cargo msrv verify
run: cargo msrv --log-target stdout verify
- name: Downgrade object_store dependencies
working-directory: object_store
# Necessary because 1.30.0 updates MSRV to 1.63
run: cargo update -p tokio --precise 1.29.1
# Necessary because tokio 1.30.0 updates MSRV to 1.63
# and url 2.5.1, updates to 1.67
run: |
cargo update -p tokio --precise 1.29.1
cargo update -p url --precise 2.5.0
- name: Check object_store
working-directory: object_store
run: cargo msrv verify
run: cargo msrv --log-target stdout verify
4 changes: 4 additions & 0 deletions arrow-schema/src/schema.rs
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,10 @@ impl Schema {

/// Returns an immutable reference of a specific [`Field`] instance selected using an
/// offset within the internal `fields` vector.
///
/// # Panics
///
/// Panics if index out of bounds
pub fn field(&self, i: usize) -> &Field {
&self.fields[i]
}
Expand Down
1 change: 1 addition & 0 deletions parquet/src/arrow/array_reader/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ mod test_util;

pub use builder::build_array_reader;
pub use byte_array::make_byte_array_reader;
#[allow(unused_imports)] // Only used for benchmarks
pub use byte_array::make_byte_view_array_reader;
pub use byte_array_dictionary::make_byte_array_dictionary_reader;
#[allow(unused_imports)] // Only used for benchmarks
Expand Down

0 comments on commit f409cf4

Please sign in to comment.