Skip to content

Commit bfb57c9

Browse files
committed
CI issues
1 parent 7884acc commit bfb57c9

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

datafusion/core/tests/sql/select.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ async fn test_parameter_invalid_types() -> Result<()> {
246246
.await;
247247
assert_eq!(
248248
results.unwrap_err().strip_backtrace(),
249-
"Arrow error: Invalid argument error: Invalid comparison operation: List(Field { name: \"item\", data_type: Int32, nullable: true, dict_id: 0, dict_is_ordered: false, metadata: {} }) == List(Field { name: \"item\", data_type: Int32, nullable: true, dict_id: 0, dict_is_ordered: false, metadata: {} })"
249+
"Arrow error: Invalid argument error: Nested comparison: List(Field { name: \"item\", data_type: Int32, nullable: true, dict_id: 0, dict_is_ordered: false, metadata: {} }) == List(Field { name: \"item\", data_type: Int32, nullable: true, dict_id: 0, dict_is_ordered: false, metadata: {} }) (hint: use make_comparator instead)"
250250
);
251251
Ok(())
252252
}

datafusion/expr/src/type_coercion/binary.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1078,7 +1078,7 @@ fn temporal_coercion(lhs_type: &DataType, rhs_type: &DataType) -> Option<DataTyp
10781078
(Nanosecond, Microsecond) => Microsecond,
10791079
(l, r) => {
10801080
assert_eq!(l, r);
1081-
l.clone()
1081+
*l
10821082
}
10831083
};
10841084

datafusion/expr/src/type_coercion/functions.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -615,11 +615,11 @@ fn coerced_from<'a>(
615615
(Timestamp(unit, Some(tz)), _) if tz.as_ref() == TIMEZONE_WILDCARD => {
616616
match type_from {
617617
Timestamp(_, Some(from_tz)) => {
618-
Some(Timestamp(unit.clone(), Some(from_tz.clone())))
618+
Some(Timestamp(*unit, Some(from_tz.clone())))
619619
}
620620
Null | Date32 | Utf8 | LargeUtf8 | Timestamp(_, None) => {
621621
// In the absence of any other information assume the time zone is "+00" (UTC).
622-
Some(Timestamp(unit.clone(), Some("+00".into())))
622+
Some(Timestamp(*unit, Some("+00".into())))
623623
}
624624
_ => None,
625625
}

datafusion/sqllogictest/test_files/array_query.slt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,16 @@ SELECT * FROM data;
4141
# Filtering
4242
###########
4343

44-
query error DataFusion error: Arrow error: Invalid argument error: Invalid comparison operation: List\(Field \{ name: "item", data_type: Int64, nullable: true, dict_id: 0, dict_is_ordered: false, metadata: \{\} \}\) == List\(Field \{ name: "item", data_type: Int64, nullable: true, dict_id: 0, dict_is_ordered: false, metadata: \{\} \}\)
44+
query error DataFusion error: Arrow error: Invalid argument error: Nested comparison: List\(Field \{ name: "item", data_type: Int64, nullable: true, dict_id: 0, dict_is_ordered: false, metadata: \{\} \}\) == List\(Field \{ name: "item", data_type: Int64, nullable: true, dict_id: 0, dict_is_ordered: false, metadata: \{\} \}\) .*
4545
SELECT * FROM data WHERE column1 = [1,2,3];
4646

47-
query error DataFusion error: Arrow error: Invalid argument error: Invalid comparison operation: List\(Field \{ name: "item", data_type: Int64, nullable: true, dict_id: 0, dict_is_ordered: false, metadata: \{\} \}\) == List\(Field \{ name: "item", data_type: Int64, nullable: true, dict_id: 0, dict_is_ordered: false, metadata: \{\} \}\)
47+
query error DataFusion error: Arrow error: Invalid argument error: Nested comparison: List\(Field \{ name: "item", data_type: Int64, nullable: true, dict_id: 0, dict_is_ordered: false, metadata: \{\} \}\) == List\(Field \{ name: "item", data_type: Int64, nullable: true, dict_id: 0, dict_is_ordered: false, metadata: \{\} \}\) .*
4848
SELECT * FROM data WHERE column1 = column2
4949

50-
query error DataFusion error: Arrow error: Invalid argument error: Invalid comparison operation: List\(Field \{ name: "item", data_type: Int64, nullable: true, dict_id: 0, dict_is_ordered: false, metadata: \{\} \}\) != List\(Field \{ name: "item", data_type: Int64, nullable: true, dict_id: 0, dict_is_ordered: false, metadata: \{\} \}\)
50+
query error DataFusion error: Arrow error: Invalid argument error: Nested comparison: List\(Field \{ name: "item", data_type: Int64, nullable: true, dict_id: 0, dict_is_ordered: false, metadata: \{\} \}\) != List\(Field \{ name: "item", data_type: Int64, nullable: true, dict_id: 0, dict_is_ordered: false, metadata: \{\} \}\) .*
5151
SELECT * FROM data WHERE column1 != [1,2,3];
5252

53-
query error DataFusion error: Arrow error: Invalid argument error: Invalid comparison operation: List\(Field \{ name: "item", data_type: Int64, nullable: true, dict_id: 0, dict_is_ordered: false, metadata: \{\} \}\) != List\(Field \{ name: "item", data_type: Int64, nullable: true, dict_id: 0, dict_is_ordered: false, metadata: \{\} \}\)
53+
query error DataFusion error: Arrow error: Invalid argument error: Nested comparison: List\(Field \{ name: "item", data_type: Int64, nullable: true, dict_id: 0, dict_is_ordered: false, metadata: \{\} \}\) != List\(Field \{ name: "item", data_type: Int64, nullable: true, dict_id: 0, dict_is_ordered: false, metadata: \{\} \}\) .*
5454
SELECT * FROM data WHERE column1 != column2
5555

5656
###########

0 commit comments

Comments
 (0)