Skip to content
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

Remove isRecordValid check from ES visibility store #3948

Merged
merged 1 commit into from
Feb 15, 2023
+17 −52
Merged

Remove isRecordValid check from ES visibility store #3948

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
59 changes: 12 additions & 47 deletions common/persistence/visibility/store/elasticsearch/visibility_store.go
View file
Original file line number Diff line number Diff line change
@@ -300,11 +300,7 @@ func (s *visibilityStore) ListOpenWorkflowExecutions(
return nil, convertElasticsearchClientError("ListOpenWorkflowExecutions failed", err)
}

isRecordValid := func(rec *store.InternalWorkflowExecutionInfo) bool {
return !rec.StartTime.Before(request.EarliestStartTime) && !rec.StartTime.After(request.LatestStartTime)
}

return s.getListWorkflowExecutionsResponse(searchResult, request.Namespace, request.PageSize, isRecordValid)
return s.getListWorkflowExecutionsResponse(searchResult, request.Namespace, request.PageSize)
}

func (s *visibilityStore) ListClosedWorkflowExecutions(
@@ -325,11 +321,7 @@ func (s *visibilityStore) ListClosedWorkflowExecutions(
return nil, convertElasticsearchClientError("ListClosedWorkflowExecutions failed", err)
}

isRecordValid := func(rec *store.InternalWorkflowExecutionInfo) bool {
return !rec.CloseTime.Before(request.EarliestStartTime) && !rec.CloseTime.After(request.LatestStartTime)
}

return s.getListWorkflowExecutionsResponse(searchResult, request.Namespace, request.PageSize, isRecordValid)
return s.getListWorkflowExecutionsResponse(searchResult, request.Namespace, request.PageSize)
}

func (s *visibilityStore) ListOpenWorkflowExecutionsByType(
@@ -352,11 +344,7 @@ func (s *visibilityStore) ListOpenWorkflowExecutionsByType(
return nil, convertElasticsearchClientError("ListOpenWorkflowExecutionsByType failed", err)
}

isRecordValid := func(rec *store.InternalWorkflowExecutionInfo) bool {
return !rec.StartTime.Before(request.EarliestStartTime) && !rec.StartTime.After(request.LatestStartTime)
}

return s.getListWorkflowExecutionsResponse(searchResult, request.Namespace, request.PageSize, isRecordValid)
return s.getListWorkflowExecutionsResponse(searchResult, request.Namespace, request.PageSize)
}

func (s *visibilityStore) ListClosedWorkflowExecutionsByType(
@@ -378,11 +366,7 @@ func (s *visibilityStore) ListClosedWorkflowExecutionsByType(
return nil, convertElasticsearchClientError("ListClosedWorkflowExecutionsByType failed", err)
}

isRecordValid := func(rec *store.InternalWorkflowExecutionInfo) bool {
return !rec.CloseTime.Before(request.EarliestStartTime) && !rec.CloseTime.After(request.LatestStartTime)
}

return s.getListWorkflowExecutionsResponse(searchResult, request.Namespace, request.PageSize, isRecordValid)
return s.getListWorkflowExecutionsResponse(searchResult, request.Namespace, request.PageSize)
}

func (s *visibilityStore) ListOpenWorkflowExecutionsByWorkflowID(
@@ -405,11 +389,7 @@ func (s *visibilityStore) ListOpenWorkflowExecutionsByWorkflowID(
return nil, convertElasticsearchClientError("ListOpenWorkflowExecutionsByWorkflowID failed", err)
}

isRecordValid := func(rec *store.InternalWorkflowExecutionInfo) bool {
return !rec.StartTime.Before(request.EarliestStartTime) && !rec.StartTime.After(request.LatestStartTime)
}

return s.getListWorkflowExecutionsResponse(searchResult, request.Namespace, request.PageSize, isRecordValid)
return s.getListWorkflowExecutionsResponse(searchResult, request.Namespace, request.PageSize)
}

