aboutsummaryrefslogtreecommitdiff
path: root/weed/mq/topic/topic.go
diff options
context:
space:
mode:
Diffstat (limited to 'weed/mq/topic/topic.go')
-rw-r--r--weed/mq/topic/topic.go48
1 files changed, 6 insertions, 42 deletions
diff --git a/weed/mq/topic/topic.go b/weed/mq/topic/topic.go
index 3d457e6f1..6932fcb56 100644
--- a/weed/mq/topic/topic.go
+++ b/weed/mq/topic/topic.go
@@ -2,9 +2,7 @@ package topic
import (
"fmt"
- "github.com/seaweedfs/seaweedfs/weed/filer"
"github.com/seaweedfs/seaweedfs/weed/pb/mq_pb"
- "time"
)
type Topic struct {
@@ -25,47 +23,13 @@ func FromPbTopic(topic *mq_pb.Topic) Topic {
}
}
-func (tp Topic) String() string {
- return fmt.Sprintf("%s.%s", tp.Namespace, tp.Name)
-}
-
-type Segment struct {
- Topic Topic
- Id int32
- Partition Partition
- LastModified time.Time
-}
-
-func FromPbSegment(segment *mq_pb.Segment) *Segment {
- return &Segment{
- Topic: Topic{
- Namespace: segment.Namespace,
- Name: segment.Topic,
- },
- Id: segment.Id,
- Partition: Partition{
- RangeStart: segment.Partition.RangeStart,
- RangeStop: segment.Partition.RangeStop,
- RingSize: segment.Partition.RingSize,
- },
+func (tp Topic) ToPbTopic() *mq_pb.Topic {
+ return &mq_pb.Topic{
+ Namespace: tp.Namespace,
+ Name: tp.Name,
}
}
-func (segment *Segment) ToPbSegment() *mq_pb.Segment {
- return &mq_pb.Segment{
- Namespace: string(segment.Topic.Namespace),
- Topic: segment.Topic.Name,
- Id: segment.Id,
- Partition: &mq_pb.Partition{
- RingSize: segment.Partition.RingSize,
- RangeStart: segment.Partition.RangeStart,
- RangeStop: segment.Partition.RangeStop,
- },
- }
-}
-
-func (segment *Segment) DirAndName() (dir string, name string) {
- dir = fmt.Sprintf("%s/%s/%s", filer.TopicsDir, segment.Topic.Namespace, segment.Topic.Name)
- name = fmt.Sprintf("%4d.segment", segment.Id)
- return
+func (tp Topic) String() string {
+ return fmt.Sprintf("%s.%s", tp.Namespace, tp.Name)
}