From ba37b365c36b38a6d5dc3f07ce9e9f16508cd7a9 Mon Sep 17 00:00:00 2001 From: Patrick Huang Date: Wed, 4 Sep 2024 18:37:39 +0800 Subject: [PATCH] address comment on proto --- proto/meta.proto | 9 +++++---- src/common/src/util/cluster_limit.rs | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/proto/meta.proto b/proto/meta.proto index 7a83931049303..77547fd7225cf 100644 --- a/proto/meta.proto +++ b/proto/meta.proto @@ -790,12 +790,13 @@ message RelationIdInfos { map map = 1; } -message WorkerActorCount { - uint64 actor_count = 1; - uint64 parallelism = 2; -} + message ActorCountPerParallelism { + message WorkerActorCount { + uint64 actor_count = 1; + uint64 parallelism = 2; + } map worker_id_to_actor_count = 1; uint64 hard_limit = 2; uint64 soft_limit = 3; diff --git a/src/common/src/util/cluster_limit.rs b/src/common/src/util/cluster_limit.rs index 8097cf51ee649..a43edfb020bff 100644 --- a/src/common/src/util/cluster_limit.rs +++ b/src/common/src/util/cluster_limit.rs @@ -15,8 +15,9 @@ use std::collections::HashMap; use std::fmt::{self, Display, Formatter}; +use risingwave_pb::meta::actor_count_per_parallelism::PbWorkerActorCount; use risingwave_pb::meta::cluster_limit::PbLimit; -use risingwave_pb::meta::{PbActorCountPerParallelism, PbClusterLimit, PbWorkerActorCount}; +use risingwave_pb::meta::{PbActorCountPerParallelism, PbClusterLimit}; pub const FREE_TIER_ACTOR_CNT_SOFT_LIMIT: usize = 25; pub const FREE_TIER_ACTOR_CNT_HARD_LIMIT: usize = 100;