Move resetor to reset package (cadence-workflow#3340)

gaecom · Jun 16, 2020 · 208c34f · 208c34f
1 parent b7f42fa
commit 208c34f
Show file tree

Hide file tree

Showing 6 changed files with 122 additions and 102 deletions.
diff --git a/service/history/historyEngine.go b/service/history/historyEngine.go
@@ -210,14 +210,18 @@ func NewEngineWithShardContext(
 			executionCache,
 			logger,
 		),
+		resetor: reset.NewWorkflowResetor(
+			shard,
+			executionCache,
+			logger,
+		),
 		publicClient:        publicClient,
 		matchingClient:      matching,
 		rawMatchingClient:   rawMatchingClient,
 		queueTaskProcessor:  queueTaskProcessor,
 		clientChecker:       client.NewVersionChecker(),
 		failoverCoordinator: failoverCoordinator,
 	}
-	historyEngImpl.resetor = newWorkflowResetor(historyEngImpl)
 	historyEngImpl.decisionHandler = newDecisionHandler(historyEngImpl)
 
 	if config.TransferProcessorEnableMultiCurosrProcessor() {

diff --git a/service/history/workflowResetor_test.go → service/history/historyEngine_reset_test.go b/service/history/workflowResetor_test.go → service/history/historyEngine_reset_test.go
@@ -126,13 +126,14 @@ func (s *resetorSuite) SetupTest() {
 
 	s.logger = s.mockShard.GetLogger()
 
+	executionCache := execution.NewCache(s.mockShard)
 	h := &historyEngineImpl{
 		currentClusterName:   s.mockShard.GetClusterMetadata().GetCurrentClusterName(),
 		shard:                s.mockShard,
 		clusterMetadata:      s.mockClusterMetadata,
 		executionManager:     s.mockExecutionMgr,
 		historyV2Mgr:         s.mockHistoryV2Mgr,
-		executionCache:       execution.NewCache(s.mockShard),
+		executionCache:       executionCache,
 		logger:               s.logger,
 		metricsClient:        s.mockShard.GetMetricsClient(),
 		tokenSerializer:      common.NewJSONTaskTokenSerializer(),
@@ -143,7 +144,8 @@ func (s *resetorSuite) SetupTest() {
 		timerProcessor:       s.mockTimerProcessor,
 	}
 	s.mockShard.SetEngine(h)
-	s.resetor = newWorkflowResetor(h)
+	// TODO: replace depreciated workflowResetor once ndc and workflowRestter ready.
+	s.resetor = reset.NewWorkflowResetor(s.mockShard, executionCache, s.logger)
 	h.resetor = s.resetor
 	s.historyEngine = h
 }

diff --git a/service/history/historyReplicator.go b/service/history/historyReplicator.go
@@ -151,7 +151,7 @@ func newHistoryReplicator(
 			)
 		},
 	}
-	replicator.resetor = newWorkflowResetor(historyEngine)
+	replicator.resetor = reset.NewWorkflowResetor(shard, executionCache, logger)
 
 	return replicator
 }

diff --git a/service/history/reset/resetor.go b/service/history/reset/resetor.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -151,7 +151,7 @@ func newHistoryReplicator( @@
     			)
     		},
     	}
-    	replicator.resetor = newWorkflowResetor(historyEngine)
+    	replicator.resetor = reset.NewWorkflowResetor(shard, executionCache, logger)
     	return replicator
     }
@@ Expand Down @@