Skip to content

Unify history task query - part 3: Replace GetTransferTasks with GetHistoryTasks #6746

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 1 commit into from
Mar 26, 2025
Merged

Unify history task query - part 3: Replace GetTransferTasks with GetHistoryTasks #6746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion common/persistence/data_manager_interfaces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1577,7 +1577,6 @@ type (
IsWorkflowExecutionExists(ctx context.Context, request *IsWorkflowExecutionExistsRequest) (*IsWorkflowExecutionExistsResponse, error)

// Transfer task related methods
GetTransferTasks(ctx context.Context, request *GetTransferTasksRequest) (*GetTransferTasksResponse, error)
CompleteTransferTask(ctx context.Context, request *CompleteTransferTaskRequest) error

// Replication task related methods
Expand Down
15 changes: 0 additions & 15 deletions common/persistence/data_manager_interfaces_mock.go
View file
Open in desktop

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

1 change: 0 additions & 1 deletion common/persistence/data_store_interfaces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ type (
IsWorkflowExecutionExists(ctx context.Context, request *IsWorkflowExecutionExistsRequest) (*IsWorkflowExecutionExistsResponse, error)

// Transfer task related methods
GetTransferTasks(ctx context.Context, request *GetTransferTasksRequest) (*GetTransferTasksResponse, error)
CompleteTransferTask(ctx context.Context, request *CompleteTransferTaskRequest) error

// Replication task related methods
Expand Down
15 changes: 0 additions & 15 deletions common/persistence/data_store_interfaces_mock.go
View file
Open in desktop

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

8 changes: 0 additions & 8 deletions common/persistence/execution_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -847,14 +847,6 @@ func (m *executionManagerImpl) ListConcreteExecutions(
return newResponse, nil
}

// Transfer task related methods
func (m *executionManagerImpl) GetTransferTasks(
ctx context.Context,
request *GetTransferTasksRequest,
) (*GetTransferTasksResponse, error) {
return m.persistence.GetTransferTasks(ctx, request)
}

func (m *executionManagerImpl) CompleteTransferTask(
ctx context.Context,
request *CompleteTransferTaskRequest,
Expand Down
21 changes: 0 additions & 21 deletions common/persistence/nosql/nosql_execution_store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,27 +588,6 @@ func (d *nosqlExecutionStore) ListConcreteExecutions(
}, nil
}

func (d *nosqlExecutionStore) GetTransferTasks(
ctx context.Context,
request *persistence.GetTransferTasksRequest,
) (*persistence.GetTransferTasksResponse, error) {

tasks, nextPageToken, err := d.db.SelectTransferTasksOrderByTaskID(ctx, d.shardID, request.BatchSize, request.NextPageToken, request.ReadLevel, request.MaxReadLevel)
if err != nil {
return nil, convertCommonErrors(d.db, "GetTransferTasks", err)
}

var tTasks []*persistence.TransferTaskInfo
for _, t := range tasks {
tTasks = append(tTasks, t.Transfer)
}

return &persistence.GetTransferTasksResponse{
Tasks: tTasks,
NextPageToken: nextPageToken,
}, nil
}

func (d *nosqlExecutionStore) GetReplicationTasks(
ctx context.Context,
request *persistence.GetReplicationTasksRequest,
Expand Down
55 changes: 0 additions & 55 deletions common/persistence/sql/sql_execution_store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -836,61 +836,6 @@ func (m *sqlExecutionStore) ListConcreteExecutions(
}, nil
}

func (m *sqlExecutionStore) GetTransferTasks(
ctx context.Context,
request *p.GetTransferTasksRequest,
) (*p.GetTransferTasksResponse, error) {
minReadLevel := request.ReadLevel
if len(request.NextPageToken) > 0 {
readLevel, err := deserializePageToken(request.NextPageToken)
if err != nil {
return nil, convertCommonErrors(m.db, "GetTransferTasks", "failed to deserialize page token", err)
}
minReadLevel = readLevel
}
rows, err := m.db.SelectFromTransferTasks(ctx, &sqlplugin.TransferTasksFilter{
ShardID: m.shardID,
InclusiveMinTaskID: minReadLevel,
ExclusiveMaxTaskID: request.MaxReadLevel,
PageSize: request.BatchSize,
})
if err != nil {
if err != sql.ErrNoRows {
return nil, convertCommonErrors(m.db, "GetTransferTasks", "", err)
}
}
resp := &p.GetTransferTasksResponse{Tasks: make([]*p.TransferTaskInfo, len(rows))}
for i, row := range rows {
info, err := m.parser.TransferTaskInfoFromBlob(row.Data, row.DataEncoding)
if err != nil {
return nil, err
}
resp.Tasks[i] = &p.TransferTaskInfo{
TaskID: row.TaskID,
DomainID: info.DomainID.String(),
WorkflowID: info.GetWorkflowID(),
RunID: info.RunID.String(),
VisibilityTimestamp: info.GetVisibilityTimestamp(),
TargetDomainID: info.TargetDomainID.String(),
TargetDomainIDs: info.GetTargetDomainIDs(),
TargetWorkflowID: info.GetTargetWorkflowID(),
TargetRunID: info.TargetRunID.String(),
TargetChildWorkflowOnly: info.GetTargetChildWorkflowOnly(),
TaskList: info.GetTaskList(),
TaskType: int(info.GetTaskType()),
ScheduleID: info.GetScheduleID(),
Version: info.GetVersion(),
}
}
if len(rows) > 0 {
nextTaskID := rows[len(rows)-1].TaskID + 1
if nextTaskID < request.MaxReadLevel {
resp.NextPageToken = serializePageToken(nextTaskID)
}
}
return resp, nil
}

func (m *sqlExecutionStore) CompleteTransferTask(
ctx context.Context,
request *p.CompleteTransferTaskRequest,
Expand Down
141 changes: 0 additions & 141 deletions common/persistence/sql/sql_execution_store_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,147 +187,6 @@ func TestGetCurrentExecution(t *testing.T) {
}
}

func TestGetTransferTasks(t *testing.T) {
shardID := 1
testCases := []struct {
name string
req *persistence.GetTransferTasksRequest
mockSetup func(*sqlplugin.MockDB, *serialization.MockParser)
want *persistence.GetTransferTasksResponse
wantErr bool
}{
{
name: "Success case",
req: &persistence.GetTransferTasksRequest{
ReadLevel: 1,
MaxReadLevel: 99,
BatchSize: 1,
NextPageToken: serializePageToken(11),
},
mockSetup: func(mockDB *sqlplugin.MockDB, mockParser *serialization.MockParser) {
mockDB.EXPECT().SelectFromTransferTasks(gomock.Any(), &sqlplugin.TransferTasksFilter{
ShardID: shardID,
InclusiveMinTaskID: 11,
ExclusiveMaxTaskID: 99,
PageSize: 1,
}).Return([]sqlplugin.TransferTasksRow{
{
ShardID: shardID,
TaskID: 11,
Data: []byte(`transfer`),
DataEncoding: "transfer",
},
}, nil)
mockParser.EXPECT().TransferTaskInfoFromBlob([]byte(`transfer`), "transfer").Return(&serialization.TransferTaskInfo{
DomainID: serialization.MustParseUUID("abdcea69-61d5-44c3-9d55-afe23505a542"),
WorkflowID: "test",
RunID: serialization.MustParseUUID("abdcea69-61d5-44c3-9d55-afe23505a54a"),
VisibilityTimestamp: time.Unix(1, 1),
TargetDomainID: serialization.MustParseUUID("bbdcea69-61d5-44c3-9d55-afe23505a542"),
TargetDomainIDs: []serialization.UUID{serialization.MustParseUUID("bbdcea69-61d5-44c3-9d55-afe23505a54a")},
TargetWorkflowID: "xyz",
TargetRunID: serialization.MustParseUUID("dbdcea69-61d5-44c3-9d55-afe23505a54a"),
TargetChildWorkflowOnly: true,
TaskList: "tl",
TaskType: 1,
ScheduleID: 19,
Version: 202,
}, nil)
},
want: &persistence.GetTransferTasksResponse{
Tasks: []*persistence.TransferTaskInfo{
{
TaskID: 11,
DomainID: "abdcea69-61d5-44c3-9d55-afe23505a542",
WorkflowID: "test",
RunID: "abdcea69-61d5-44c3-9d55-afe23505a54a",
VisibilityTimestamp: time.Unix(1, 1),
TargetDomainID: "bbdcea69-61d5-44c3-9d55-afe23505a542",
TargetWorkflowID: "xyz",
TargetDomainIDs: map[string]struct{}{"bbdcea69-61d5-44c3-9d55-afe23505a54a": struct{}{}},
TargetRunID: "dbdcea69-61d5-44c3-9d55-afe23505a54a",
TargetChildWorkflowOnly: true,
TaskList: "tl",
TaskType: 1,
ScheduleID: 19,
Version: 202,
},
},
NextPageToken: serializePageToken(12),
},
wantErr: false,
},
{
name: "Error case - failed to get from database",
req: &persistence.GetTransferTasksRequest{
ReadLevel: 1,
MaxReadLevel: 99,
BatchSize: 1,
NextPageToken: serializePageToken(11),
},
mockSetup: func(mockDB *sqlplugin.MockDB, mockParser *serialization.MockParser) {
err := errors.New("some error")
mockDB.EXPECT().SelectFromTransferTasks(gomock.Any(), &sqlplugin.TransferTasksFilter{
ShardID: shardID,
InclusiveMinTaskID: 11,
ExclusiveMaxTaskID: 99,
PageSize: 1,
}).Return(nil, err)
mockDB.EXPECT().IsNotFoundError(err).Return(true)
},
wantErr: true,
},
{
name: "Error case - failed to decode data",
req: &persistence.GetTransferTasksRequest{
ReadLevel: 1,
MaxReadLevel: 99,
BatchSize: 1,
NextPageToken: serializePageToken(11),
},
mockSetup: func(mockDB *sqlplugin.MockDB, mockParser *serialization.MockParser) {
mockDB.EXPECT().SelectFromTransferTasks(gomock.Any(), &sqlplugin.TransferTasksFilter{
ShardID: shardID,
InclusiveMinTaskID: 11,
ExclusiveMaxTaskID: 99,
PageSize: 1,
}).Return([]sqlplugin.TransferTasksRow{
{
ShardID: shardID,
TaskID: 12,
Data: []byte(`transfer`),
DataEncoding: "transfer",
},
}, nil)
mockParser.EXPECT().TransferTaskInfoFromBlob([]byte(`transfer`), "transfer").Return(nil, errors.New("some error"))
},
wantErr: true,
},
}

for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
ctrl := gomock.NewController(t)
defer ctrl.Finish()

mockDB := sqlplugin.NewMockDB(ctrl)
mockParser := serialization.NewMockParser(ctrl)
store, err := NewSQLExecutionStore(mockDB, nil, int(shardID), mockParser, nil, nil)
require.NoError(t, err, "failed to create execution store")

tc.mockSetup(mockDB, mockParser)

got, err := store.GetTransferTasks(context.Background(), tc.req)
if tc.wantErr {
assert.Error(t, err, "Expected an error for test case")
} else {
assert.NoError(t, err, "Did not expect an error for test case")
assert.Equal(t, tc.want, got, "Unexpected result for test case")
}
})
}
}

