Skip to content

Commit

Permalink
bump arrow version and fix clippy error
Browse files Browse the repository at this point in the history
  • Loading branch information
Lordworms committed Feb 2, 2025
1 parent d5428b2 commit bee74d7
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 50 deletions.
16 changes: 8 additions & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -77,21 +77,21 @@ version = "45.0.0"
ahash = { version = "0.8", default-features = false, features = [
"runtime-rng",
] }
arrow = { version = "54.0.0", features = [
arrow = { version = "54.1.0", features = [
"prettyprint",
] }
arrow-array = { version = "54.0.0", default-features = false, features = [
arrow-array = { version = "54.1.0", default-features = false, features = [
"chrono-tz",
] }
arrow-buffer = { version = "54.0.0", default-features = false }
arrow-flight = { version = "54.0.0", features = [
arrow-buffer = { version = "54.1.0", default-features = false }
arrow-flight = { version = "54.1.0", features = [
"flight-sql-experimental",
] }
arrow-ipc = { version = "54.0.0", default-features = false, features = [
arrow-ipc = { version = "54.1.0", default-features = false, features = [
"lz4",
] }
arrow-ord = { version = "54.0.0", default-features = false }
arrow-schema = { version = "54.0.0", default-features = false }
arrow-ord = { version = "54.1.0", default-features = false }
arrow-schema = { version = "54.1.0", default-features = false }
async-trait = "0.1.73"
bigdecimal = "0.4.7"
bytes = "1.4"
Expand Down Expand Up @@ -133,7 +133,7 @@ itertools = "0.14"
log = "^0.4"
object_store = { version = "0.11.0", default-features = false }
parking_lot = "0.12"
parquet = { version = "54.0.0", default-features = false, features = [
parquet = { version = "54.1.0", default-features = false, features = [
"arrow",
"async",
"object_store",
Expand Down
67 changes: 37 additions & 30 deletions datafusion-cli/Cargo.lock

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

11 changes: 3 additions & 8 deletions datafusion/core/src/datasource/physical_plan/arrow_file.rs
Original file line number Diff line number Diff line change
Expand Up @@ -309,10 +309,8 @@ impl FileOpener for ArrowOpener {
for (dict_block, dict_result) in
footer.dictionaries().iter().flatten().zip(dict_results)
{
decoder.read_dictionary(
dict_block,
&Buffer::from_bytes(dict_result.into()),
)?;
decoder
.read_dictionary(dict_block, &Buffer::from(dict_result))?;
}

// filter recordbatches according to range
Expand Down Expand Up @@ -348,10 +346,7 @@ impl FileOpener for ArrowOpener {
.zip(recordbatch_results)
.filter_map(move |(block, data)| {
decoder
.read_record_batch(
&block,
&Buffer::from_bytes(data.into()),
)
.read_record_batch(&block, &Buffer::from(data))
.transpose()
}),
)
Expand Down
7 changes: 4 additions & 3 deletions datafusion/optimizer/src/unwrap_cast_in_comparison.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ use crate::{OptimizerConfig, OptimizerRule};

use crate::utils::NamePreserver;
use arrow::datatypes::{
DataType, TimeUnit, MAX_DECIMAL_FOR_EACH_PRECISION, MIN_DECIMAL_FOR_EACH_PRECISION,
DataType, TimeUnit, MAX_DECIMAL128_FOR_EACH_PRECISION,
MIN_DECIMAL128_FOR_EACH_PRECISION,
};
use arrow::temporal_conversions::{MICROSECONDS, MILLISECONDS, NANOSECONDS};
use datafusion_common::tree_node::{Transformed, TreeNode, TreeNodeRewriter};
Expand Down Expand Up @@ -369,8 +370,8 @@ fn try_cast_numeric_literal(
// Different precision for decimal128 can store different range of value.
// For example, the precision is 3, the max of value is `999` and the min
// value is `-999`
MIN_DECIMAL_FOR_EACH_PRECISION[*precision as usize - 1],
MAX_DECIMAL_FOR_EACH_PRECISION[*precision as usize - 1],
MIN_DECIMAL128_FOR_EACH_PRECISION[*precision as usize],
MAX_DECIMAL128_FOR_EACH_PRECISION[*precision as usize],
),
_ => return None,
};
Expand Down
2 changes: 1 addition & 1 deletion datafusion/physical-expr/src/window/standard.rs
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ impl WindowExpr for StandardWindowExpr {
pub(crate) fn add_new_ordering_expr_with_partition_by(
eqp: &mut EquivalenceProperties,
expr: PhysicalSortExpr,
partition_by: &Vec<Arc<dyn PhysicalExpr>>,
partition_by: &[Arc<dyn PhysicalExpr>],
) {
if partition_by.is_empty() {
// In the absence of a PARTITION BY, ordering of `self.expr` is global:
Expand Down

0 comments on commit bee74d7

Please sign in to comment.