Skip to content

Add CHASM visibility task handling of alias to field mapping for custom search attributes #8558

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Add CHASM visibility task handling of alias to field mapping for custom search attributes #8558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bace849
Add CHASM visibility task handling of alias to field mapping for cust…
awln-temporal Oct 28, 2025
fe71993
Fix linter issue
awln-temporal Oct 29, 2025
e6b3a3b
Merge branch 'main' into CHASMVisibilityComponentMapping
awln-temporal Oct 31, 2025
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
2 changes: 1 addition & 1 deletion common/persistence/visibility/store/elasticsearch/visibility_store_read_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ func (s *ESVisibilitySuite) Test_convertQuery() {
query = `StartTime = "2018-06-07T15:04:05.123456789-08:00"`
queryParams, err = s.visibilityStore.convertQuery(testNamespace, testNamespaceID, query)
s.NoError(err)
s.Equal(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"filter":{"match":{"StartTime":{"query":"2018-06-07T15:04:05.123456789-08:00"}}}}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query))
s.JSONEq(`{"bool":{"filter":[{"term":{"NamespaceId":"bfd5c907-f899-4baf-a7b2-2ab85e623ebd"}},{"bool":{"filter":{"match":{"StartTime":{"query":"2018-06-07T15:04:05.123456789-08:00"}}}}}],"must_not":{"exists":{"field":"TemporalNamespaceDivision"}}}}`, s.queryToJSON(queryParams.Query))
s.Nil(queryParams.Sorter)

query = `WorkflowId = 'wid' and StartTime > "2018-06-07T15:04:05+00:00"`
Expand Down
31 changes: 23 additions & 8 deletions service/history/visibility_queue_task_executor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,13 +389,33 @@ func (t *visibilityQueueTaskExecutor) processChasmTask(
return serviceerror.NewInternalf("expected visibility component, but got %T", visComponent)
}

searchattributes, err := visComponent.GetSearchAttributes(visTaskContext)
namespaceEntry, err := t.shardContext.GetNamespaceRegistry().
GetNamespaceByID(namespace.ID(task.GetNamespaceID()))
if err != nil {
return err
}

searchattributesMapperProvider := t.shardContext.GetSearchAttributesMapperProvider()
searchAttributesMapper, err := searchattributesMapperProvider.GetMapper(namespaceEntry.Name())
if err != nil {
return err
}
if searchattributes == nil {
searchattributes = make(map[string]*commonpb.Payload)

searchattributes := make(map[string]*commonpb.Payload)

aliasedSearchAttributes, err := visComponent.GetSearchAttributes(visTaskContext)
if err != nil {
return err
}

for alias, value := range aliasedSearchAttributes {
fieldName, err := searchAttributesMapper.GetFieldName(alias, namespaceEntry.Name().String())
if err != nil {
return err
}
searchattributes[fieldName] = value
}

memo, err := visComponent.GetMemo(visTaskContext)
if err != nil {
return err
Expand All @@ -419,11 +439,6 @@ func (t *visibilityQueueTaskExecutor) processChasmTask(
}
}

namespaceEntry, err := t.shardContext.GetNamespaceRegistry().
GetNamespaceByID(namespace.ID(task.GetNamespaceID()))
if err != nil {
return err
}
requestBase := t.getVisibilityRequestBase(
task,
namespaceEntry,
Expand Down
11 changes: 11 additions & 0 deletions service/history/visibility_queue_task_executor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,17 @@ func (s *visibilityQueueTaskExecutorSuite) SetupTest() {
config,
)

// Set up expectations on the SearchAttributesMapper mocks created by NewTestContext
mockMapper := searchattribute.NewMockMapper(s.controller)
mockMapper.EXPECT().GetFieldName(gomock.Any(), gomock.Any()).DoAndReturn(
func(alias string, _ string) (string, error) {
return alias, nil
},
).AnyTimes()

mockMapperProvider := s.mockShard.Resource.SearchAttributesMapperProvider
mockMapperProvider.EXPECT().GetMapper(gomock.Any()).Return(mockMapper, nil).AnyTimes()

reg := hsm.NewRegistry()
err := workflow.RegisterStateMachine(reg)
s.NoError(err)
Expand Down
Loading