resolve merge

Author: adriangb

datafusion/physical-plan/src/joins/hash_join.rs

@@ -35,10 +35,6 @@ use super::{
 use super::{JoinOn, JoinOnRef};
 use crate::execution_plan::{boundedness_from_children, EmissionType};
 use crate::joins::join_hash_map::{JoinHashMapU32, JoinHashMapU64};
-use crate::filter_pushdown::{
-    ChildPushdownResult, FilterDescription, FilterPushdownPhase,
-    FilterPushdownPropagation,
-};
 use crate::projection::{
     try_embed_projection, try_pushdown_through_join, EmbeddedProjection, JoinData,
     ProjectionExec,