func (s *visibilityStore) ListClosedWorkflowExecutionsByWorkflowID(
@@ -431,11 +411,7 @@ func (s *visibilityStore) ListClosedWorkflowExecutionsByWorkflowID(
return nil, convertElasticsearchClientError("ListClosedWorkflowExecutionsByWorkflowID failed", err)
}

isRecordValid := func(rec *store.InternalWorkflowExecutionInfo) bool {
return !rec.CloseTime.Before(request.EarliestStartTime) && !rec.CloseTime.After(request.LatestStartTime)
}

return s.getListWorkflowExecutionsResponse(searchResult, request.Namespace, request.PageSize, isRecordValid)
return s.getListWorkflowExecutionsResponse(searchResult, request.Namespace, request.PageSize)
}

func (s *visibilityStore) ListClosedWorkflowExecutionsByStatus(
@@ -456,11 +432,7 @@ func (s *visibilityStore) ListClosedWorkflowExecutionsByStatus(
return nil, convertElasticsearchClientError("ListClosedWorkflowExecutionsByStatus failed", err)
}

isRecordValid := func(rec *store.InternalWorkflowExecutionInfo) bool {
return !rec.CloseTime.Before(request.EarliestStartTime) && !rec.CloseTime.After(request.LatestStartTime)
}

return s.getListWorkflowExecutionsResponse(searchResult, request.Namespace, request.PageSize, isRecordValid)
return s.getListWorkflowExecutionsResponse(searchResult, request.Namespace, request.PageSize)
}

func (s *visibilityStore) ListWorkflowExecutions(
@@ -486,7 +458,7 @@ func (s *visibilityStore) ListWorkflowExecutions(
return nil, convertElasticsearchClientError("ListWorkflowExecutions failed", err)
}

return s.getListWorkflowExecutionsResponse(searchResult, request.Namespace, request.PageSize, nil)
return s.getListWorkflowExecutionsResponse(searchResult, request.Namespace, request.PageSize)
}

func (s *visibilityStore) ScanWorkflowExecutions(
@@ -543,7 +515,7 @@ func (s *visibilityStore) scanWorkflowExecutionsWithPit(
}
}

return s.getListWorkflowExecutionsResponse(searchResult, request.Namespace, request.PageSize, nil)
return s.getListWorkflowExecutionsResponse(searchResult, request.Namespace, request.PageSize)
}

func (s *visibilityStore) scanWorkflowExecutionsWithScroll(ctx context.Context, request *manager.ListWorkflowExecutionsRequestV2) (*store.InternalListWorkflowExecutionsResponse, error) {
@@ -584,7 +556,7 @@ func (s *visibilityStore) scanWorkflowExecutionsWithScroll(ctx context.Context,
}
}

return s.getListWorkflowExecutionsResponse(searchResult, request.Namespace, request.PageSize, nil)
return s.getListWorkflowExecutionsResponse(searchResult, request.Namespace, request.PageSize)
}

