Merge accumulated changes related to message queue (#5098)

* balance partitions on brokers * prepare topic partition first and then publish, move partition * purge unused APIs * clean up * adjust logs * add BalanceTopics() grpc API * configure topic * configure topic command * refactor * repair missing partitions * sequence of operations to ensure ordering * proto to close publishers and consumers * rename file * topic partition versioned by unixTimeNs * create local topic partition * close publishers * randomize the client name * wait until no publishers * logs * close stop publisher channel * send last ack * comments * comment * comments * support list of brokers * add cli options * Update .gitignore * logs * return io.eof directly * refactor * optionally create topic * refactoring * detect consumer disconnection * sub client wait for more messages * subscribe by time stamp * rename * rename to sub_balancer * rename * adjust comments * rename * fix compilation * rename * rename * SubscriberToSubCoordinator * sticky rebalance * go fmt * add tests * balance partitions on brokers * prepare topic partition first and then publish, move partition * purge unused APIs * clean up * adjust logs * add BalanceTopics() grpc API * configure topic * configure topic command * refactor * repair missing partitions * sequence of operations to ensure ordering * proto to close publishers and consumers * rename file * topic partition versioned by unixTimeNs * create local topic partition * close publishers * randomize the client name * wait until no publishers * logs * close stop publisher channel * send last ack * comments * comment * comments * support list of brokers * add cli options * Update .gitignore * logs * return io.eof directly * refactor * optionally create topic * refactoring * detect consumer disconnection * sub client wait for more messages * subscribe by time stamp * rename * rename to sub_balancer * rename * adjust comments * rename * fix compilation * rename * rename * SubscriberToSubCoordinator * sticky rebalance * go fmt * add tests * tracking topic=>broker * merge * comment
2023-12-11 12:05:54 -08:00
parent 8784553501
commit 580940bf82
58 changed files with 3853 additions and 2752 deletions
--- a/weed/mq/topic/partition.go
+++ b/weed/mq/topic/partition.go
@@ -8,6 +8,7 @@ type Partition struct {
 	RangeStart int32
 	RangeStop  int32 // exclusive
 	RingSize   int32
+	UnixTimeNs int64 // in nanoseconds
 }

 func (partition Partition) Equals(other Partition) bool {
@@ -20,6 +21,9 @@ func (partition Partition) Equals(other Partition) bool {
 	if partition.RingSize != other.RingSize {
 		return false
 	}
+	if partition.UnixTimeNs != other.UnixTimeNs {
+		return false
+	}
 	return true
 }

@@ -28,10 +32,11 @@ func FromPbPartition(partition *mq_pb.Partition) Partition {
 		RangeStart: partition.RangeStart,
 		RangeStop:  partition.RangeStop,
 		RingSize:   partition.RingSize,
+		UnixTimeNs: partition.UnixTimeNs,
 	}
 }

-func SplitPartitions(targetCount int32) []*Partition {
+func SplitPartitions(targetCount int32, ts int64) []*Partition {
 	partitions := make([]*Partition, 0, targetCount)
 	partitionSize := PartitionCount / targetCount
 	for i := int32(0); i < targetCount; i++ {
@@ -43,7 +48,17 @@ func SplitPartitions(targetCount int32) []*Partition {
 			RangeStart: i * partitionSize,
 			RangeStop:  partitionStop,
 			RingSize:   PartitionCount,
+			UnixTimeNs: ts,
 		})
 	}
 	return partitions
 }
+
+func (partition Partition) ToPbPartition() *mq_pb.Partition {
+	return &mq_pb.Partition{
+		RangeStart: partition.RangeStart,
+		RangeStop:  partition.RangeStop,
+		RingSize:   partition.RingSize,
+		UnixTimeNs: partition.UnixTimeNs,
+	}
+}