Rename current Visibility query converter with 'legacy' suffix

Author: rodrigozhou

common/persistence/sql/factory.go

@@ -171,8 +171,8 @@ func NewRefCountedDBConn(
 	}
 }
 
-// Get returns a mysql db connection and increments a reference count
-// this method will create a new connection, if an existing connection
+// Get returns a db connection and increments a reference count.
+// This method will create a new connection, if an existing connection
 // does not exist
 func (c *DbConn) Get() (sqlplugin.DB, error) {
 	c.Lock()

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

@@ -19,11 +19,11 @@ var allowedComparisonOperators = map[string]struct{}{
 	sqlparser.NotStartsWithStr: {},
 }
 
-func NewQueryConverter(
+func NewQueryConverterLegacy(
 	fnInterceptor query.FieldNameInterceptor,
 	fvInterceptor query.FieldValuesInterceptor,
 	saNameType searchattribute.NameTypeMap,
-) *query.Converter {
+) *query.ConverterLegacy {
 	if fnInterceptor == nil {
 		fnInterceptor = &query.NopFieldNameInterceptor{}
 	}
@@ -44,5 +44,5 @@ func NewQueryConverter(
 	whereConverter.And = query.NewAndConverter(whereConverter)
 	whereConverter.Or = query.NewOrConverter(whereConverter)
 
-	return query.NewConverter(fnInterceptor, whereConverter)
+	return query.NewConverterLegacy(fnInterceptor, whereConverter)
 }

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

@@ -126,7 +126,7 @@ var testNameTypeMap = searchattribute.NewNameTypeMapStub(
 )
 
 func TestSupportedSelectWhere(t *testing.T) {
-	c := NewQueryConverter(nil, nil, testNameTypeMap)
+	c := NewQueryConverterLegacy(nil, nil, testNameTypeMap)
 
 	for sql, expectedJson := range supportedWhereCases {
 		queryParams, err := c.ConvertWhereOrderBy(sql)
@@ -140,7 +140,7 @@ func TestSupportedSelectWhere(t *testing.T) {
 }
 
 func TestEmptySelectWhere(t *testing.T) {
-	c := NewQueryConverter(nil, nil, testNameTypeMap)
+	c := NewQueryConverterLegacy(nil, nil, testNameTypeMap)
 
 	queryParams, err := c.ConvertWhereOrderBy("")
 	assert.NoError(t, err)
@@ -157,7 +157,7 @@ func TestEmptySelectWhere(t *testing.T) {
 }
 
 func TestSupportedSelectWhereOrder(t *testing.T) {
-	c := NewQueryConverter(nil, nil, testNameTypeMap)
+	c := NewQueryConverterLegacy(nil, nil, testNameTypeMap)
 
 	for sql, expectedJson := range supportedWhereOrderCases {
 		queryParams, err := c.ConvertWhereOrderBy(sql)
@@ -178,7 +178,7 @@ func TestSupportedSelectWhereOrder(t *testing.T) {
 }
 
 func TestSupportedSelectWhereGroupBy(t *testing.T) {
-	c := NewQueryConverter(nil, nil, testNameTypeMap)
+	c := NewQueryConverterLegacy(nil, nil, testNameTypeMap)
 
 	for sql, expectedJson := range supportedWhereGroupByCases {
 		queryParams, err := c.ConvertWhereOrderBy(sql)
@@ -196,7 +196,7 @@ func TestSupportedSelectWhereGroupBy(t *testing.T) {
 }
 
 func TestErrors(t *testing.T) {
-	c := NewQueryConverter(nil, nil, testNameTypeMap)
+	c := NewQueryConverterLegacy(nil, nil, testNameTypeMap)
 	for sql, expectedErrMessage := range errorCases {
 		_, err := c.ConvertSql(sql)
 		assert.Contains(t, err.Error(), expectedErrMessage, sql)

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

@@ -363,7 +363,7 @@ func (s *VisibilityStore) CountWorkflowExecutions(
 	ctx context.Context,
 	request *manager.CountWorkflowExecutionsRequest,
 ) (*manager.CountWorkflowExecutionsResponse, error) {
-	queryParams, err := s.convertQuery(request.Namespace, request.NamespaceID, request.Query)
+	queryParams, err := s.convertQueryLegacy(request.Namespace, request.NamespaceID, request.Query)
 	if err != nil {
 		return nil, err
 	}
@@ -383,7 +383,7 @@ func (s *VisibilityStore) CountWorkflowExecutions(
 
 func (s *VisibilityStore) countGroupByWorkflowExecutions(
 	ctx context.Context,
-	queryParams *query.QueryParams,
+	queryParams *query.QueryParamsLegacy,
 ) (*manager.CountWorkflowExecutionsResponse, error) {
 	groupByFields := queryParams.GroupBy
 
@@ -461,7 +461,7 @@ func (s *VisibilityStore) BuildSearchParametersV2(
 	request *manager.ListWorkflowExecutionsRequestV2,
 	getFieldSorter func([]elastic.Sorter) ([]elastic.Sorter, error),
 ) (*client.SearchParameters, error) {
-	queryParams, err := s.convertQuery(
+	queryParams, err := s.convertQueryLegacy(
 		request.Namespace,
 		request.NamespaceID,
 		request.Query,
@@ -562,17 +562,17 @@ func (s *VisibilityStore) processPageToken(
 	return nil
 }
 
-func (s *VisibilityStore) convertQuery(
+func (s *VisibilityStore) convertQueryLegacy(
 	namespace namespace.Name,
 	namespaceID namespace.ID,
 	requestQueryStr string,
-) (*query.QueryParams, error) {
+) (*query.QueryParamsLegacy, error) {
 	saTypeMap, err := s.searchAttributesProvider.GetSearchAttributes(s.index, false)
 	if err != nil {
 		return nil, serviceerror.NewUnavailablef("unable to read search attribute types: %v", err)
 	}
 	nameInterceptor := NewNameInterceptor(namespace, saTypeMap, s.searchAttributesMapperProvider)
-	queryConverter := NewQueryConverter(
+	queryConverter := NewQueryConverterLegacy(
 		nameInterceptor,
 		NewValuesInterceptor(namespace, saTypeMap),
 		saTypeMap,