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

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

20 changes: 10 additions & 10 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -77,31 +77,31 @@ version = "57.0.0-dev"
#
# See for more details: https://github.com/rust-lang/cargo/issues/11329
apache-avro = { version = "0.21", default-features = false }
arrow = { version = "60.1.0", features = [
arrow = { version = "60.2.0", features = [
"prettyprint",
"chrono-tz",
] }
arrow-avro = { version = "60.1.0", default-features = false, features = [
arrow-avro = { version = "60.2.0", default-features = false, features = [
"deflate",
"snappy",
"zstd",
"bzip2",
"xz",
] }
arrow-buffer = { version = "60.1.0", default-features = false }
arrow-data = { version = "60.1.0", default-features = false }
arrow-flight = { version = "60.1.0", features = [
arrow-buffer = { version = "60.2.0", default-features = false }
arrow-data = { version = "60.2.0", default-features = false }
arrow-flight = { version = "60.2.0", features = [
"flight-sql",
] }
# Both codecs are required here to make sure that code paths like
# file-spilling have access to all compression codecs.
arrow-ipc = { version = "60.1.0", default-features = false, features = [
arrow-ipc = { version = "60.2.0", default-features = false, features = [
"lz4",
"zstd",
] }
arrow-ord = { version = "60.1.0", default-features = false }
arrow-schema = { version = "60.1.0", default-features = false }
arrow-select = { version = "60.1.0", default-features = false }
arrow-ord = { version = "60.2.0", default-features = false }
arrow-schema = { version = "60.2.0", default-features = false }
arrow-select = { version = "60.2.0", default-features = false }
async-trait = "0.1.89"
bigdecimal = "0.4.8"
bytes = "1.11"
Expand Down Expand Up @@ -167,7 +167,7 @@ memchr = "2.8.1"
num-traits = { version = "0.2" }
object_store = { version = "0.14.2", default-features = false }
parking_lot = "0.13"
parquet = { version = "60.1.0", default-features = false, features = [
parquet = { version = "60.2.0", default-features = false, features = [
"arrow",
"async",
"object_store",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
use std::sync::Arc;

use arrow::array::{RecordBatch, record_batch};
use arrow::datatypes as arrow_schema;
use arrow::datatypes::{DataType, Field, Schema};
use datafusion::datasource::MemTable;
use datafusion_ffi::proto::logical_extension_codec::FFI_LogicalExtensionCodec;
Expand Down
12 changes: 9 additions & 3 deletions datafusion/datasource-parquet/src/statistics_order_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,9 @@ impl TestFile {
if matches!(order, StatisticsOrder::Missing | StatisticsOrder::Unknown) {
let mut index = ColumnIndexBuilder::new(PhysicalType::BYTE_ARRAY);
index.append(false, "aé".as_bytes().to_vec(), b"b".to_vec(), 0, None);
page_index.put_column_index(index.build().unwrap(), 0, 0);
page_index
.try_put_column_index(index.build().unwrap(), 0, 0)
.unwrap();
}
let metadata = metadata
.into_builder()
Expand Down Expand Up @@ -557,8 +559,12 @@ fn single_column_metadata(
offset_index.append_row_count(3);
offset_index.append_offset_and_size(0, 1);
let mut page_index = PageIndexBuilder::new(1, 1);
page_index.put_column_index(column_index.build().unwrap(), 0, 0);
page_index.put_offset_index(offset_index.build(), 0, 0);
page_index
.try_put_column_index(column_index.build().unwrap(), 0, 0)
.unwrap();
page_index
.try_put_offset_index(offset_index.build(), 0, 0)
.unwrap();
let column = ColumnChunkMetaData::builder(schema.column(0))
.set_num_values(3)
.set_statistics(statistics)
Expand Down
1 change: 0 additions & 1 deletion datafusion/datasource/src/projection.rs
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,6 @@ mod test {
use std::sync::Arc;

use arrow::array::{AsArray, RecordBatch, record_batch};
use arrow::datatypes as arrow_schema;
Comment thread
Rich-T-kid marked this conversation as resolved.
Resolved
use arrow::datatypes::{DataType, Field, SchemaRef};
use datafusion_common::{DFSchema, ScalarValue, config::ConfigOptions};
use datafusion_expr::{
Expand Down
1 change: 0 additions & 1 deletion datafusion/physical-expr-adapter/src/schema_rewriter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -957,7 +957,6 @@ mod tests {
Array, BooleanArray, GenericListArray, Int32Array, Int64Array, RecordBatch,
RecordBatchOptions, StringArray, StringViewArray, StructArray, record_batch,
};
use arrow::datatypes as arrow_schema;
use arrow::datatypes::{Field, Fields, Schema};
use datafusion_common::assert_contains;
use datafusion_expr::Operator;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use std::fmt::{self, Formatter};
use std::sync::Arc;

use arrow::array::record_batch;
use arrow::datatypes::{self as arrow_schema, SchemaRef};
use arrow::datatypes::SchemaRef;
use async_trait::async_trait;
use datafusion::catalog::{Session, TableProvider};
use datafusion::common::Result;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use std::fmt::{self, Formatter};
use std::sync::Arc;

use arrow::array::record_batch;
use arrow::datatypes::{self as arrow_schema, SchemaRef};
use arrow::datatypes::SchemaRef;
use async_trait::async_trait;
use datafusion::catalog::{Session, TableProvider};
use datafusion::common::Result;
Expand Down
1 change: 0 additions & 1 deletion datafusion/substrait/tests/cases/aggregation_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
mod tests {
use crate::utils::test::{add_plan_schemas_to_ctx, read_json};
use datafusion::arrow::array::record_batch;
use datafusion::arrow::datatypes as arrow_schema;
use datafusion::common::{Result, ScalarValue, TableReference};
use datafusion::dataframe::DataFrame;
use datafusion::prelude::SessionContext;
Expand Down