Skip to content

Commit 663f74c

Browse files
vytautas-karpaviciusvytautas-karpavicius
authored
Drop pointer for signal name fields (#3966)
1 parent c244e9d commit 663f74c

25 files changed

+117
-118
lines changed

‎common/testing/history_event_util.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ func InitializeHistoryEventGenerator(
250250
historyEvent := getDefaultHistoryEvent(EventID, version)
251251
historyEvent.EventType = types.EventTypeWorkflowExecutionSignaled.Ptr()
252252
historyEvent.WorkflowExecutionSignaledEventAttributes = &types.WorkflowExecutionSignaledEventAttributes{
253-
SignalName: common.StringPtr(signal),
253+
SignalName: signal,
254254
Identity: identity,
255255
}
256256
return historyEvent
@@ -825,7 +825,7 @@ func InitializeHistoryEventGenerator(
825825
WorkflowID: externalWorkflowID,
826826
RunID: uuid.New(),
827827
},
828-
SignalName: common.StringPtr("signal"),
828+
SignalName: "signal",
829829
ChildWorkflowOnly: false,
830830
}
831831
return historyEvent

‎common/types/mapper/thrift/shared.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4648,7 +4648,7 @@ func FromSignalExternalWorkflowExecutionDecisionAttributes(t *types.SignalExtern
46484648
return &shared.SignalExternalWorkflowExecutionDecisionAttributes{
46494649
Domain: &t.Domain,
46504650
Execution: FromWorkflowExecution(t.Execution),
4651-
SignalName: t.SignalName,
4651+
SignalName: &t.SignalName,
46524652
Input: t.Input,
46534653
Control: t.Control,
46544654
ChildWorkflowOnly: &t.ChildWorkflowOnly,
@@ -4663,7 +4663,7 @@ func ToSignalExternalWorkflowExecutionDecisionAttributes(t *shared.SignalExterna
46634663
return &types.SignalExternalWorkflowExecutionDecisionAttributes{
46644664
Domain: t.GetDomain(),
46654665
Execution: ToWorkflowExecution(t.Execution),
4666-
SignalName: t.SignalName,
4666+
SignalName: t.GetSignalName(),
46674667
Input: t.Input,
46684668
Control: t.Control,
46694669
ChildWorkflowOnly: t.GetChildWorkflowOnly(),
@@ -4735,7 +4735,7 @@ func FromSignalExternalWorkflowExecutionInitiatedEventAttributes(t *types.Signal
47354735
DecisionTaskCompletedEventId: &t.DecisionTaskCompletedEventID,
47364736
Domain: &t.Domain,
47374737
WorkflowExecution: FromWorkflowExecution(t.WorkflowExecution),
4738-
SignalName: t.SignalName,
4738+
SignalName: &t.SignalName,
47394739
Input: t.Input,
47404740
Control: t.Control,
47414741
ChildWorkflowOnly: &t.ChildWorkflowOnly,
@@ -4751,7 +4751,7 @@ func ToSignalExternalWorkflowExecutionInitiatedEventAttributes(t *shared.SignalE
47514751
DecisionTaskCompletedEventID: t.GetDecisionTaskCompletedEventId(),
47524752
Domain: t.GetDomain(),
47534753
WorkflowExecution: ToWorkflowExecution(t.WorkflowExecution),
4754-
SignalName: t.SignalName,
4754+
SignalName: t.GetSignalName(),
47554755
Input: t.Input,
47564756
Control: t.Control,
47574757
ChildWorkflowOnly: t.GetChildWorkflowOnly(),
@@ -4774,7 +4774,7 @@ func FromSignalWithStartWorkflowExecutionRequest(t *types.SignalWithStartWorkflo
47744774
Identity: &t.Identity,
47754775
RequestId: &t.RequestID,
47764776
WorkflowIdReusePolicy: FromWorkflowIDReusePolicy(t.WorkflowIDReusePolicy),
4777-
SignalName: t.SignalName,
4777+
SignalName: &t.SignalName,
47784778
SignalInput: t.SignalInput,
47794779
Control: t.Control,
47804780
RetryPolicy: FromRetryPolicy(t.RetryPolicy),
@@ -4801,7 +4801,7 @@ func ToSignalWithStartWorkflowExecutionRequest(t *shared.SignalWithStartWorkflow
48014801
Identity: t.GetIdentity(),
48024802
RequestID: t.GetRequestId(),
48034803
WorkflowIDReusePolicy: ToWorkflowIDReusePolicy(t.WorkflowIdReusePolicy),
4804-
SignalName: t.SignalName,
4804+
SignalName: t.GetSignalName(),
48054805
SignalInput: t.SignalInput,
48064806
Control: t.Control,
48074807
RetryPolicy: ToRetryPolicy(t.RetryPolicy),
@@ -4820,7 +4820,7 @@ func FromSignalWorkflowExecutionRequest(t *types.SignalWorkflowExecutionRequest)
48204820
return &shared.SignalWorkflowExecutionRequest{
48214821
Domain: &t.Domain,
48224822
WorkflowExecution: FromWorkflowExecution(t.WorkflowExecution),
4823-
SignalName: t.SignalName,
4823+
SignalName: &t.SignalName,
48244824
Input: t.Input,
48254825
Identity: &t.Identity,
48264826
RequestId: &t.RequestID,
@@ -4836,7 +4836,7 @@ func ToSignalWorkflowExecutionRequest(t *shared.SignalWorkflowExecutionRequest)
48364836
return &types.SignalWorkflowExecutionRequest{
48374837
Domain: t.GetDomain(),
48384838
WorkflowExecution: ToWorkflowExecution(t.WorkflowExecution),
4839-
SignalName: t.SignalName,
4839+
SignalName: t.GetSignalName(),
48404840
Input: t.Input,
48414841
Identity: t.GetIdentity(),
48424842
RequestID: t.GetRequestId(),
@@ -6048,7 +6048,7 @@ func FromWorkflowExecutionSignaledEventAttributes(t *types.WorkflowExecutionSign
60486048
return nil
60496049
}
60506050
return &shared.WorkflowExecutionSignaledEventAttributes{
6051-
SignalName: t.SignalName,
6051+
SignalName: &t.SignalName,
60526052
Input: t.Input,
60536053
Identity: &t.Identity,
60546054
}
@@ -6060,7 +6060,7 @@ func ToWorkflowExecutionSignaledEventAttributes(t *shared.WorkflowExecutionSigna
60606060
return nil
60616061
}
60626062
return &types.WorkflowExecutionSignaledEventAttributes{
6063-
SignalName: t.SignalName,
6063+
SignalName: t.GetSignalName(),
60646064
Input: t.Input,
60656065
Identity: t.GetIdentity(),
60666066
}

‎common/types/shared.go

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7275,7 +7275,7 @@ func (v *ServiceBusyError) GetMessage() (o string) {
72757275
type SignalExternalWorkflowExecutionDecisionAttributes struct {
72767276
Domain string `json:"domain,omitempty"`
72777277
Execution *WorkflowExecution `json:"execution,omitempty"`
7278-
SignalName *string `json:"signalName,omitempty"`
7278+
SignalName string `json:"signalName,omitempty"`
72797279
Input []byte `json:"input,omitempty"`
72807280
Control []byte `json:"control,omitempty"`
72817281
ChildWorkflowOnly bool `json:"childWorkflowOnly,omitempty"`
@@ -7299,8 +7299,8 @@ func (v *SignalExternalWorkflowExecutionDecisionAttributes) GetExecution() (o *W
72997299

73007300
// GetSignalName is an internal getter (TBD...)
73017301
func (v *SignalExternalWorkflowExecutionDecisionAttributes) GetSignalName() (o string) {
7302-
if v != nil && v.SignalName != nil {
7303-
return *v.SignalName
7302+
if v != nil {
7303+
return v.SignalName
73047304
}
73057305
return
73067306
}
@@ -7436,7 +7436,7 @@ type SignalExternalWorkflowExecutionInitiatedEventAttributes struct {
74367436
DecisionTaskCompletedEventID int64 `json:"decisionTaskCompletedEventId,omitempty"`
74377437
Domain string `json:"domain,omitempty"`
74387438
WorkflowExecution *WorkflowExecution `json:"workflowExecution,omitempty"`
7439-
SignalName *string `json:"signalName,omitempty"`
7439+
SignalName string `json:"signalName,omitempty"`
74407440
Input []byte `json:"input,omitempty"`
74417441
Control []byte `json:"control,omitempty"`
74427442
ChildWorkflowOnly bool `json:"childWorkflowOnly,omitempty"`
@@ -7468,8 +7468,8 @@ func (v *SignalExternalWorkflowExecutionInitiatedEventAttributes) GetWorkflowExe
74687468

74697469
// GetSignalName is an internal getter (TBD...)
74707470
func (v *SignalExternalWorkflowExecutionInitiatedEventAttributes) GetSignalName() (o string) {
7471-
if v != nil && v.SignalName != nil {
7472-
return *v.SignalName
7471+
if v != nil {
7472+
return v.SignalName
74737473
}
74747474
return
74757475
}
@@ -7510,7 +7510,7 @@ type SignalWithStartWorkflowExecutionRequest struct {
75107510
Identity string `json:"identity,omitempty"`
75117511
RequestID string `json:"requestId,omitempty"`
75127512
WorkflowIDReusePolicy *WorkflowIDReusePolicy `json:"workflowIdReusePolicy,omitempty"`
7513-
SignalName *string `json:"signalName,omitempty"`
7513+
SignalName string `json:"signalName,omitempty"`
75147514
SignalInput []byte `json:"signalInput,omitempty"`
75157515
Control []byte `json:"control,omitempty"`
75167516
RetryPolicy *RetryPolicy `json:"retryPolicy,omitempty"`
@@ -7602,8 +7602,8 @@ func (v *SignalWithStartWorkflowExecutionRequest) GetWorkflowIDReusePolicy() (o
76027602

76037603
// GetSignalName is an internal getter (TBD...)
76047604
func (v *SignalWithStartWorkflowExecutionRequest) GetSignalName() (o string) {
7605-
if v != nil && v.SignalName != nil {
7606-
return *v.SignalName
7605+
if v != nil {
7606+
return v.SignalName
76077607
}
76087608
return
76097609
}
@@ -7668,7 +7668,7 @@ func (v *SignalWithStartWorkflowExecutionRequest) GetHeader() (o *Header) {
76687668
type SignalWorkflowExecutionRequest struct {
76697669
Domain string `json:"domain,omitempty"`
76707670
WorkflowExecution *WorkflowExecution `json:"workflowExecution,omitempty"`
7671-
SignalName *string `json:"signalName,omitempty"`
7671+
SignalName string `json:"signalName,omitempty"`
76727672
Input []byte `json:"input,omitempty"`
76737673
Identity string `json:"identity,omitempty"`
76747674
RequestID string `json:"requestId,omitempty"`
@@ -7693,8 +7693,8 @@ func (v *SignalWorkflowExecutionRequest) GetWorkflowExecution() (o *WorkflowExec
76937693

76947694
// GetSignalName is an internal getter (TBD...)
76957695
func (v *SignalWorkflowExecutionRequest) GetSignalName() (o string) {
7696-
if v != nil && v.SignalName != nil {
7697-
return *v.SignalName
7696+
if v != nil {
7697+
return v.SignalName
76987698
}
76997699
return
77007700
}
@@ -9586,15 +9586,15 @@ func (v *WorkflowExecutionInfo) GetTaskList() (o string) {
95869586

95879587
// WorkflowExecutionSignaledEventAttributes is an internal type (TBD...)
95889588
type WorkflowExecutionSignaledEventAttributes struct {
9589-
SignalName *string `json:"signalName,omitempty"`
9590-
Input []byte `json:"input,omitempty"`
9591-
Identity string `json:"identity,omitempty"`
9589+
SignalName string `json:"signalName,omitempty"`
9590+
Input []byte `json:"input,omitempty"`
9591+
Identity string `json:"identity,omitempty"`
95929592
}
95939593

95949594
// GetSignalName is an internal getter (TBD...)
95959595
func (v *WorkflowExecutionSignaledEventAttributes) GetSignalName() (o string) {
9596-
if v != nil && v.SignalName != nil {
9597-
return *v.SignalName
9596+
if v != nil {
9597+
return v.SignalName
95989598
}
95999599
return
96009600
}

‎host/activity_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1320,7 +1320,7 @@ func (s *integrationSuite) TestActivityCancellationNotStarted() {
13201320
WorkflowID: id,
13211321
RunID: we.RunID,
13221322
},
1323-
SignalName: common.StringPtr(signalName),
1323+
SignalName: signalName,
13241324
Input: signalInput,
13251325
Identity: identity,
13261326
})

‎host/decision_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ func (s *integrationSuite) TestWorkflowTerminationSignalBeforeRegularDecisionSta
319319
err0 = s.engine.SignalWorkflowExecution(createContext(), &types.SignalWorkflowExecutionRequest{
320320
Domain: s.domainName,
321321
WorkflowExecution: we,
322-
SignalName: common.StringPtr("sig-for-integ-test"),
322+
SignalName: "sig-for-integ-test",
323323
Input: []byte(""),
324324
Identity: "integ test",
325325
RequestID: uuid.New(),
@@ -405,7 +405,7 @@ func (s *integrationSuite) TestWorkflowTerminationSignalAfterRegularDecisionStar
405405
err0 = s.engine.SignalWorkflowExecution(createContext(), &types.SignalWorkflowExecutionRequest{
406406
Domain: s.domainName,
407407
WorkflowExecution: we,
408-
SignalName: common.StringPtr("sig-for-integ-test"),
408+
SignalName: "sig-for-integ-test",
409409
Input: []byte(""),
410410
Identity: "integ test",
411411
RequestID: uuid.New(),
@@ -482,7 +482,7 @@ func (s *integrationSuite) TestWorkflowTerminationSignalAfterRegularDecisionStar
482482
err0 = s.engine.SignalWorkflowExecution(createContext(), &types.SignalWorkflowExecutionRequest{
483483
Domain: s.domainName,
484484
WorkflowExecution: we,
485-
SignalName: common.StringPtr("sig-for-integ-test"),
485+
SignalName: "sig-for-integ-test",
486486
Input: []byte(""),
487487
Identity: "integ test",
488488
RequestID: uuid.New(),
@@ -583,7 +583,7 @@ func (s *integrationSuite) TestWorkflowTerminationSignalBeforeTransientDecisionS
583583
err0 = s.engine.SignalWorkflowExecution(createContext(), &types.SignalWorkflowExecutionRequest{
584584
Domain: s.domainName,
585585
WorkflowExecution: we,
586-
SignalName: common.StringPtr("sig-for-integ-test"),
586+
SignalName: "sig-for-integ-test",
587587
Input: []byte(""),
588588
Identity: "integ test",
589589
RequestID: uuid.New(),
@@ -699,7 +699,7 @@ func (s *integrationSuite) TestWorkflowTerminationSignalAfterTransientDecisionSt
699699
err0 = s.engine.SignalWorkflowExecution(createContext(), &types.SignalWorkflowExecutionRequest{
700700
Domain: s.domainName,
701701
WorkflowExecution: we,
702-
SignalName: common.StringPtr("sig-for-integ-test"),
702+
SignalName: "sig-for-integ-test",
703703
Input: []byte(""),
704704
Identity: "integ test",
705705
RequestID: uuid.New(),
@@ -801,7 +801,7 @@ func (s *integrationSuite) TestWorkflowTerminationSignalAfterTransientDecisionSt
801801
err0 = s.engine.SignalWorkflowExecution(createContext(), &types.SignalWorkflowExecutionRequest{
802802
Domain: s.domainName,
803803
WorkflowExecution: we,
804-
SignalName: common.StringPtr("sig-for-integ-test"),
804+
SignalName: "sig-for-integ-test",
805805
Input: []byte(""),
806806
Identity: "integ test",
807807
RequestID: uuid.New(),

‎host/integration_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1546,7 +1546,7 @@ func (s *integrationSuite) TestBufferedEvents() {
15461546
WorkflowExecution: &types.WorkflowExecution{
15471547
WorkflowID: id,
15481548
},
1549-
SignalName: common.StringPtr("buffered-signal"),
1549+
SignalName: "buffered-signal",
15501550
Input: []byte("buffered-signal-input"),
15511551
Identity: identity,
15521552
})
@@ -1617,7 +1617,7 @@ func (s *integrationSuite) TestBufferedEvents() {
16171617
s.Logger.Info("PollAndProcessDecisionTask", tag.Error(err))
16181618
s.Nil(err)
16191619
s.NotNil(signalEvent)
1620-
s.Equal(signalName, *signalEvent.WorkflowExecutionSignaledEventAttributes.SignalName)
1620+
s.Equal(signalName, signalEvent.WorkflowExecutionSignaledEventAttributes.SignalName)
16211621
s.Equal(identity, signalEvent.WorkflowExecutionSignaledEventAttributes.Identity)
16221622
s.True(workflowComplete)
16231623
}
@@ -2825,7 +2825,7 @@ func (s *integrationSuite) TestNoTransientDecisionAfterFlushBufferedEvents() {
28252825
WorkflowExecution: &types.WorkflowExecution{
28262826
WorkflowID: id,
28272827
},
2828-
SignalName: common.StringPtr("buffered-signal-1"),
2828+
SignalName: "buffered-signal-1",
28292829
Input: []byte("buffered-signal-input"),
28302830
Identity: identity,
28312831
})
@@ -3197,7 +3197,7 @@ func (s *integrationSuite) TestStickyTimeout_NonTransientDecision() {
31973197
err = s.engine.SignalWorkflowExecution(createContext(), &types.SignalWorkflowExecutionRequest{
31983198
Domain: s.domainName,
31993199
WorkflowExecution: workflowExecution,
3200-
SignalName: common.StringPtr("signalA"),
3200+
SignalName: "signalA",
32013201
Input: []byte("signal input"),
32023202
Identity: identity,
32033203
RequestID: uuid.New(),
@@ -3228,7 +3228,7 @@ WaitForStickyTimeoutLoop:
32283228
err = s.engine.SignalWorkflowExecution(createContext(), &types.SignalWorkflowExecutionRequest{
32293229
Domain: s.domainName,
32303230
WorkflowExecution: workflowExecution,
3231-
SignalName: common.StringPtr("signalB"),
3231+
SignalName: "signalB",
32323232
Input: []byte("signal input"),
32333233
Identity: identity,
32343234
RequestID: uuid.New(),
@@ -3359,7 +3359,7 @@ func (s *integrationSuite) TestStickyTasklistResetThenTimeout() {
33593359
err = s.engine.SignalWorkflowExecution(createContext(), &types.SignalWorkflowExecutionRequest{
33603360
Domain: s.domainName,
33613361
WorkflowExecution: workflowExecution,
3362-
SignalName: common.StringPtr("signalA"),
3362+
SignalName: "signalA",
33633363
Input: []byte("signal input"),
33643364
Identity: identity,
33653365
RequestID: uuid.New(),
@@ -3396,7 +3396,7 @@ WaitForStickyTimeoutLoop:
33963396
err = s.engine.SignalWorkflowExecution(createContext(), &types.SignalWorkflowExecutionRequest{
33973397
Domain: s.domainName,
33983398
WorkflowExecution: workflowExecution,
3399-
SignalName: common.StringPtr("signalB"),
3399+
SignalName: "signalB",
34003400
Input: []byte("signal input"),
34013401
Identity: identity,
34023402
RequestID: uuid.New(),
@@ -3665,7 +3665,7 @@ func (s *integrationSuite) TestSignalWithStartWithMemo() {
36653665
Input: nil,
36663666
ExecutionStartToCloseTimeoutSeconds: common.Int32Ptr(100),
36673667
TaskStartToCloseTimeoutSeconds: common.Int32Ptr(1),
3668-
SignalName: common.StringPtr(signalName),
3668+
SignalName: signalName,
36693669
SignalInput: signalInput,
36703670
Identity: identity,
36713671
Memo: memo,
@@ -4067,7 +4067,7 @@ func (s *integrationSuite) sendSignal(domainName string, execution *types.Workfl
40674067
return s.engine.SignalWorkflowExecution(createContext(), &types.SignalWorkflowExecutionRequest{
40684068
Domain: domainName,
40694069
WorkflowExecution: execution,
4070-
SignalName: common.StringPtr(signalName),
4070+
SignalName: signalName,
40714071
Input: input,
40724072
Identity: identity,
40734073
})

0 commit comments

Comments
 (0)