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

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

14 changes: 7 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -91,19 +91,19 @@ ahash = { version = "0.8", default-features = false, features = [
"runtime-rng",
] }
apache-avro = { version = "0.21", default-features = false }
arrow = { version = "57.1.0", features = [
arrow = { version = "57.2.0", features = [
"prettyprint",
"chrono-tz",
] }
arrow-buffer = { version = "57.1.0", default-features = false }
arrow-flight = { version = "57.1.0", features = [
arrow-buffer = { version = "57.2.0", default-features = false }
arrow-flight = { version = "57.2.0", features = [
"flight-sql-experimental",
] }
arrow-ipc = { version = "57.1.0", default-features = false, features = [
arrow-ipc = { version = "57.2.0", default-features = false, features = [
"lz4",
] }
arrow-ord = { version = "57.1.0", default-features = false }
arrow-schema = { version = "57.1.0", default-features = false }
arrow-ord = { version = "57.2.0", default-features = false }
arrow-schema = { version = "57.2.0", default-features = false }
async-trait = "0.1.89"
bigdecimal = "0.4.8"
bytes = "1.11"
Expand Down Expand Up @@ -166,7 +166,7 @@ log = "^0.4"
num-traits = { version = "0.2" }
object_store = { version = "0.12.4", default-features = false }
parking_lot = "0.12"
parquet = { version = "57.1.0", default-features = false, features = [
parquet = { version = "57.2.0", default-features = false, features = [
"arrow",
"async",
"object_store",
Expand Down
7 changes: 4 additions & 3 deletions datafusion/common/src/scalar/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8868,7 +8868,7 @@ mod tests {
.unwrap(),
ScalarValue::try_new_null(&DataType::Map(map_field_ref, false)).unwrap(),
ScalarValue::try_new_null(&DataType::Union(
UnionFields::new(vec![42], vec![field_ref]),
UnionFields::try_new(vec![42], vec![field_ref]).unwrap(),
UnionMode::Dense,
))
.unwrap(),
Expand Down Expand Up @@ -8971,13 +8971,14 @@ mod tests {
}

// Test union type
let union_fields = UnionFields::new(
let union_fields = UnionFields::try_new(
vec![0, 1],
vec![
Field::new("i32", DataType::Int32, false),
Field::new("f64", DataType::Float64, false),
],
);
)
.unwrap();
let union_result = ScalarValue::new_default(&DataType::Union(
union_fields.clone(),
UnionMode::Sparse,
Expand Down
23 changes: 22 additions & 1 deletion datafusion/core/src/physical_planner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -802,10 +802,17 @@ impl DefaultPhysicalPlanner {
));
}
}
return internal_err!(
debug!(
"Physical input schema should be the same as the one converted from logical input schema. Differences: {}",
differences.iter().map(|s| format!("\n\t- {s}")).join("")
);

//influx: temporarily remove error and only log so that we can find a
//reproducer in production
// return internal_err!("Physical input schema should be the same as the one converted from logical input schema. Differences: {}", differences
// .iter()
// .map(|s| format!("\n\t- {s}"))
// .join(""));
}

let groups = self.create_grouping_physical_expr(
Expand Down Expand Up @@ -4207,6 +4214,8 @@ digraph {
}

#[tokio::test]
// Ignored due to disabling the physical schema check skip.
#[ignore]
async fn test_aggregate_schema_mismatch_metadata() {
let logical_schema =
Arc::new(Schema::new(vec![Field::new("c1", DataType::Int32, false)]));
Expand All @@ -4227,6 +4236,8 @@ digraph {
}

#[tokio::test]
// Ignored due to disabling the physical schema check skip.
#[ignore]
async fn test_aggregate_schema_mismatch_field_count() {
let logical_schema =
Arc::new(Schema::new(vec![Field::new("c1", DataType::Int32, false)]));
Expand All @@ -4247,6 +4258,8 @@ digraph {
}

#[tokio::test]
// Ignored due to disabling the physical schema check skip.
#[ignore]
async fn test_aggregate_schema_mismatch_field_name() {
let logical_schema =
Arc::new(Schema::new(vec![Field::new("c1", DataType::Int32, false)]));
Expand All @@ -4268,6 +4281,8 @@ digraph {
}

#[tokio::test]
// Ignored due to disabling the physical schema check skip.
#[ignore]
async fn test_aggregate_schema_mismatch_field_type() {
let logical_schema =
Arc::new(Schema::new(vec![Field::new("c1", DataType::Int32, false)]));
Expand All @@ -4286,6 +4301,8 @@ digraph {
}

#[tokio::test]
// Ignored due to disabling the physical schema check skip.
#[ignore]
async fn test_aggregate_schema_mismatch_field_nullability() {
let logical_schema =
Arc::new(Schema::new(vec![Field::new("c1", DataType::Int32, false)]));
Expand All @@ -4304,6 +4321,8 @@ digraph {
}

#[tokio::test]
// Ignored due to disabling the physical schema check skip.
#[ignore]
async fn test_aggregate_schema_mismatch_field_metadata() {
let logical_schema =
Arc::new(Schema::new(vec![Field::new("c1", DataType::Int32, false)]));
Expand All @@ -4324,6 +4343,8 @@ digraph {
}

#[tokio::test]
// Ignored due to disabling the physical schema check skip.
#[ignore]
async fn test_aggregate_schema_mismatch_multiple() {
let logical_schema = Arc::new(Schema::new(vec![
Field::new("c1", DataType::Int32, false),
Expand Down
Loading