func TestCompleteTransferTask(t *testing.T) {
shardID := 100
testCases := []struct {
Expand Down
15 changes: 0 additions & 15 deletions common/persistence/wrappers/errorinjectors/execution_generated.go
View file
Open in desktop

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

1 change: 0 additions & 1 deletion common/persistence/wrappers/errorinjectors/injectors_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,6 @@ func builderForPassThrough(t *testing.T, injector any, errorRate float64, logger
mocked.EXPECT().GetReplicationDLQSize(gomock.Any(), gomock.Any()).Return(&persistence.GetReplicationDLQSizeResponse{}, expectedErr)
mocked.EXPECT().GetReplicationTasks(gomock.Any(), gomock.Any()).Return(&persistence.GetReplicationTasksResponse{}, expectedErr)
mocked.EXPECT().GetReplicationTasksFromDLQ(gomock.Any(), gomock.Any()).Return(&persistence.GetReplicationTasksFromDLQResponse{}, expectedErr)
mocked.EXPECT().GetTransferTasks(gomock.Any(), gomock.Any()).Return(&persistence.GetTransferTasksResponse{}, expectedErr)
mocked.EXPECT().IsWorkflowExecutionExists(gomock.Any(), gomock.Any()).Return(&persistence.IsWorkflowExecutionExistsResponse{}, expectedErr)
mocked.EXPECT().ListConcreteExecutions(gomock.Any(), gomock.Any()).Return(&persistence.ListConcreteExecutionsResponse{}, expectedErr)
mocked.EXPECT().ListCurrentExecutions(gomock.Any(), gomock.Any()).Return(&persistence.ListCurrentExecutionsResponse{}, expectedErr)
Expand Down
24 changes: 0 additions & 24 deletions common/persistence/wrappers/metered/execution_generated.go
View file
Open in desktop

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

1 change: 0 additions & 1 deletion common/persistence/wrappers/metered/metered_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,6 @@ func prepareMockForTest(t *testing.T, input interface{}, expectedErr error) {
mocked.EXPECT().GetReplicationDLQSize(gomock.Any(), gomock.Any()).Return(&persistence.GetReplicationDLQSizeResponse{}, expectedErr).Times(1)
mocked.EXPECT().GetReplicationTasks(gomock.Any(), gomock.Any()).Return(&persistence.GetReplicationTasksResponse{}, expectedErr).Times(1)
mocked.EXPECT().GetReplicationTasksFromDLQ(gomock.Any(), gomock.Any()).Return(&persistence.GetReplicationTasksFromDLQResponse{}, expectedErr).Times(1)
mocked.EXPECT().GetTransferTasks(gomock.Any(), gomock.Any()).Return(&persistence.GetTransferTasksResponse{}, expectedErr).Times(1)
mocked.EXPECT().IsWorkflowExecutionExists(gomock.Any(), gomock.Any()).Return(&persistence.IsWorkflowExecutionExistsResponse{}, expectedErr).Times(1)
mocked.EXPECT().ListConcreteExecutions(gomock.Any(), gomock.Any()).Return(&persistence.ListConcreteExecutionsResponse{}, expectedErr).Times(1)
mocked.EXPECT().ListCurrentExecutions(gomock.Any(), gomock.Any()).Return(&persistence.ListCurrentExecutionsResponse{}, expectedErr).Times(1)
Expand Down
8 changes: 0 additions & 8 deletions common/persistence/wrappers/ratelimited/execution_generated.go
View file
Open in desktop

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

Loading