diff options
Diffstat (limited to 'weed/mq/topic')
| -rw-r--r-- | weed/mq/topic/local_manager.go | 3 | ||||
| -rw-r--r-- | weed/mq/topic/partition.go | 8 | ||||
| -rw-r--r-- | weed/mq/topic/topic.go | 7 |
3 files changed, 10 insertions, 8 deletions
diff --git a/weed/mq/topic/local_manager.go b/weed/mq/topic/local_manager.go index 9f273723d..82ee18c4a 100644 --- a/weed/mq/topic/local_manager.go +++ b/weed/mq/topic/local_manager.go @@ -3,6 +3,7 @@ package topic import ( cmap "github.com/orcaman/concurrent-map/v2" "github.com/seaweedfs/seaweedfs/weed/pb/mq_pb" + "github.com/seaweedfs/seaweedfs/weed/pb/schema_pb" "github.com/shirou/gopsutil/v3/cpu" "time" ) @@ -89,7 +90,7 @@ func (manager *LocalTopicManager) CollectStats(duration time.Duration) *mq_pb.Br Partition: localPartition.Partition, } stats.Stats[topicPartition.TopicPartitionId()] = &mq_pb.TopicPartitionStats{ - Topic: &mq_pb.Topic{ + Topic: &schema_pb.Topic{ Namespace: string(localTopic.Namespace), Name: localTopic.Name, }, diff --git a/weed/mq/topic/partition.go b/weed/mq/topic/partition.go index 7edf979b5..cee512ab5 100644 --- a/weed/mq/topic/partition.go +++ b/weed/mq/topic/partition.go @@ -2,7 +2,7 @@ package topic import ( "fmt" - "github.com/seaweedfs/seaweedfs/weed/pb/mq_pb" + "github.com/seaweedfs/seaweedfs/weed/pb/schema_pb" "time" ) @@ -40,7 +40,7 @@ func (partition Partition) Equals(other Partition) bool { return true } -func FromPbPartition(partition *mq_pb.Partition) Partition { +func FromPbPartition(partition *schema_pb.Partition) Partition { return Partition{ RangeStart: partition.RangeStart, RangeStop: partition.RangeStop, @@ -67,8 +67,8 @@ func SplitPartitions(targetCount int32, ts int64) []*Partition { return partitions } -func (partition Partition) ToPbPartition() *mq_pb.Partition { - return &mq_pb.Partition{ +func (partition Partition) ToPbPartition() *schema_pb.Partition { + return &schema_pb.Partition{ RangeStart: partition.RangeStart, RangeStop: partition.RangeStop, RingSize: partition.RingSize, diff --git a/weed/mq/topic/topic.go b/weed/mq/topic/topic.go index 5e9012e70..f390c7234 100644 --- a/weed/mq/topic/topic.go +++ b/weed/mq/topic/topic.go @@ -7,6 +7,7 @@ import ( "github.com/seaweedfs/seaweedfs/weed/filer" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" "github.com/seaweedfs/seaweedfs/weed/pb/mq_pb" + "github.com/seaweedfs/seaweedfs/weed/pb/schema_pb" jsonpb "google.golang.org/protobuf/encoding/protojson" ) @@ -21,15 +22,15 @@ func NewTopic(namespace string, name string) Topic { Name: name, } } -func FromPbTopic(topic *mq_pb.Topic) Topic { +func FromPbTopic(topic *schema_pb.Topic) Topic { return Topic{ Namespace: topic.Namespace, Name: topic.Name, } } -func (t Topic) ToPbTopic() *mq_pb.Topic { - return &mq_pb.Topic{ +func (t Topic) ToPbTopic() *schema_pb.Topic { + return &schema_pb.Topic{ Namespace: t.Namespace, Name: t.Name, } |