func (s *visibilityStore) CountWorkflowExecutions(
@@ -777,7 +749,6 @@ func (s *visibilityStore) getListWorkflowExecutionsResponse(
searchResult *elastic.SearchResult,
namespace namespace.Name,
pageSize int,
isRecordValid func(rec *store.InternalWorkflowExecutionInfo) bool,
) (*store.InternalListWorkflowExecutionsResponse, error) {

if searchResult.Hits == nil || len(searchResult.Hits.Hits) == 0 {
@@ -798,14 +769,8 @@ func (s *visibilityStore) getListWorkflowExecutionsResponse(
if err != nil {
return nil, err
}
// ES6 uses "date" data type not "date_nanos". It truncates dates using milliseconds and might return extra rows.
// For example: 2021-06-12T00:21:43.159739259Z fits 2021-06-12T00:21:43.158Z...2021-06-12T00:21:43.159Z range lte/gte query.
// Therefore, these records need to be filtered out on the client side to support nanos precision.
// After ES6 deprecation isRecordValid can be removed.
if isRecordValid == nil || isRecordValid(workflowExecutionInfo) {
response.Executions = append(response.Executions, workflowExecutionInfo)
lastHitSort = hit.Sort
}
response.Executions = append(response.Executions, workflowExecutionInfo)
lastHitSort = hit.Sort
}

if len(searchResult.Hits.Hits) == pageSize && lastHitSort != nil { // this means the response is not the last page
10 changes: 5 additions & 5 deletions common/persistence/visibility/store/elasticsearch/visibility_store_read_test.go
View file
Original file line number Diff line number Diff line change
@@ -745,7 +745,7 @@ func (s *ESVisibilitySuite) TestGetListWorkflowExecutionsResponse() {
Hits: &elastic.SearchHits{
TotalHits: &elastic.TotalHits{},
}}
resp, err := s.visibilityStore.getListWorkflowExecutionsResponse(searchResult, testNamespace, 1, nil)
resp, err := s.visibilityStore.getListWorkflowExecutionsResponse(searchResult, testNamespace, 1)
s.NoError(err)
s.Equal(0, len(resp.NextPageToken))
s.Equal(0, len(resp.Executions))
@@ -768,14 +768,14 @@ func (s *ESVisibilitySuite) TestGetListWorkflowExecutionsResponse() {
}
searchResult.Hits.Hits = []*elastic.SearchHit{searchHit}
searchResult.Hits.TotalHits.Value = 1
resp, err = s.visibilityStore.getListWorkflowExecutionsResponse(searchResult, testNamespace, 1, nil)
resp, err = s.visibilityStore.getListWorkflowExecutionsResponse(searchResult, testNamespace, 1)
s.NoError(err)
serializedToken, _ := s.visibilityStore.serializePageToken(&visibilityPageToken{SearchAfter: []interface{}{1547596872371234567, "e481009e-14b3-45ae-91af-dce6e2a88365"}})
s.Equal(serializedToken, resp.NextPageToken)
s.Equal(1, len(resp.Executions))

// test for last page hits
resp, err = s.visibilityStore.getListWorkflowExecutionsResponse(searchResult, testNamespace, 2, nil)
resp, err = s.visibilityStore.getListWorkflowExecutionsResponse(searchResult, testNamespace, 2)
s.NoError(err)
s.Equal(0, len(resp.NextPageToken))
s.Equal(1, len(resp.Executions))
@@ -786,7 +786,7 @@ func (s *ESVisibilitySuite) TestGetListWorkflowExecutionsResponse() {
searchResult.Hits.Hits = append(searchResult.Hits.Hits, searchHit)
}
numOfHits := len(searchResult.Hits.Hits)
resp, err = s.visibilityStore.getListWorkflowExecutionsResponse(searchResult, testNamespace, numOfHits, nil)
resp, err = s.visibilityStore.getListWorkflowExecutionsResponse(searchResult, testNamespace, numOfHits)
s.NoError(err)
s.Equal(numOfHits, len(resp.Executions))
nextPageToken, err := s.visibilityStore.deserializePageToken(resp.NextPageToken)
@@ -796,7 +796,7 @@ func (s *ESVisibilitySuite) TestGetListWorkflowExecutionsResponse() {
s.Equal(int64(1547596872371234567), resultSortValue)
s.Equal("e481009e-14b3-45ae-91af-dce6e2a88365", nextPageToken.SearchAfter[1])
// for last page
resp, err = s.visibilityStore.getListWorkflowExecutionsResponse(searchResult, testNamespace, numOfHits+1, nil)
resp, err = s.visibilityStore.getListWorkflowExecutionsResponse(searchResult, testNamespace, numOfHits+1)
s.NoError(err)
s.Equal(0, len(resp.NextPageToken))
s.Equal(numOfHits, len(resp.Executions))