Skip to content

Commit

Permalink
Add workflow info details in QueryToken (cadence-workflow#6265)
Browse files Browse the repository at this point in the history
* Add workflow info details in QueryToken
  • Loading branch information
3vilhamster authored Sep 5, 2024
1 parent f6e4360 commit 0f66adc
Show file tree
Hide file tree
Showing 5 changed files with 80 additions and 8 deletions.
File renamed without changes.
67 changes: 67 additions & 0 deletions common/json_task_token_serializer_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
// The MIT License (MIT)

// Copyright (c) 2017-2020 Uber Technologies Inc.

// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.

package common

import (
"testing"

"github.com/stretchr/testify/require"
)

func TestJsonTaskTokenSerializer_Token_RoundTrip(t *testing.T) {
token := TaskToken{
DomainID: "test-domain",
WorkflowID: "test-workflow-id",
WorkflowType: "test-workflow-type",
RunID: "test-run-id",
ScheduleID: 1,
ScheduleAttempt: 1,
ActivityID: "test-activity-id",
ActivityType: "test-activity-type",
}

serializer := NewJSONTaskTokenSerializer()

serialized, err := serializer.Serialize(&token)
require.NoError(t, err)
deserializedToken, err := serializer.Deserialize(serialized)
require.NoError(t, err)
require.Equal(t, token, *deserializedToken)
}

func TestNewJSONTaskTokenSerializer_QueryToken_Roundtrip(t *testing.T) {
token := QueryTaskToken{
DomainID: "test-domain",
WorkflowID: "test-workflow-id",
RunID: "test-run-id",
TaskList: "test-task-list",
TaskID: "test-task-id",
}
serializer := NewJSONTaskTokenSerializer()

serialized, err := serializer.SerializeQueryTaskToken(&token)
require.NoError(t, err)
deserializedToken, err := serializer.DeserializeQueryTaskToken(serialized)
require.NoError(t, err)
require.Equal(t, token, *deserializedToken)
}
8 changes: 5 additions & 3 deletions common/taskTokenSerializerInterfaces.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,11 @@ type (

// QueryTaskToken identifies a query task
QueryTaskToken struct {
DomainID string `json:"domainId"`
TaskList string `json:"taskList"`
TaskID string `json:"taskId"`
DomainID string `json:"domainId"`
WorkflowID string `json:"workflowId"`
RunID string `json:"runId"`
TaskList string `json:"taskList"`
TaskID string `json:"taskId"`
}
)

Expand Down
4 changes: 2 additions & 2 deletions service/frontend/api/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -1722,8 +1722,8 @@ func (wh *WorkflowHandler) RespondQueryTaskCompleted(
sizeLimitError,
queryTaskToken.DomainID,
domainName,
"",
"",
queryTaskToken.WorkflowID,
queryTaskToken.RunID,
scope,
wh.GetLogger(),
tag.BlobSizeViolationOperation("RespondQueryTaskCompleted"),
Expand Down
9 changes: 6 additions & 3 deletions service/matching/handler/engine.go
Original file line number Diff line number Diff line change
Expand Up @@ -1036,10 +1036,13 @@ func (e *matchingEngineImpl) createPollForDecisionTaskResponse(
if task.IsQuery() {
// for a query task
queryRequest := task.Query.Request
execution := task.WorkflowExecution()
taskToken := &common.QueryTaskToken{
DomainID: queryRequest.DomainUUID,
TaskList: queryRequest.TaskList.Name,
TaskID: task.Query.TaskID,
DomainID: queryRequest.DomainUUID,
WorkflowID: execution.WorkflowID,
RunID: execution.RunID,
TaskList: queryRequest.TaskList.Name,
TaskID: task.Query.TaskID,
}
token, _ = e.tokenSerializer.SerializeQueryTaskToken(taskToken)
} else {
Expand Down

0 comments on commit 0f66adc

Please sign in to comment.