Skip to content

Commit

Permalink
Remove unused now parameter from task generator interface (#4217)
Browse files Browse the repository at this point in the history
  • Loading branch information
yycptt authored May 25, 2021
1 parent 2843e42 commit 758123f
Show file tree
Hide file tree
Showing 11 changed files with 56 additions and 126 deletions.
3 changes: 2 additions & 1 deletion service/history/execution/history_builder_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,10 @@ func (s *historyBuilderSuite) SetupTest() {

s.mockDomainCache = s.mockShard.Resource.DomainCache
s.mockEventsCache = s.mockShard.MockEventsCache
s.mockDomainCache.EXPECT().GetDomain(s.domainName).Return(s.domainEntry, nil).AnyTimes()
s.mockDomainCache.EXPECT().GetDomainID(s.domainName).Return(s.domainID, nil).AnyTimes()
s.mockDomainCache.EXPECT().GetDomainByID(s.domainID).Return(s.domainEntry, nil).AnyTimes()
s.mockDomainCache.EXPECT().GetDomain(s.targetDomainName).Return(s.targetDomainEntry, nil).AnyTimes()
s.mockDomainCache.EXPECT().GetDomainID(s.targetDomainName).Return(s.targetDomainID, nil).AnyTimes()
s.mockDomainCache.EXPECT().GetDomainByID(s.targetDomainID).Return(s.targetDomainEntry, nil).AnyTimes()
s.mockEventsCache.EXPECT().PutEvent(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes()

Expand Down
16 changes: 3 additions & 13 deletions service/history/execution/mutable_state_builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -1689,7 +1689,6 @@ func (e *mutableStateBuilder) addWorkflowExecutionStartedEventForContinueAsNew(
return nil, err
}
if err := e.taskGenerator.GenerateRecordWorkflowStartedTasks(
e.unixNanoToTime(event.GetTimestamp()),
event,
); err != nil {
return nil, err
Expand Down Expand Up @@ -1744,7 +1743,6 @@ func (e *mutableStateBuilder) AddWorkflowExecutionStartedEvent(
return nil, err
}
if err := e.taskGenerator.GenerateRecordWorkflowStartedTasks(
e.unixNanoToTime(event.GetTimestamp()),
event,
); err != nil {
return nil, err
Expand Down Expand Up @@ -1971,7 +1969,7 @@ func (e *mutableStateBuilder) addBinaryCheckSumIfNotExists(
}
exeInfo.SearchAttributes[definition.BinaryChecksums] = bytes
if e.shard.GetConfig().AdvancedVisibilityWritingMode() != common.AdvancedVisibilityWritingModeOff {
return e.taskGenerator.GenerateWorkflowSearchAttrTasks(e.unixNanoToTime(event.GetTimestamp()))
return e.taskGenerator.GenerateWorkflowSearchAttrTasks()
}
return nil
}
Expand Down Expand Up @@ -2134,7 +2132,6 @@ func (e *mutableStateBuilder) AddActivityTaskScheduledEvent(
}
// TODO merge active & passive task generation
if err := e.taskGenerator.GenerateActivityTransferTasks(
e.unixNanoToTime(event.GetTimestamp()),
event,
); err != nil {
return nil, nil, nil, err
Expand Down Expand Up @@ -2754,7 +2751,6 @@ func (e *mutableStateBuilder) AddRequestCancelExternalWorkflowExecutionInitiated
}
// TODO merge active & passive task generation
if err := e.taskGenerator.GenerateRequestCancelExternalTasks(
e.unixNanoToTime(event.GetTimestamp()),
event,
); err != nil {
return nil, nil, err
Expand Down Expand Up @@ -2878,7 +2874,6 @@ func (e *mutableStateBuilder) AddSignalExternalWorkflowExecutionInitiatedEvent(
}
// TODO merge active & passive task generation
if err := e.taskGenerator.GenerateSignalExternalTasks(
e.unixNanoToTime(event.GetTimestamp()),
event,
); err != nil {
return nil, nil, err
Expand Down Expand Up @@ -2923,9 +2918,7 @@ func (e *mutableStateBuilder) AddUpsertWorkflowSearchAttributesEvent(
event := e.hBuilder.AddUpsertWorkflowSearchAttributesEvent(decisionCompletedEventID, request)
e.ReplicateUpsertWorkflowSearchAttributesEvent(event)
// TODO merge active & passive task generation
if err := e.taskGenerator.GenerateWorkflowSearchAttrTasks(
e.unixNanoToTime(event.GetTimestamp()),
); err != nil {
if err := e.taskGenerator.GenerateWorkflowSearchAttrTasks(); err != nil {
return nil, err
}
return event, nil
Expand Down Expand Up @@ -3411,7 +3404,6 @@ func (e *mutableStateBuilder) AddStartChildWorkflowExecutionInitiatedEvent(
}
// TODO merge active & passive task generation
if err := e.taskGenerator.GenerateChildWorkflowTasks(
e.unixNanoToTime(event.GetTimestamp()),
event,
); err != nil {
return nil, nil, err
Expand Down Expand Up @@ -4514,9 +4506,7 @@ func (e *mutableStateBuilder) closeTransactionHandleWorkflowReset(
&domainEntry.GetConfig().BadBinaries,
e.GetExecutionInfo().AutoResetPoints,
); pt != nil {
if err := e.taskGenerator.GenerateWorkflowResetTasks(
e.unixNanoToTime(now.UnixNano()),
); err != nil {
if err := e.taskGenerator.GenerateWorkflowResetTasks(); err != nil {
return err
}
e.logInfo("Auto-Reset task is scheduled",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,6 @@ func (m *mutableStateDecisionTaskManagerImpl) AddDecisionTaskScheduledEventAsHea
// TODO merge active & passive task generation
if !bypassTaskGeneration {
if err := m.msb.taskGenerator.GenerateDecisionScheduleTasks(
m.msb.unixNanoToTime(scheduleTime), // schedule time is now
scheduleID,
); err != nil {
return nil, err
Expand Down Expand Up @@ -502,7 +501,6 @@ func (m *mutableStateDecisionTaskManagerImpl) AddDecisionTaskStartedEvent(
decision, err := m.ReplicateDecisionTaskStartedEvent(decision, m.msb.GetCurrentVersion(), scheduleID, startedID, requestID, startTime)
// TODO merge active & passive task generation
if err := m.msb.taskGenerator.GenerateDecisionStartTasks(
m.msb.unixNanoToTime(startTime), // start time is now
scheduleID,
); err != nil {
return nil, nil, err
Expand Down
36 changes: 5 additions & 31 deletions service/history/execution/mutable_state_task_generator.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,46 +46,35 @@ type (
now time.Time,
) error
GenerateRecordWorkflowStartedTasks(
now time.Time,
startEvent *types.HistoryEvent,
) error
GenerateDelayedDecisionTasks(
now time.Time,
startEvent *types.HistoryEvent,
) error
GenerateDecisionScheduleTasks(
now time.Time,
decisionScheduleID int64,
) error
GenerateDecisionStartTasks(
now time.Time,
decisionScheduleID int64,
) error
GenerateActivityTransferTasks(
now time.Time,
event *types.HistoryEvent,
) error
GenerateActivityRetryTasks(
activityScheduleID int64,
) error
GenerateChildWorkflowTasks(
now time.Time,
event *types.HistoryEvent,
) error
GenerateRequestCancelExternalTasks(
now time.Time,
event *types.HistoryEvent,
) error
GenerateSignalExternalTasks(
now time.Time,
event *types.HistoryEvent,
) error
GenerateWorkflowSearchAttrTasks(
now time.Time,
) error
GenerateWorkflowResetTasks(
now time.Time,
) error
GenerateWorkflowSearchAttrTasks() error
GenerateWorkflowResetTasks() error

// these 2 APIs should only be called when mutable state transaction is being closed
GenerateActivityTimerTasks(
Expand Down Expand Up @@ -230,7 +219,6 @@ func (r *mutableStateTaskGeneratorImpl) GenerateDelayedDecisionTasks(
}

func (r *mutableStateTaskGeneratorImpl) GenerateRecordWorkflowStartedTasks(
now time.Time,
startEvent *types.HistoryEvent,
) error {

Expand All @@ -245,7 +233,6 @@ func (r *mutableStateTaskGeneratorImpl) GenerateRecordWorkflowStartedTasks(
}

func (r *mutableStateTaskGeneratorImpl) GenerateDecisionScheduleTasks(
now time.Time,
decisionScheduleID int64,
) error {

Expand Down Expand Up @@ -287,7 +274,6 @@ func (r *mutableStateTaskGeneratorImpl) GenerateDecisionScheduleTasks(
}

func (r *mutableStateTaskGeneratorImpl) GenerateDecisionStartTasks(
now time.Time,
decisionScheduleID int64,
) error {

Expand Down Expand Up @@ -326,7 +312,6 @@ func (r *mutableStateTaskGeneratorImpl) GenerateDecisionStartTasks(
}

func (r *mutableStateTaskGeneratorImpl) GenerateActivityTransferTasks(
now time.Time,
event *types.HistoryEvent,
) error {

Expand Down Expand Up @@ -388,7 +373,6 @@ func (r *mutableStateTaskGeneratorImpl) GenerateActivityRetryTasks(
}

func (r *mutableStateTaskGeneratorImpl) GenerateChildWorkflowTasks(
now time.Time,
event *types.HistoryEvent,
) error {

Expand Down Expand Up @@ -420,7 +404,6 @@ func (r *mutableStateTaskGeneratorImpl) GenerateChildWorkflowTasks(
}

func (r *mutableStateTaskGeneratorImpl) GenerateRequestCancelExternalTasks(
now time.Time,
event *types.HistoryEvent,
) error {

Expand Down Expand Up @@ -458,7 +441,6 @@ func (r *mutableStateTaskGeneratorImpl) GenerateRequestCancelExternalTasks(
}

func (r *mutableStateTaskGeneratorImpl) GenerateSignalExternalTasks(
now time.Time,
event *types.HistoryEvent,
) error {

Expand Down Expand Up @@ -495,9 +477,7 @@ func (r *mutableStateTaskGeneratorImpl) GenerateSignalExternalTasks(
return nil
}

func (r *mutableStateTaskGeneratorImpl) GenerateWorkflowSearchAttrTasks(
now time.Time,
) error {
func (r *mutableStateTaskGeneratorImpl) GenerateWorkflowSearchAttrTasks() error {

currentVersion := r.mutableState.GetCurrentVersion()

Expand All @@ -509,9 +489,7 @@ func (r *mutableStateTaskGeneratorImpl) GenerateWorkflowSearchAttrTasks(
return nil
}

func (r *mutableStateTaskGeneratorImpl) GenerateWorkflowResetTasks(
now time.Time,
) error {
func (r *mutableStateTaskGeneratorImpl) GenerateWorkflowResetTasks() error {

currentVersion := r.mutableState.GetCurrentVersion()

Expand Down Expand Up @@ -551,11 +529,7 @@ func (r *mutableStateTaskGeneratorImpl) getTargetDomainID(

targetDomainID := r.mutableState.GetExecutionInfo().DomainID
if targetDomainName != "" {
targetDomainEntry, err := r.domainCache.GetDomain(targetDomainName)
if err != nil {
return "", err
}
targetDomainID = targetDomainEntry.GetInfo().ID
return r.domainCache.GetDomainID(targetDomainName)
}

return targetDomainID, nil
Expand Down
Loading

0 comments on commit 758123f

Please sign in to comment.