Skip to content

Commit ae23cd5

Browse files
committed
update breaking changes
1 parent f4e519f commit ae23cd5

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

datafusion/core/src/datasource/physical_plan/arrow_file.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ use crate::physical_plan::{
3131
DisplayAs, DisplayFormatType, ExecutionPlan, Partitioning, SendableRecordBatchStream,
3232
};
3333

34+
use arrow::buffer::Buffer;
3435
use arrow_ipc::reader::FileDecoder;
3536
use arrow_schema::SchemaRef;
3637
use datafusion_common::config::ConfigOptions;
@@ -296,7 +297,7 @@ impl FileOpener for ArrowOpener {
296297
for (dict_block, dict_result) in
297298
footer.dictionaries().iter().flatten().zip(dict_results)
298299
{
299-
decoder.read_dictionary(dict_block, &dict_result.into())?;
300+
decoder.read_dictionary(dict_block, &Buffer::from_bytes(dict_result.into()))?;
300301
}
301302

302303
// filter recordbatches according to range
@@ -331,7 +332,7 @@ impl FileOpener for ArrowOpener {
331332
.into_iter()
332333
.zip(recordbatch_results)
333334
.filter_map(move |(block, data)| {
334-
match decoder.read_record_batch(&block, &data.into()) {
335+
match decoder.read_record_batch(&block, &Buffer::from_bytes(data.into())) {
335336
Ok(Some(record_batch)) => Some(Ok(record_batch)),
336337
Ok(None) => None,
337338
Err(err) => Some(Err(err)),

datafusion/functions/src/regex/regexpreplace.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ fn _regexp_replace_static_pattern_replace<T: OffsetSizeTrait>(
402402
let string_view_array = as_string_view_array(&args[0])?;
403403

404404
let mut builder = StringViewBuilder::with_capacity(string_view_array.len())
405-
.with_block_size(1024 * 1024 * 2);
405+
.with_fixed_block_size(1024 * 1024 * 2);
406406

407407
for val in string_view_array.iter() {
408408
if let Some(val) = val {

datafusion/physical-expr-common/src/binary_view_map.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ where
149149
output_type,
150150
map: hashbrown::raw::RawTable::with_capacity(INITIAL_MAP_CAPACITY),
151151
map_size: 0,
152-
builder: GenericByteViewBuilder::new().with_block_size(2 * 1024 * 1024),
152+
builder: GenericByteViewBuilder::new().with_fixed_block_size(2 * 1024 * 1024),
153153
random_state: RandomState::new(),
154154
hashes_buffer: vec![],
155155
null: None,

datafusion/physical-plan/src/coalesce_batches.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ fn gc_string_view_batch(batch: &RecordBatch) -> RecordBatch {
493493
// We set the block size to `ideal_buffer_size` so that the new StringViewArray only has one buffer, which accelerate later concat_batches.
494494
// See https://github.com/apache/arrow-rs/issues/6094 for more details.
495495
let mut builder = StringViewBuilder::with_capacity(s.len())
496-
.with_block_size(ideal_buffer_size as u32);
496+
.with_fixed_block_size(ideal_buffer_size as u32);
497497

498498
for v in s.iter() {
499499
builder.append_option(v);

datafusion/proto-common/src/from_proto/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ impl TryFrom<&protobuf::ScalarValue> for ScalarValue {
408408
"Error IPC message while deserializing ScalarValue::List: {e}"
409409
))
410410
})?;
411-
let buffer = Buffer::from(arrow_data);
411+
let buffer = Buffer::from(arrow_data.as_slice());
412412

413413
let ipc_batch = message.header_as_record_batch().ok_or_else(|| {
414414
Error::General(
@@ -423,7 +423,7 @@ impl TryFrom<&protobuf::ScalarValue> for ScalarValue {
423423
"Error IPC message while deserializing ScalarValue::List dictionary message: {e}"
424424
))
425425
})?;
426-
let buffer = Buffer::from(arrow_data);
426+
let buffer = Buffer::from(arrow_data.as_slice());
427427

428428
let dict_batch = message.header_as_dictionary_batch().ok_or_else(|| {
429429
Error::General(

0 commit comments

Comments
 (0)