Merge pull request #5 from wXwcoder/feature/invokename

wXwcoder · web-flow · commit 5711e71b0254 · 2023-06-07T15:04:33.000+08:00
activate support invokeName
diff --git a/actor/actor.go b/actor/actor.go
@@ -44,7 +44,7 @@ type Server interface {
 	// Save state is called at two places: 1. On invocation of this actor instance. 2. When new actor starts.
 	SaveState() error
 	// Activate called when actor created by actor manager
-	Activate() error
+	Activate(invokeName string) error
 	// Deactivate called before actor removed by actor manager
 	Deactivate() error
 }
diff --git a/actor/manager/container.go b/actor/manager/container.go
@@ -44,15 +44,16 @@ func NewDefaultActorContainer(actorID string, impl actor.Server, serializer code
 	daprClient, _ := dapr.NewClient()
 	// create state manager for this new actor
 	impl.SetStateManager(state.NewActorStateManager(impl.Type(), actorID, state.NewDaprStateAsyncProvider(daprClient)))
-	err := impl.Activate()
+	// move out for Activate param
+	/*err := impl.Activate()
 	if err != nil {
 		return nil, actorErr.ErrSaveStateFailed
 	}
 	// save state of this actor
 	err = impl.SaveState()
 	if err != nil {
 		return nil, actorErr.ErrSaveStateFailed
-	}
+	}*/
 	methodType, err := getAbsctractMethodMap(impl)
 	if err != nil {
 		log.Printf("failed to get absctract method map from registered provider, err = %s", err)
diff --git a/actor/manager/manager.go b/actor/manager/manager.go
@@ -68,13 +68,22 @@ func (m *DefaultActorManager) RegisterActorImplFactory(f actor.Factory) {
 }
 
 // getAndCreateActorContainerIfNotExist will.
-func (m *DefaultActorManager) getAndCreateActorContainerIfNotExist(actorID string) (ActorContainer, actorErr.ActorErr) {
+func (m *DefaultActorManager) getAndCreateActorContainerIfNotExist(actorID, invokeName string) (ActorContainer, actorErr.ActorErr) {
 	val, ok := m.activeActors.Load(actorID)
 	if !ok {
 		newContainer, aerr := NewDefaultActorContainer(actorID, m.factory(), m.serializer)
 		if aerr != actorErr.Success {
 			return nil, aerr
 		}
+		err := newContainer.GetActor().Activate(invokeName)
+		if err != nil {
+			return nil, actorErr.ErrSaveStateFailed
+		}
+		// save state of this actor
+		err = newContainer.GetActor().SaveState()
+		if err != nil {
+			return nil, actorErr.ErrSaveStateFailed
+		}
 		m.activeActors.Store(actorID, newContainer)
 		val, _ = m.activeActors.Load(actorID)
 	}
@@ -87,7 +96,7 @@ func (m *DefaultActorManager) InvokeMethod(actorID, methodName string, request [
 		return nil, actorErr.ErrActorFactoryNotSet
 	}
 
-	actorContainer, aerr := m.getAndCreateActorContainerIfNotExist(actorID)
+	actorContainer, aerr := m.getAndCreateActorContainerIfNotExist(actorID, methodName)
 	if aerr != actorErr.Success {
 		return nil, aerr
 	}
@@ -143,7 +152,7 @@ func (m *DefaultActorManager) InvokeReminder(actorID, reminderName string, param
 		log.Printf("failed to unmarshal reminder param, err: %v ", err)
 		return actorErr.ErrRemindersParamsInvalid
 	}
-	actorContainer, aerr := m.getAndCreateActorContainerIfNotExist(actorID)
+	actorContainer, aerr := m.getAndCreateActorContainerIfNotExist(actorID, reminderName)
 	if aerr != actorErr.Success {
 		return aerr
 	}
@@ -166,7 +175,7 @@ func (m *DefaultActorManager) InvokeTimer(actorID, timerName string, params []by
 		log.Printf("failed to unmarshal reminder param, err: %v ", err)
 		return actorErr.ErrTimerParamsInvalid
 	}
-	actorContainer, aerr := m.getAndCreateActorContainerIfNotExist(actorID)
+	actorContainer, aerr := m.getAndCreateActorContainerIfNotExist(actorID, timerName)
 	if aerr != actorErr.Success {
 		return aerr
 	}
diff --git a/actor/mock/mock_factory_impl.go b/actor/mock/mock_factory_impl.go
@@ -27,7 +27,7 @@ type ActorImpl struct {
 	actor.ServerImplBase
 }
 
-func (t *ActorImpl) Activate() error {
+func (t *ActorImpl) Activate(invokeName string) error {
 	return nil
 }
 
diff --git a/actor/mock/mock_server.go b/actor/mock/mock_server.go

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ type Server interface {`
`44`	`44`	`// Save state is called at two places: 1. On invocation of this actor instance. 2. When new actor starts.`
`45`	`45`	`SaveState() error`
`46`	`46`	`// Activate called when actor created by actor manager`
`47`		`- Activate() error`
	`47`	`+ Activate(invokeName string) error`
`48`	`48`	`// Deactivate called before actor removed by actor manager`
`49`	`49`	`Deactivate() error`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,13 +68,22 @@ func (m *DefaultActorManager) RegisterActorImplFactory(f actor.Factory) {`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`// getAndCreateActorContainerIfNotExist will.`
`71`		`-func (m *DefaultActorManager) getAndCreateActorContainerIfNotExist(actorID string) (ActorContainer, actorErr.ActorErr) {`
	`71`	`+func (m *DefaultActorManager) getAndCreateActorContainerIfNotExist(actorID, invokeName string) (ActorContainer, actorErr.ActorErr) {`
`72`	`72`	`val, ok := m.activeActors.Load(actorID)`
`73`	`73`	`if !ok {`
`74`	`74`	`newContainer, aerr := NewDefaultActorContainer(actorID, m.factory(), m.serializer)`
`75`	`75`	`if aerr != actorErr.Success {`
`76`	`76`	`return nil, aerr`
`77`	`77`	`}`
	`78`	`+ err := newContainer.GetActor().Activate(invokeName)`
	`79`	`+ if err != nil {`
	`80`	`+ return nil, actorErr.ErrSaveStateFailed`
	`81`	`+ }`
	`82`	`+ // save state of this actor`
	`83`	`+ err = newContainer.GetActor().SaveState()`
	`84`	`+ if err != nil {`
	`85`	`+ return nil, actorErr.ErrSaveStateFailed`
	`86`	`+ }`
`78`	`87`	`m.activeActors.Store(actorID, newContainer)`
`79`	`88`	`val, _ = m.activeActors.Load(actorID)`
`80`	`89`	`}`
`@@ -87,7 +96,7 @@ func (m *DefaultActorManager) InvokeMethod(actorID, methodName string, request [`
`87`	`96`	`return nil, actorErr.ErrActorFactoryNotSet`
`88`	`97`	`}`
`89`	`98`
`90`		`- actorContainer, aerr := m.getAndCreateActorContainerIfNotExist(actorID)`
	`99`	`+ actorContainer, aerr := m.getAndCreateActorContainerIfNotExist(actorID, methodName)`
`91`	`100`	`if aerr != actorErr.Success {`
`92`	`101`	`return nil, aerr`
`93`	`102`	`}`
`@@ -143,7 +152,7 @@ func (m *DefaultActorManager) InvokeReminder(actorID, reminderName string, param`
`143`	`152`	`log.Printf("failed to unmarshal reminder param, err: %v ", err)`
`144`	`153`	`return actorErr.ErrRemindersParamsInvalid`
`145`	`154`	`}`
`146`		`- actorContainer, aerr := m.getAndCreateActorContainerIfNotExist(actorID)`
	`155`	`+ actorContainer, aerr := m.getAndCreateActorContainerIfNotExist(actorID, reminderName)`
`147`	`156`	`if aerr != actorErr.Success {`
`148`	`157`	`return aerr`
`149`	`158`	`}`
`@@ -166,7 +175,7 @@ func (m *DefaultActorManager) InvokeTimer(actorID, timerName string, params []by`
`166`	`175`	`log.Printf("failed to unmarshal reminder param, err: %v ", err)`
`167`	`176`	`return actorErr.ErrTimerParamsInvalid`
`168`	`177`	`}`
`169`		`- actorContainer, aerr := m.getAndCreateActorContainerIfNotExist(actorID)`
	`178`	`+ actorContainer, aerr := m.getAndCreateActorContainerIfNotExist(actorID, timerName)`
`170`	`179`	`if aerr != actorErr.Success {`
`171`	`180`	`return aerr`
`172`	`181`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ type ActorImpl struct {`
`27`	`27`	`actor.ServerImplBase`
`28`	`28`	`}`
`29`	`29`
`30`		`-func (t *ActorImpl) Activate() error {`
	`30`	`+func (t *ActorImpl) Activate(invokeName string) error {`
`31`	`31`	`return nil`
`32`	`32`	`}`
`33`	`33`