fix: resolve remote dyn filter rebase fallout

src/query/src/dist_plan/remote_dyn_filter_registry.rs

@@ -16,7 +16,6 @@ use std::collections::HashMap;
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::{Arc, RwLock, Weak};
 
-use datafusion_physical_expr::PhysicalExpr;
 use datafusion_physical_expr::expressions::DynamicFilterPhysicalExpr;
 use session::query_id::QueryId;
 use store_api::storage::RegionId;
@@ -268,7 +267,6 @@ impl DynFilterRegistryManager {
 
 #[cfg(test)]
 mod tests {
-    use datafusion_physical_expr::PhysicalExpr;
     use datafusion_physical_expr::expressions::{Column, lit};
     use uuid::Uuid;
 

src/query/src/optimizer/pass_distribution.rs

@@ -133,6 +133,7 @@ impl PassDistribution {
 mod tests {
     use std::collections::{BTreeMap, BTreeSet};
 
+    use api::v1::region::{RemoteDynFilterUnregister, RemoteDynFilterUpdate};
     use arrow_schema::{DataType, Field, Schema, SchemaRef, TimeUnit};
     use async_trait::async_trait;
     use common_query::request::QueryRequest;
@@ -153,6 +154,7 @@ mod tests {
     use table::table_name::TableName;
 
     use super::*;
+    use crate::dist_plan::ProducerScopeId;
     use crate::error::Result as QueryResult;
     use crate::region_query::RegionQueryHandler;
 
@@ -167,6 +169,24 @@ mod tests {
         ) -> QueryResult<SendableRecordBatchStream> {
             unreachable!("pass distribution tests should not execute remote queries")
         }
+
+        async fn handle_remote_dyn_filter_update(
+            &self,
+            _region_id: RegionId,
+            _query_id: String,
+            _update: RemoteDynFilterUpdate,
+        ) -> QueryResult<()> {
+            unreachable!("pass distribution tests should not send remote dyn filter updates")
+        }
+
+        async fn handle_remote_dyn_filter_unregister(
+            &self,
+            _region_id: RegionId,
+            _query_id: String,
+            _unregister: RemoteDynFilterUnregister,
+        ) -> QueryResult<()> {
+            unreachable!("pass distribution tests should not send remote dyn filter unregisters")
+        }
     }
 
     #[test]
@@ -272,6 +292,7 @@ mod tests {
             QueryContext::arc(),
             32,
             partition_cols,
+            ProducerScopeId::new(1),
         )
         .unwrap()
     }

src/session/src/lib.rs

@@ -35,7 +35,6 @@ use context::{ConfigurationVariables, QueryContextBuilder};
 use derive_more::Debug;
 
 use crate::context::{Channel, ConnInfo, QueryContextRef};
-use crate::hints::REMOTE_QUERY_ID_EXTENSION_KEY;
 
 /// Maximum number of warnings to store per session (similar to MySQL's max_error_count)
 const MAX_WARNINGS: usize = 64;