Remove RunId from visibility query sort for ES 7 (#3140)

common/persistence/visibility/store/elasticsearch/visibility_store.go

@@ -64,12 +64,20 @@ const (
 
 // Default sort by uses the sorting order defined in the index template, so no
 // additional sorting is needed during query.
+// Keep RunID as tiebreaker because ES v6 date precision is milliseconds.
+// ES v7 date precision is nanoseconds which is good enough for tie breaking.
+// Remove this when we drop support for ES v6.
 var defaultSorter = []elastic.Sorter{
 	elastic.NewFieldSort(searchattribute.CloseTime).Desc().Missing("_first"),
 	elastic.NewFieldSort(searchattribute.StartTime).Desc().Missing("_first"),
 	elastic.NewFieldSort(searchattribute.RunID).Desc().Missing("_first"),
 }
 
+var defaultSorterV7 = []elastic.Sorter{
+	elastic.NewFieldSort(searchattribute.CloseTime).Desc().Missing("_first"),
+	elastic.NewFieldSort(searchattribute.StartTime).Desc().Missing("_first"),
+}
+
 type (
 	visibilityStore struct {
 		esClient                 client.Client
@@ -639,7 +647,12 @@ func (s *visibilityStore) buildSearchParameters(
 		Index:    s.index,
 		Query:    boolQuery,
 		PageSize: request.PageSize,
-		Sorter:   defaultSorter,
+	}
+
+	if _, isV7 := s.esClient.(client.ClientV7); isV7 {
+		params.Sorter = defaultSorterV7
+	} else {
+		params.Sorter = defaultSorter
 	}
 
 	if token != nil && len(token.SearchAfter) > 0 {
@@ -714,7 +727,11 @@ func (s *visibilityStore) convertQuery(
 
 func (s *visibilityStore) setDefaultFieldSort(fieldSorts []*elastic.FieldSort) []elastic.Sorter {
 	if len(fieldSorts) == 0 {
-		return defaultSorter
+		if _, isV7 := s.esClient.(client.ClientV7); isV7 {
+			return defaultSorterV7
+		} else {
+			return defaultSorter
+		}
 	}
 
 	res := make([]elastic.Sorter, len(fieldSorts)+1)

common/persistence/visibility/store/elasticsearch/visibility_store_read_test.go

@@ -312,7 +312,7 @@ func (s *ESVisibilitySuite) TestBuildSearchParameters() {
 		Query:       boolQuery,
 		SearchAfter: []interface{}{json.Number("1528358645123456789"), "qwe"},
 		PageSize:    testPageSize,
-		Sorter:      defaultSorter,
+		Sorter:      defaultSorterV7,
 	}, p)
 
 	// test request latestTime overflow
@@ -326,7 +326,7 @@ func (s *ESVisibilitySuite) TestBuildSearchParameters() {
 		Query:       boolQuery,
 		SearchAfter: []interface{}{json.Number("1528358645123456789"), "qwe"},
 		PageSize:    testPageSize,
-		Sorter:      defaultSorter,
+		Sorter:      defaultSorterV7,
 	}, p)
 	request = createTestRequest() // revert
 
@@ -340,7 +340,7 @@ func (s *ESVisibilitySuite) TestBuildSearchParameters() {
 		Query:       boolQuery,
 		SearchAfter: nil,
 		PageSize:    testPageSize,
-		Sorter:      defaultSorter,
+		Sorter:      defaultSorterV7,
 	}, p)
 
 	// test for additional boolQuery
@@ -354,7 +354,7 @@ func (s *ESVisibilitySuite) TestBuildSearchParameters() {
 		Query:       boolQuery,
 		SearchAfter: nil,
 		PageSize:    testPageSize,
-		Sorter:      defaultSorter,
+		Sorter:      defaultSorterV7,
 	}, p)
 
 	// test for search after
@@ -371,7 +371,7 @@ func (s *ESVisibilitySuite) TestBuildSearchParameters() {
 		Query:       boolQuery,
 		SearchAfter: token.SearchAfter,
 		PageSize:    testPageSize,
-		Sorter:      defaultSorter,
+		Sorter:      defaultSorterV7,
 	}, p)
 	request = createTestRequest() // revert
 
@@ -386,7 +386,7 @@ func (s *ESVisibilitySuite) TestBuildSearchParameters() {
 		Query:       boolQuery,
 		PageSize:    testPageSize,
 		SearchAfter: nil,
-		Sorter:      defaultSorter,
+		Sorter:      defaultSorterV7,
 	}, p)
 }
 
@@ -411,7 +411,7 @@ func (s *ESVisibilitySuite) TestBuildSearchParametersV2() {
 		SearchAfter: nil,
 		PointInTime: nil,
 		PageSize:    testPageSize,
-		Sorter:      defaultSorter,
+		Sorter:      defaultSorterV7,
 	}, p)
 	request.Query = ""
 
@@ -465,7 +465,7 @@ func (s *ESVisibilitySuite) TestBuildSearchParametersV2DisableOrderByClause() {
 		SearchAfter: nil,
 		PointInTime: nil,
 		PageSize:    testPageSize,
-		Sorter:      defaultSorter,
+		Sorter:      defaultSorterV7,
 	}, p)
 	request.Query = ""