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
88 changes: 44 additions & 44 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -89,30 +89,30 @@ version = "54.0.0"
#
# See for more details: https://github.com/rust-lang/cargo/issues/11329
apache-avro = { version = "0.21", default-features = false }
arrow = { version = "59.0.0", features = [
arrow = { version = "59.1.0", features = [
"prettyprint",
"chrono-tz",
] }
arrow-avro = { version = "59.0.0", default-features = false, features = [
arrow-avro = { version = "59.1.0", default-features = false, features = [
"deflate",
"snappy",
"zstd",
"bzip2",
"xz",
] }
arrow-buffer = { version = "59.0.0", default-features = false }
arrow-data = { version = "59.0.0", default-features = false }
arrow-flight = { version = "59.0.0", features = [
arrow-buffer = { version = "59.1.0", default-features = false }
arrow-data = { version = "59.1.0", default-features = false }
arrow-flight = { version = "59.1.0", features = [
"flight-sql-experimental",
] }
# Both codecs are required here to make sure that code paths like
# file-spilling have access to all compression codecs.
arrow-ipc = { version = "59.0.0", default-features = false, features = [
arrow-ipc = { version = "59.1.0", default-features = false, features = [
"lz4",
"zstd",
] }
arrow-ord = { version = "59.0.0", default-features = false }
arrow-schema = { version = "59.0.0", default-features = false }
arrow-ord = { version = "59.1.0", default-features = false }
arrow-schema = { version = "59.1.0", default-features = false }
async-trait = "0.1.89"
bigdecimal = "0.4.8"
bytes = "1.11"
Expand Down Expand Up @@ -178,7 +178,7 @@ memchr = "2.8.1"
num-traits = { version = "0.2" }
object_store = { version = "0.13.2", default-features = false }
parking_lot = "0.12"
parquet = { version = "59.0.0", default-features = false, features = [
parquet = { version = "59.1.0", default-features = false, features = [
"arrow",
"async",
"object_store",
Expand Down
4 changes: 2 additions & 2 deletions datafusion-examples/examples/flight/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
use std::sync::Arc;

use arrow::ipc::writer::{CompressionContext, DictionaryTracker, IpcDataGenerator};
use arrow::ipc::writer::{DictionaryTracker, IpcDataGenerator, IpcWriteContext};
use arrow_flight::{
Action, ActionType, Criteria, Empty, FlightData, FlightDescriptor, FlightInfo,
HandshakeRequest, HandshakeResponse, PutResult, SchemaResult, Ticket,
Expand Down Expand Up @@ -112,7 +112,7 @@ impl FlightService for FlightServiceImpl {

// add an initial FlightData message that sends schema
let options = arrow::ipc::writer::IpcWriteOptions::default();
let mut compression_context = CompressionContext::default();
let mut compression_context = IpcWriteContext::default();

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Struct was renamed (old was deprecated) in

let schema_flight_data = SchemaAsIpc::new(&schema, &options);

let mut flights = vec![FlightData::from(schema_flight_data)];
Expand Down
3 changes: 2 additions & 1 deletion datafusion/common/src/scalar/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5265,7 +5265,8 @@ impl ScalarValue {
/// as necessary.
pub fn copy_array_data(src_data: &ArrayData) -> ArrayData {
let mut copy = MutableArrayData::new(vec![&src_data], true, src_data.len());
copy.extend(0, 0, src_data.len());
copy.try_extend(0, 0, src_data.len())
.expect("copy_array_data failed due to offset overflow");
copy.freeze()
}

Expand Down
4 changes: 2 additions & 2 deletions datafusion/common/src/utils/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1288,11 +1288,11 @@ fn truncate_list_nulls<O: OffsetSizeTrait>(
let (valid_or_empty, _nulls) = valid_or_empty.into_parts();

for (start, end) in valid_or_empty.set_slices() {
mutable_array_data.extend(
mutable_array_data.try_extend(

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Required because extend and extend_null was deprecated

(basically now errors are propagated rather than causing panics)

0,
offsets[start].as_usize(),
offsets[end].as_usize(),
);
)?;
}

let lengths = std::iter::zip(offsets.lengths(), nulls)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ impl GroupsAccumulator for MinMaxStructAccumulator {
let mut copy = MutableArrayData::new(min_maxes_refs, true, min_maxes_data.len());

for (i, item) in min_maxes_data.iter().enumerate() {
copy.extend(i, 0, item.len());
copy.try_extend(i, 0, item.len())?;
}
let result = copy.freeze();
assert_eq!(&self.inner.data_type, result.data_type());
Expand Down
Loading
Loading