Skip to content

Convert attempts to int32 for consistency #644

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 31, 2020
Merged

Convert attempts to int32 for consistency #644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
412823f
Convert attempts to int32 for consistency.
alexshtin Jul 31, 2020
af8132e
Merge branch 'master' into feature/switch-to-uint
alexshtin Jul 31, 2020
31901e2
Regenerage go.
alexshtin Jul 31, 2020
9cae51a
Fix tests.
alexshtin Jul 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
338 changes: 169 additions & 169 deletions api/historyservice/v1/request_response.pb.go
View file
Open in desktop

Large diffs are not rendered by default.

158 changes: 79 additions & 79 deletions api/matchingservice/v1/request_response.pb.go
View file
Open in desktop

Large diffs are not rendered by default.

429 changes: 215 additions & 214 deletions api/persistenceblobs/v1/message.pb.go
View file
Open in desktop

Large diffs are not rendered by default.

40 changes: 20 additions & 20 deletions api/replication/v1/message.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

104 changes: 52 additions & 52 deletions api/token/v1/message.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion common/archiver/historyIterator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,5 +741,5 @@ func (s *HistoryIteratorSuite) TestJSONSizeEstimator() {

size, err := e.EstimateSize(h)
s.NoError(err)
s.Equal(268, size)
s.Equal(266, size)
}
12 changes: 6 additions & 6 deletions common/log/tag/tags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,8 +288,8 @@ func WorkflowSize(workflowSize int64) Tag {
}

// WorkflowSignalCount returns tag for SignalCount
func WorkflowSignalCount(signalCount int32) Tag {
return newInt32("wf-signal-count", signalCount)
func WorkflowSignalCount(signalCount int64) Tag {
return newInt64("wf-signal-count", signalCount)
}

// WorkflowHistorySize returns tag for HistorySize
Expand Down Expand Up @@ -554,8 +554,8 @@ func TimerTaskStatus(timerTaskStatus int32) Tag {
// retry

// Attempt returns tag for Attempt
func Attempt(attempt int64) Tag {
return newInt64("attempt", attempt)
func Attempt(attempt int32) Tag {
return newInt32("attempt", attempt)
}

// AttemptCount returns tag for AttemptCount
Expand All @@ -574,8 +574,8 @@ func AttemptEnd(attemptEnd time.Time) Tag {
}

// ScheduleAttempt returns tag for ScheduleAttempt
func ScheduleAttempt(scheduleAttempt int64) Tag {
return newInt64("schedule-attempt", scheduleAttempt)
func ScheduleAttempt(scheduleAttempt int32) Tag {
return newInt32("schedule-attempt", scheduleAttempt)
}

// ElasticSearch
Expand Down
4 changes: 2 additions & 2 deletions common/persistence/cassandra/cassandraPersistenceUtil.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -877,7 +877,7 @@ func createTimerTasks(

for _, task := range timerTasks {
eventID := int64(0)
attempt := int64(1)
attempt := int32(1)

timeoutType := enumspb.TIMEOUT_TYPE_UNSPECIFIED
workflowBackoffType := enumsspb.WORKFLOW_BACKOFF_TYPE_UNSPECIFIED
Expand All @@ -898,7 +898,7 @@ func createTimerTasks(

case *p.ActivityRetryTimerTask:
eventID = t.EventID
attempt = int64(t.Attempt)
attempt = t.Attempt

case *p.WorkflowBackoffTimerTask:
eventID = t.EventID
Expand Down
10 changes: 5 additions & 5 deletions common/persistence/dataInterfaces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,13 +222,13 @@ type (
StartTimestamp time.Time
LastUpdatedTimestamp time.Time
CreateRequestID string
SignalCount int32
SignalCount int64
WorkflowTaskVersion int64
WorkflowTaskScheduleID int64
WorkflowTaskStartedID int64
WorkflowTaskRequestID string
WorkflowTaskTimeout int64
WorkflowTaskAttempt int64
WorkflowTaskAttempt int32
WorkflowTaskStartedTimestamp int64
WorkflowTaskScheduledTimestamp int64
WorkflowTaskOriginalScheduledTimestamp int64
Expand Down Expand Up @@ -333,7 +333,7 @@ type (
VisibilityTimestamp time.Time
TaskID int64
EventID int64
ScheduleAttempt int64
ScheduleAttempt int32
TimeoutType enumspb.TimeoutType
Version int64
}
Expand Down Expand Up @@ -394,7 +394,7 @@ type (
TaskID int64
TimeoutType enumspb.TimeoutType
EventID int64
Attempt int64
Attempt int32
Version int64
}

Expand All @@ -412,7 +412,7 @@ type (
TaskID int64
EventID int64
Version int64
Attempt int64
Attempt int32
}

// WorkflowBackoffTimerTask to schedule first workflow task for retried workflow
Expand Down
Loading