Add node_label placeholder in tests; reorder lines in migration mod…

… for consistency Signed-off-by: Shanicky Chen <[email protected]>
risingwavelabs · Oct 28, 2024 · 24af382 · 24af382
1 parent fee522f
commit 24af382
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 1 deletion.
diff --git a/src/batch/src/worker_manager/worker_node_manager.rs b/src/batch/src/worker_manager/worker_node_manager.rs
@@ -418,6 +418,7 @@ mod tests {
                     is_serving: true,
                     is_streaming: true,
                     internal_rpc_host_addr: "".to_string(),
+                    node_label: None,
                 }),
                 transactional_id: Some(1),
                 ..Default::default()
@@ -433,6 +434,7 @@ mod tests {
                     is_serving: true,
                     is_streaming: false,
                     internal_rpc_host_addr: "".to_string(),
+                    node_label: None,
                 }),
                 transactional_id: Some(2),
                 ..Default::default()

diff --git a/src/common/src/vnode_mapping/vnode_placement.rs b/src/common/src/vnode_mapping/vnode_placement.rs
@@ -233,6 +233,7 @@ mod tests {
             is_serving: true,
             is_streaming: false,
             internal_rpc_host_addr: "".to_string(),
+            node_label: None,
         };
 
         let count_same_vnode_mapping = |wm1: &WorkerSlotMapping, wm2: &WorkerSlotMapping| {

diff --git a/src/frontend/src/scheduler/distributed/query.rs b/src/frontend/src/scheduler/distributed/query.rs
@@ -675,6 +675,7 @@ pub(crate) mod tests {
                 is_serving: true,
                 is_streaming: true,
                 internal_rpc_host_addr: "".to_string(),
+                node_label: None,
             }),
             transactional_id: Some(0),
             ..Default::default()
@@ -693,6 +694,7 @@ pub(crate) mod tests {
                 is_serving: true,
                 is_streaming: true,
                 internal_rpc_host_addr: "".to_string(),
+                node_label: None,
             }),
             transactional_id: Some(1),
             ..Default::default()
@@ -711,6 +713,7 @@ pub(crate) mod tests {
                 is_serving: true,
                 is_streaming: true,
                 internal_rpc_host_addr: "".to_string(),
+                node_label: None,
             }),
             transactional_id: Some(2),
             ..Default::default()

diff --git a/src/meta/model/migration/src/lib.rs b/src/meta/model/migration/src/lib.rs
@@ -23,8 +23,8 @@ mod m20240806_143329_add_rate_limit_to_source_catalog;
 mod m20240820_081248_add_time_travel_per_table_epoch;
 mod m20240911_083152_variable_vnode_count;
 mod m20241016_065621_hummock_gc_history;
-mod m20241025_062548_singleton_vnode_count;
 mod m20241022_072553_label;
+mod m20241025_062548_singleton_vnode_count;
 
 pub struct Migrator;
 

diff --git a/src/meta/src/controller/cluster.rs b/src/meta/src/controller/cluster.rs
@@ -962,6 +962,7 @@ mod tests {
             is_serving: true,
             is_unschedulable: false,
             internal_rpc_host_addr: "".to_string(),
+            label: None,
         };
         let hosts = mock_worker_hosts_for_test(worker_count);
         let mut worker_ids = vec![];
@@ -1053,6 +1054,7 @@ mod tests {
             is_serving: true,
             is_unschedulable: false,
             internal_rpc_host_addr: "".to_string(),
+            label: None,
         };
         let worker_id = cluster_ctl
             .add_worker(

diff --git a/src/meta/src/hummock/manager/tests.rs b/src/meta/src/hummock/manager/tests.rs
@@ -386,6 +386,7 @@ async fn test_release_context_resource() {
                 is_serving: true,
                 is_unschedulable: false,
                 internal_rpc_host_addr: "".to_string(),
+                label: None,
             },
             Default::default(),
         )
@@ -469,6 +470,7 @@ async fn test_hummock_manager_basic() {
                 is_serving: true,
                 is_unschedulable: false,
                 internal_rpc_host_addr: "".to_string(),
+                label: None,
             },
             Default::default(),
         )