Merge branch 'main' into rust-frontend-cast

e2e_test/streaming/extreme_null.slt

@@ -10,21 +10,12 @@ insert into t1 values (1,4,2), (2,3,3);
 statement ok
 insert into t4 values (1,1,4), (NULL,1,4), (2,9,1), (NULL,8,1), (0,2,3);
 
-statement ok
-create materialized view mv1 as select * from t1;
-
 statement ok
 create materialized view mv2 as select round(avg(v1), 1) as avg_v1, sum(v2) as sum_v2, count(v3) as count_v3 from t1;
 
 statement ok
 create materialized view mv3 as select sum(v1) as sum_v1, min(v1) as min_v1, max(v1) as max_v1 from t4 group by v3;
 
-query III
-select v1, v2, v3 from mv1;
-----
-1 4 2
-2 3 3
-
 query RII
 select avg_v1, sum_v2, count_v3 from mv2;
 ----
@@ -36,14 +27,6 @@ insert into t1 values (3,4,4), (4,3,5);
 statement ok
 flush;
 
-query III
-select v1, v2, v3 from mv1;
-----
-1 4 2
-2 3 3
-3 4 4
-4 3 5
-
 query RII
 select avg_v1, sum_v2, count_v3 from mv2;
 ----
@@ -56,9 +39,6 @@ select sum_v1, min_v1, max_v1, v3 from mv3 order by sum_v1;
 1 NULL 1 4
 2 NULL 2 1
 
-statement ok
-drop materialized view mv1
-
 statement ok
 drop materialized view mv2
 

src/frontend/src/observer/observer_manager.rs

@@ -27,7 +27,7 @@ use tokio::sync::watch::Sender;
 use tokio::task::JoinHandle;
 
 use crate::catalog::root_catalog::Catalog;
-use crate::scheduler::schedule::WorkerNodeManagerRef;
+use crate::scheduler::worker_node_manager::WorkerNodeManagerRef;
 
 /// `ObserverManager` is used to update data based on notification from meta.
 /// Call `start` to spawn a new asynchronous task

src/frontend/src/scheduler/execution/query.rs

@@ -17,7 +17,7 @@ use crate::scheduler::execution::query::QueryState::{Failed, Pending};
 use crate::scheduler::execution::StageEvent::Scheduled;
 use crate::scheduler::execution::{StageExecution, ROOT_TASK_ID, ROOT_TASK_OUTPUT_ID};
 use crate::scheduler::plan_fragmenter::{Query, StageId};
-use crate::scheduler::schedule::WorkerNodeManagerRef;
+use crate::scheduler::worker_node_manager::WorkerNodeManagerRef;
 use crate::scheduler::QueryResultFetcher;
 
 /// Message sent to a `QueryRunner` to control its execution.

src/frontend/src/scheduler/execution/stage.rs

@@ -22,12 +22,13 @@ use crate::optimizer::plan_node::PlanNodeType;
 use crate::scheduler::execution::stage::StageState::Pending;
 use crate::scheduler::execution::QueryMessage;
 use crate::scheduler::plan_fragmenter::{ExecutionPlanNode, QueryStageRef, StageId};
-use crate::scheduler::schedule::{TaskId, WorkerNodeManagerRef};
+use crate::scheduler::worker_node_manager::WorkerNodeManagerRef;
 
 // Root stage always has only one task.
 pub const ROOT_TASK_ID: u32 = 0;
 // Root task has only one output.
 pub const ROOT_TASK_OUTPUT_ID: u32 = 0;
+pub(crate) type TaskId = u32;
 
 enum StageState {
     Pending,

src/frontend/src/scheduler/mod.rs

@@ -22,8 +22,7 @@ mod execution;
 pub mod plan_fragmenter;
 mod query_manager;
 pub use query_manager::*;
-#[allow(dead_code)]
-pub mod schedule;
+pub mod worker_node_manager;
 
 /// Context for mpp query execution.
 pub struct ExecutionContext {

src/frontend/src/scheduler/plan_fragmenter.rs

@@ -24,7 +24,7 @@ use uuid::Uuid;
 use crate::optimizer::plan_node::{PlanNodeId, PlanNodeType};
 use crate::optimizer::property::Distribution;
 use crate::optimizer::PlanRef;
-use crate::scheduler::schedule::WorkerNodeManagerRef;
+use crate::scheduler::worker_node_manager::WorkerNodeManagerRef;
 
 #[derive(Clone, Debug, Hash, Eq, PartialEq)]
 pub struct QueryId {
@@ -405,7 +405,7 @@ mod tests {
     use crate::optimizer::property::{Distribution, Order};
     use crate::optimizer::PlanRef;
     use crate::scheduler::plan_fragmenter::{BatchPlanFragmenter, StageId};
-    use crate::scheduler::schedule::WorkerNodeManager;
+    use crate::scheduler::worker_node_manager::WorkerNodeManager;
     use crate::session::OptimizerContext;
     use crate::utils::Condition;
 

src/frontend/src/scheduler/query_manager.rs

@@ -14,7 +14,7 @@ use uuid::Uuid;
 use crate::meta_client::FrontendMetaClient;
 use crate::scheduler::execution::QueryExecution;
 use crate::scheduler::plan_fragmenter::Query;
-use crate::scheduler::schedule::WorkerNodeManagerRef;
+use crate::scheduler::worker_node_manager::WorkerNodeManagerRef;
 use crate::scheduler::ExecutionContextRef;
 
 pub trait DataChunkStream = Stream<Item = Result<DataChunk>>;