From 8bd8aebf24b73a5f7351aaf58bb71fb35f0aa808 Mon Sep 17 00:00:00 2001 From: Andrew Lamb Date: Thu, 25 Jul 2024 16:05:08 -0400 Subject: [PATCH 1/2] Revert "Temporarily pin toolchain version to avoid clippy (#11655)" This reverts commit 5b7e0aae22c2d5a5be19e4b877e878199b9f6c43. --- rust-toolchain.toml | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 rust-toolchain.toml diff --git a/rust-toolchain.toml b/rust-toolchain.toml deleted file mode 100644 index 0ef859ae8db3b..0000000000000 --- a/rust-toolchain.toml +++ /dev/null @@ -1,20 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -[toolchain] -# Temporarily pin toolchain version until we solve problems reported by newer clippy release. -channel = "1.79.0" \ No newline at end of file From fa5999c7c8cc41b8ef5806c6651eff20f3696102 Mon Sep 17 00:00:00 2001 From: Andrew Lamb Date: Thu, 25 Jul 2024 16:08:58 -0400 Subject: [PATCH 2/2] Add ticket references in comments --- datafusion/physical-plan/src/joins/hash_join.rs | 3 +++ datafusion/sqllogictest/test_files/parquet.slt | 1 + datafusion/sqllogictest/test_files/sort_merge_join.slt | 1 + 3 files changed, 5 insertions(+) diff --git a/datafusion/physical-plan/src/joins/hash_join.rs b/datafusion/physical-plan/src/joins/hash_join.rs index 4ed4d9ba2534f..063f35059fb8f 100644 --- a/datafusion/physical-plan/src/joins/hash_join.rs +++ b/datafusion/physical-plan/src/joins/hash_join.rs @@ -1932,6 +1932,7 @@ mod tests { } // FIXME(#TODO) test fails with feature `force_hash_collisions` + // https://github.com/apache/datafusion/issues/11658 #[cfg(not(feature = "force_hash_collisions"))] #[apply(batch_sizes)] #[tokio::test] @@ -1989,6 +1990,7 @@ mod tests { /// Test where the left has 2 parts, the right with 1 part => 1 part // FIXME(#TODO) test fails with feature `force_hash_collisions` + // https://github.com/apache/datafusion/issues/11658 #[cfg(not(feature = "force_hash_collisions"))] #[apply(batch_sizes)] #[tokio::test] @@ -2103,6 +2105,7 @@ mod tests { /// Test where the left has 1 part, the right has 2 parts => 2 parts // FIXME(#TODO) test fails with feature `force_hash_collisions` + // https://github.com/apache/datafusion/issues/11658 #[cfg(not(feature = "force_hash_collisions"))] #[apply(batch_sizes)] #[tokio::test] diff --git a/datafusion/sqllogictest/test_files/parquet.slt b/datafusion/sqllogictest/test_files/parquet.slt index 553cdeee908cc..3342f85c81417 100644 --- a/datafusion/sqllogictest/test_files/parquet.slt +++ b/datafusion/sqllogictest/test_files/parquet.slt @@ -252,6 +252,7 @@ SELECT COUNT(*) FROM timestamp_with_tz; 131072 # FIXME(#TODO) fails with feature `force_hash_collisions` +# https://github.com/apache/datafusion/issues/11660 # Perform the query: # query IPT # SELECT diff --git a/datafusion/sqllogictest/test_files/sort_merge_join.slt b/datafusion/sqllogictest/test_files/sort_merge_join.slt index bebec31b90c09..6e7b50973cde2 100644 --- a/datafusion/sqllogictest/test_files/sort_merge_join.slt +++ b/datafusion/sqllogictest/test_files/sort_merge_join.slt @@ -239,6 +239,7 @@ SELECT * FROM t1 FULL JOIN t2 ON t1_id = t2_id NULL NULL NULL 55 w 3 # FIXME(#TODO) fails with feature `force_hash_collisions` +# https://github.com/apache/datafusion/issues/11659 # equijoin_full_and_condition_from_both # query ITIITI rowsort # SELECT * FROM t1 FULL JOIN t2 ON t1_id = t2_id AND t2_int <= t1_int