Skip to content
Open
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
2 changes: 1 addition & 1 deletion .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ jobs:
runs-on: ubuntu-24.04
strategy:
matrix:
msrv: ["1.91.0"] # This should match up with rust-version in Cargo.toml
msrv: ["1.94.0"] # This should match up with rust-version in Cargo.toml
env:
# Need up-to-date compilers for kernels
CC: clang
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ categories = [
"development-tools",
"science",
]
rust-version = "1.91.0"
rust-version = "1.94.0"

[workspace.dependencies]
arc-swap = "1.7"
Expand Down
2 changes: 1 addition & 1 deletion java/lance-jni/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "lance-jni"
version = "13.0.0-beta.4"
edition = "2024"
authors = ["Lance Devs <dev@lance.org>"]
rust-version = "1.91"
rust-version = "1.94"
license = "Apache-2.0"
repository = "https://github.com/lance-format/lance"
readme = "../../README.md"
Expand Down
2 changes: 1 addition & 1 deletion python/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "13.0.0-beta.4"
edition = "2024"
authors = ["Lance Devs <dev@lance.org>"]
license = "Apache-2.0"
rust-version = "1.91"
rust-version = "1.94"
exclude = ["python/lance/conftest.py"]
publish = false

Expand Down
13 changes: 5 additions & 8 deletions rust/lance-arrow/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -441,13 +441,9 @@ pub trait FixedSizeBinaryArrayExt {
/// let int_values = UInt8Array::from_iter(0..10);
/// let fixed_size_list_arr = FixedSizeBinaryArray::try_new_from_values(&int_values, 2).unwrap();
/// assert_eq!(fixed_size_list_arr,
/// FixedSizeBinaryArray::from(vec![
/// Some(vec![0, 1].as_slice()),
/// Some(vec![2, 3].as_slice()),
/// Some(vec![4, 5].as_slice()),
/// Some(vec![6, 7].as_slice()),
/// Some(vec![8, 9].as_slice())
/// ]))
/// FixedSizeBinaryArray::try_from_iter(
/// [[0u8, 1], [2, 3], [4, 5], [6, 7], [8, 9]].into_iter()
/// ).unwrap())
/// ```
fn try_new_from_values(values: &UInt8Array, stride: i32) -> Result<FixedSizeBinaryArray>;
}
Expand Down Expand Up @@ -2979,7 +2975,8 @@ mod tests {
vec![Some(b"1".as_slice()), Some(b"23".as_slice())]
);

let fixed_size = FixedSizeBinaryArray::from(vec![b"abcd", b"efgh"]);
let fixed_size =
FixedSizeBinaryArray::try_from_iter([b"abcd", b"efgh"].into_iter()).unwrap();
assert_eq!(
iter_binary_array(&fixed_size).unwrap().collect::<Vec<_>>(),
vec![Some(b"abcd".as_slice()), Some(b"efgh".as_slice())]
Expand Down
29 changes: 16 additions & 13 deletions rust/lance-file/src/versions/v1/writer/statistics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1541,23 +1541,23 @@ mod tests {
},
// FixedSizeBinaryArray
TestCase {
source_arrays: vec![Arc::new(FixedSizeBinaryArray::from(vec![
Some(vec![0, 1].as_slice()),
Some(vec![2, 3].as_slice()),
Some(vec![4, 5].as_slice()),
Some(vec![6, 7].as_slice()),
Some(vec![8, 9].as_slice()),
]))],
source_arrays: vec![Arc::new(
FixedSizeBinaryArray::try_from_iter(
[[0u8, 1], [2, 3], [4, 5], [6, 7], [8, 9]].into_iter(),
)
.unwrap(),
)],
stats: StatisticsRow {
null_count: 0,
min_value: ScalarValue::FixedSizeBinary(2, Some(vec![0, 1])),
max_value: ScalarValue::FixedSizeBinary(2, Some(vec![8, 9])),
},
},
TestCase {
source_arrays: vec![Arc::new(FixedSizeBinaryArray::from(vec![
min_binary_value.as_slice(),
]))],
source_arrays: vec![Arc::new(
FixedSizeBinaryArray::try_from_iter([min_binary_value.as_slice()].into_iter())
.unwrap(),
)],
stats: StatisticsRow {
null_count: 0,
min_value: ScalarValue::FixedSizeBinary(
Expand All @@ -1571,9 +1571,12 @@ mod tests {
},
},
TestCase {
source_arrays: vec![Arc::new(FixedSizeBinaryArray::from(vec![
&[0xFFu8; BINARY_PREFIX_LENGTH + 7],
]))],
source_arrays: vec![Arc::new(
FixedSizeBinaryArray::try_from_iter(
[[0xFFu8; BINARY_PREFIX_LENGTH + 7]].into_iter(),
)
.unwrap(),
)],
stats: StatisticsRow {
null_count: 0,
min_value: ScalarValue::FixedSizeBinary(
Expand Down
2 changes: 1 addition & 1 deletion rust/lance-namespace-datafusion/src/session_builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,10 @@ mod tests {
use super::SessionBuilder;
use std::sync::Arc;

use arrow_array::record_batch;
use arrow_array::{Int64Array, RecordBatch};
use datafusion::catalog::SchemaProvider;
use datafusion::catalog::memory::{MemoryCatalogProvider, MemorySchemaProvider};
use datafusion::common::record_batch;
use datafusion::datasource::MemTable;
use datafusion::error::Result;

Expand Down
2 changes: 1 addition & 1 deletion rust/lance-namespace-datafusion/tests/sql.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

use std::sync::Arc;

use arrow_array::record_batch;
use arrow_array::{Int32Array, Int64Array, RecordBatch, RecordBatchIterator, StringArray};
use arrow_schema::Schema;
use datafusion::common::record_batch;
use datafusion::error::{DataFusionError, Result as DFResult};
use datafusion::prelude::SessionContext;
use lance::Dataset;
Expand Down
Loading