add tests for closeTransaction and fix bugs

Author: feiyang3cat

service/history/historybuilder/event_factory.go

@@ -1081,15 +1081,15 @@ func (b *EventFactory) createHistoryEvent(
 }
 
 func (b *EventFactory) CreateWorkflowExecutionTimeSkippingTransitionedEvent(
-	targetTime *time.Time,
+	targetTime time.Time,
 	triggeredDisable bool,
 ) *historypb.HistoryEvent {
 	event := b.createHistoryEvent(enumspb.EVENT_TYPE_WORKFLOW_EXECUTION_TIME_SKIPPING_TRANSITIONED, b.timeSource.Now())
 	transitionedAttr := &historypb.WorkflowExecutionTimeSkippingTransitionedEventAttributes{
 		WallClockTime:      timestamppb.New(b.timeSource.Now()),
 		DisabledAfterBound: triggeredDisable,
 	}
-	if targetTime != nil {
+	if !targetTime.IsZero() {
 		transitionedAttr.TargetTime = timestamppb.New(targetTime.UTC())
 	}
 	event.Attributes = &historypb.HistoryEvent_WorkflowExecutionTimeSkippingTransitionedEventAttributes{

service/history/historybuilder/history_builder.go

@@ -323,7 +323,7 @@ func (b *HistoryBuilder) AddActivityTaskScheduledEvent(
 }
 
 func (b *HistoryBuilder) AddWorkflowExecutionTimeSkippingTransitionedEvent(
-	targetTime *time.Time,
+	targetTime time.Time,
 	triggeredDisable bool,
 ) *historypb.HistoryEvent {
 	event := b.CreateWorkflowExecutionTimeSkippingTransitionedEvent(targetTime, triggeredDisable)

service/history/historybuilder/history_builder_test.go

@@ -2580,7 +2580,7 @@ func (s *historyBuilderSuite) TestAddWorkflowExecutionTimeSkippingTransitionedEv
 	targetTime := s.now.Add(2 * time.Hour)
 
 	s.Run("WorkerMayIgnoreAndAttributesPopulated", func() {
-		event := s.historyBuilder.AddWorkflowExecutionTimeSkippingTransitionedEvent(&targetTime, false)
+		event := s.historyBuilder.AddWorkflowExecutionTimeSkippingTransitionedEvent(targetTime, false)
 
 		s.NotNil(event)
 		s.True(event.WorkerMayIgnore)
@@ -2595,7 +2595,7 @@ func (s *historyBuilderSuite) TestAddWorkflowExecutionTimeSkippingTransitionedEv
 	})
 
 	s.Run("DisabledAfterBoundPropagated", func() {
-		event := s.historyBuilder.AddWorkflowExecutionTimeSkippingTransitionedEvent(&targetTime, true)
+		event := s.historyBuilder.AddWorkflowExecutionTimeSkippingTransitionedEvent(targetTime, true)
 
 		attrs := event.GetWorkflowExecutionTimeSkippingTransitionedEventAttributes()
 		s.NotNil(attrs)
@@ -2605,7 +2605,7 @@ func (s *historyBuilderSuite) TestAddWorkflowExecutionTimeSkippingTransitionedEv
 
 	// no targetTime and only disabledAfterBound is true
 	s.Run("NoTargetTimeAndOnlyDisabledAfterBoundIsTrue", func() {
-		event := s.historyBuilder.AddWorkflowExecutionTimeSkippingTransitionedEvent(nil, true)
+		event := s.historyBuilder.AddWorkflowExecutionTimeSkippingTransitionedEvent(time.Time{}, true)
 
 		attrs := event.GetWorkflowExecutionTimeSkippingTransitionedEventAttributes()
 		s.NotNil(attrs)

service/history/timer_queue_active_task_executor.go

@@ -158,9 +158,6 @@ func (t *timerQueueActiveTaskExecutor) executeUserTimerTimeoutTask(
 
 	timerSequence := t.getTimerSequence(mutableState)
 	referenceTime := t.Now()
-	if tsInfo := mutableState.GetExecutionInfo().GetTimeSkippingInfo(); tsInfo != nil && tsInfo.GetAccumulatedSkippedDuration() != nil {
-		referenceTime = mutableState.GetTimeSkippingVirtualTime()
-	}
 	timerFired := false
 Loop:
 	for _, timerSequenceID := range timerSequence.LoadAndSortUserTimers() {

service/history/workflow/mutable_state_impl.go

@@ -4032,19 +4032,11 @@ func (ms *MutableStateImpl) AddWorkflowExecutionTimeSkippingTransitionedEvent(ct
 		return nil, serviceerror.NewInternal("time skipping is triggered when conditions are not met")
 	}
 
-	if nextTimePointToSkip == nil {
-		event := ms.hBuilder.AddWorkflowExecutionTimeSkippingTransitionedEvent(
-			nil,
-			disabledAfterBound,
-		)
-		return event, ms.ApplyWorkflowExecutionTimeSkippingTransitionedEvent(ctx, event)
+	var targetTime time.Time
+	if nextTimePointToSkip != nil {
+		targetTime = nextTimePointToSkip.ExpiryTime.AsTime()
 	}
-
-	targetTime := nextTimePointToSkip.ExpiryTime.AsTime()
-	event := ms.hBuilder.AddWorkflowExecutionTimeSkippingTransitionedEvent(
-		&targetTime,
-		disabledAfterBound,
-	)
+	event := ms.hBuilder.AddWorkflowExecutionTimeSkippingTransitionedEvent(targetTime, disabledAfterBound)
 	return event, ms.ApplyWorkflowExecutionTimeSkippingTransitionedEvent(ctx, event)
 }
 
@@ -7256,7 +7248,7 @@ func (ms *MutableStateImpl) closeTransaction(
 		return closeTransactionResult{}, err
 	}
 
-	regenTimerTasksForTimeSkipping := ms.closeTransactionHandlerTimeSkipping(ctx, transactionPolicy)
+	regenTimerTasksForTimeSkipping := ms.closeTransactionHandleTimeSkipping(ctx, transactionPolicy)
 
 	// Save if the state is dirty before closeTransactionPrepareEvents since it flushes the buffer
 	// events, and therefore change the dirty state.
@@ -8458,7 +8450,7 @@ func (ms *MutableStateImpl) closeTransactionHandleActivityUserTimerTasks(
 	}
 }
 
-func (ms *MutableStateImpl) closeTransactionHandlerTimeSkipping(
+func (ms *MutableStateImpl) closeTransactionHandleTimeSkipping(
 	ctx context.Context,
 	transactionPolicy historyi.TransactionPolicy,
 ) (regenTimerTasksForTimeSkipping bool) {
@@ -8485,7 +8477,7 @@ func (ms *MutableStateImpl) closeTransactionHandlerTimeSkipping(
 	case historyi.TransactionPolicyPassive:
 		return false
 	default:
-		ms.logger.Error(fmt.Sprintf("closeTransactionHandlerTimeSkipping: unknown transaction policy: %v", transactionPolicy),
+		ms.logger.Error(fmt.Sprintf("closeTransactionHandleTimeSkipping: unknown transaction policy: %v", transactionPolicy),
 			tag.WorkflowID(ms.GetExecutionInfo().WorkflowId),
 			tag.WorkflowRunID(ms.GetExecutionState().RunId),
 		)