Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use struct instread of point for dynamic stream's events #374

Merged
merged 1 commit into from
Oct 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions downstreamadapter/dispatcher/helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,8 @@ func (d DispatcherEvent) IsBatchable() bool {
return d.isBatchable
}

func NewDispatcherEvent(event commonEvent.Event) *DispatcherEvent {
dispatcherEvent := &DispatcherEvent{
func NewDispatcherEvent(event commonEvent.Event) DispatcherEvent {
dispatcherEvent := DispatcherEvent{
Event: event,
}
switch event.GetType() {
Expand Down
6 changes: 3 additions & 3 deletions downstreamadapter/dispatchermanager/heartbeat_collector.go
Original file line number Diff line number Diff line change
Expand Up @@ -127,15 +127,15 @@ func (c *HeartBeatCollector) RecvMessages(_ context.Context, msg *messaging.Targ
case messaging.TypeHeartBeatResponse:
heartbeatResponse := msg.Message[0].(*heartbeatpb.HeartBeatResponse)
heartBeatResponseDynamicStream := GetHeartBeatResponseDynamicStream()
heartBeatResponseDynamicStream.In() <- *NewHeartBeatResponse(heartbeatResponse)
heartBeatResponseDynamicStream.In() <- NewHeartBeatResponse(heartbeatResponse)
case messaging.TypeScheduleDispatcherRequest:
schedulerDispatcherRequest := msg.Message[0].(*heartbeatpb.ScheduleDispatcherRequest)
c.schedulerDispatcherRequestDynamicStream.In() <- *NewSchedulerDispatcherRequest(schedulerDispatcherRequest)
c.schedulerDispatcherRequestDynamicStream.In() <- NewSchedulerDispatcherRequest(schedulerDispatcherRequest)
// TODO: check metrics
metrics.HandleDispatcherRequsetCounter.WithLabelValues("default", schedulerDispatcherRequest.ChangefeedID, "receive").Inc()
case messaging.TypeCheckpointTsMessage:
checkpointTsMessage := msg.Message[0].(*heartbeatpb.CheckpointTsMessage)
c.checkpointTsMessageDynamicStream.In() <- *NewCheckpointTsMessage(checkpointTsMessage)
c.checkpointTsMessageDynamicStream.In() <- NewCheckpointTsMessage(checkpointTsMessage)
default:
log.Panic("unknown message type", zap.Any("message", msg.Message))
}
Expand Down
12 changes: 6 additions & 6 deletions downstreamadapter/dispatchermanager/helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ func (r SchedulerDispatcherRequest) IsBatchable() bool {
return true
}

func NewSchedulerDispatcherRequest(req *heartbeatpb.ScheduleDispatcherRequest) *SchedulerDispatcherRequest {
return &SchedulerDispatcherRequest{req}
func NewSchedulerDispatcherRequest(req *heartbeatpb.ScheduleDispatcherRequest) SchedulerDispatcherRequest {
return SchedulerDispatcherRequest{req}
}

var schedulerDispatcherRequestDynamicStream dynstream.DynamicStream[model.ChangeFeedID, SchedulerDispatcherRequest, *EventDispatcherManager]
Expand Down Expand Up @@ -107,8 +107,8 @@ func (r HeartBeatResponse) IsBatchable() bool {
return true
}

func NewHeartBeatResponse(resp *heartbeatpb.HeartBeatResponse) *HeartBeatResponse {
return &HeartBeatResponse{resp}
func NewHeartBeatResponse(resp *heartbeatpb.HeartBeatResponse) HeartBeatResponse {
return HeartBeatResponse{resp}
}

var heartBeatResponseDynamicStream dynstream.DynamicStream[model.ChangeFeedID, HeartBeatResponse, *EventDispatcherManager]
Expand Down Expand Up @@ -136,8 +136,8 @@ func (r CheckpointTsMessage) IsBatchable() bool {
return true
}

func NewCheckpointTsMessage(msg *heartbeatpb.CheckpointTsMessage) *CheckpointTsMessage {
return &CheckpointTsMessage{msg}
func NewCheckpointTsMessage(msg *heartbeatpb.CheckpointTsMessage) CheckpointTsMessage {
return CheckpointTsMessage{msg}
}

var checkpointTsMessageDynamicStream dynstream.DynamicStream[model.ChangeFeedID, CheckpointTsMessage, *EventDispatcherManager]
Expand Down
4 changes: 2 additions & 2 deletions downstreamadapter/eventcollector/event_collector.go
Original file line number Diff line number Diff line change
Expand Up @@ -188,11 +188,11 @@ func (c *EventCollector) RecvEventsMessage(_ context.Context, msg *messaging.Tar
case commonEvent.TypeBatchResolvedEvent:
for _, e := range event.(*commonEvent.BatchResolvedEvent).Events {
c.metricDispatcherReceivedResolvedTsEventCount.Inc()
c.dispatcherEventsDynamicStream.In() <- *dispatcher.NewDispatcherEvent(e)
c.dispatcherEventsDynamicStream.In() <- dispatcher.NewDispatcherEvent(e)
}
default:
c.metricDispatcherReceivedKVEventCount.Inc()
c.dispatcherEventsDynamicStream.In() <- *dispatcher.NewDispatcherEvent(event)
c.dispatcherEventsDynamicStream.In() <- dispatcher.NewDispatcherEvent(event)
}
}
return nil
Expand Down
Loading