Update spacing after merge

Author: awln-temporal

chasm/search_attribute.go

@@ -450,7 +450,7 @@ func NewSearchAttributesMap(values map[string]VisibilityValue) SearchAttributesM
 // If the value is not found, the zero value for the type T is returned and the second return value is false.
 // Before casting the VisibilityValue to the target type, the value is checked to ensure it is of the correct type.
 // If the value is found but the type does not match, the zero value for the type T is returned and the second return value is false.
-func Get[T any](m SearchAttributesMap, sa typedSearchAttribute[T]) (val T, ok bool) {
+func GetSearchAttributeValue[T any](m SearchAttributesMap, sa typedSearchAttribute[T]) (val T, ok bool) {
 	var zero T
 	if m.values == nil {
 		return zero, false

chasm/search_attribute_test.go

@@ -30,51 +30,51 @@ func TestSearchAttributesMap_Get(t *testing.T) {
 	m := NewSearchAttributesMap(values)
 
 	t.Run("GetBool", func(t *testing.T) {
-		val, ok := Get(m, boolAttr)
+		val, ok := GetSearchAttributeValue(m, boolAttr)
 		assert.True(t, ok)
 		assert.True(t, val)
 	})
 
 	t.Run("GetInt64", func(t *testing.T) {
-		val, ok := Get(m, intAttr)
+		val, ok := GetSearchAttributeValue(m, intAttr)
 		assert.True(t, ok)
 		assert.Equal(t, int64(42), val)
 	})
 
 	t.Run("GetFloat64", func(t *testing.T) {
-		val, ok := Get(m, doubleAttr)
+		val, ok := GetSearchAttributeValue(m, doubleAttr)
 		assert.True(t, ok)
 		assert.InDelta(t, 3.14, val, 0.0001)
 	})
 
 	t.Run("GetString", func(t *testing.T) {
-		val, ok := Get(m, keywordAttr)
+		val, ok := GetSearchAttributeValue(m, keywordAttr)
 		assert.True(t, ok)
 		assert.Equal(t, "active", val)
 	})
 
 	t.Run("GetTime", func(t *testing.T) {
-		val, ok := Get(m, datetimeAttr)
+		val, ok := GetSearchAttributeValue(m, datetimeAttr)
 		assert.True(t, ok)
 		assert.True(t, now.Equal(val))
 	})
 
 	t.Run("GetStringSlice", func(t *testing.T) {
-		val, ok := Get(m, keywordListAttr)
+		val, ok := GetSearchAttributeValue(m, keywordListAttr)
 		assert.True(t, ok)
 		assert.Equal(t, []string{"tag1", "tag2"}, val)
 	})
 
 	t.Run("NotFound", func(t *testing.T) {
 		missingAttr := NewSearchAttributeBool("missing", SearchAttributeFieldBool02)
-		val, ok := Get(m, missingAttr)
+		val, ok := GetSearchAttributeValue(m, missingAttr)
 		assert.False(t, ok)
 		assert.False(t, val)
 	})
 
 	t.Run("NilMap", func(t *testing.T) {
 		emptyMap := NewSearchAttributesMap(nil)
-		val, ok := Get(emptyMap, boolAttr)
+		val, ok := GetSearchAttributeValue(emptyMap, boolAttr)
 		assert.False(t, ok)
 		assert.False(t, val)
 	})

common/searchattribute/mapper.go

@@ -133,7 +133,6 @@ func AliasFields(
 
 	newIndexedFields := make(map[string]*commonpb.Payload, len(searchAttributes.GetIndexedFields()))
 	mapped := false
-
 	for saName, saPayload := range searchAttributes.GetIndexedFields() {
 		if !sadefs.IsMappable(saName) {
 			newIndexedFields[saName] = saPayload
@@ -151,7 +150,6 @@ func AliasFields(
 			}
 			return nil, err
 		}
-
 		if aliasName != saName {
 			mapped = true
 		}

service/history/chasm_engine.go

@@ -74,10 +74,10 @@ func newChasmEngine(
 	visibilityMgr manager.VisibilityManager,
 ) *ChasmEngine {
 	return &ChasmEngine{
-    executionCache: executionCache,
-		registry:      registry,
-		config:        config,
-		visibilityMgr: visibilityMgr,
+		executionCache: executionCache,
+		registry:       registry,
+		config:         config,
+		visibilityMgr:  visibilityMgr,
 	}
 }
 
@@ -642,16 +642,11 @@ func (e *ChasmEngine) ListExecutions(
 		return nil, serviceerror.NewInternal("unknown chasm component type: " + archetypeType.String())
 	}
 
-	pageSize := request.PageSize
-	if pageSize <= 0 {
-		pageSize = e.config.HistoryMaxPageSize(namespace.Name(request.NamespaceName).String())
-	}
-
 	visReq := &manager.ListChasmExecutionsRequest{
 		ArchetypeID:   archetypeID,
 		NamespaceID:   namespace.ID(request.NamespaceID),
 		Namespace:     namespace.Name(request.NamespaceName),
-		PageSize:      pageSize,
+		PageSize:      request.PageSize,
 		NextPageToken: request.NextPageToken,
 		Query:         request.Query,
 	}
@@ -670,10 +665,12 @@ func (e *ChasmEngine) CountExecutions(
 		return nil, serviceerror.NewInternal("unknown chasm component type: " + archetypeType.String())
 	}
 
-	return e.visibilityMgr.CountChasmExecutions(ctx, &manager.CountChasmExecutionsRequest{
+	visReq := &manager.CountChasmExecutionsRequest{
 		ArchetypeID: archetypeID,
 		NamespaceID: namespace.ID(request.NamespaceID),
 		Namespace:   namespace.Name(request.NamespaceName),
 		Query:       request.Query,
-	})
+	}
+
+	return e.visibilityMgr.CountChasmExecutions(ctx, visReq)
 }