fix the event cache initialize size and rename the config

common/dynamicconfig/constants.go

@@ -493,8 +493,8 @@ const (
 	HistoryShutdownDrainDuration = "history.shutdownDrainDuration"
 	// XDCCacheMaxSizeBytes is max size of events cache in bytes
 	XDCCacheMaxSizeBytes = "history.xdcCacheMaxSizeBytes"
-	// EventsCacheInitialSizeBytes is initial size of events cache in bytes
-	EventsCacheInitialSizeBytes = "history.eventsCacheInitialSizeBytes"
+	// EventsCacheInitialKeySize is initial key size of events cache
+	EventsCacheInitialKeySize = "history.eventsCacheInitialKeySize"
 	// EventsCacheMaxSizeBytes is max size of events cache in bytes
 	EventsCacheMaxSizeBytes = "history.eventsCacheMaxSizeBytes"
 	// EventsCacheTTL is TTL of events cache

service/history/configs/config.go

@@ -74,9 +74,9 @@ type Config struct {
 
 	// EventsCache settings
 	// Change of these configs require shard restart
-	EventsCacheInitialSizeBytes dynamicconfig.IntPropertyFn
-	EventsCacheMaxSizeBytes     dynamicconfig.IntPropertyFn
-	EventsCacheTTL              dynamicconfig.DurationPropertyFn
+	EventsCacheInitialKeySize dynamicconfig.IntPropertyFn
+	EventsCacheMaxSizeBytes   dynamicconfig.IntPropertyFn
+	EventsCacheTTL            dynamicconfig.DurationPropertyFn
 
 	// ShardController settings
 	RangeSizeBits                uint
@@ -360,9 +360,9 @@ func NewConfig(
 		HistoryCacheTTL:                       dc.GetDurationProperty(dynamicconfig.HistoryCacheTTL, time.Hour),
 		HistoryCacheNonUserContextLockTimeout: dc.GetDurationProperty(dynamicconfig.HistoryCacheNonUserContextLockTimeout, 500*time.Millisecond),
 
-		EventsCacheInitialSizeBytes: dc.GetIntProperty(dynamicconfig.EventsCacheInitialSizeBytes, 128*1024), // 128KB
-		EventsCacheMaxSizeBytes:     dc.GetIntProperty(dynamicconfig.EventsCacheMaxSizeBytes, 512*1024),     // 512KB
-		EventsCacheTTL:              dc.GetDurationProperty(dynamicconfig.EventsCacheTTL, time.Hour),
+		EventsCacheInitialKeySize: dc.GetIntProperty(dynamicconfig.EventsCacheInitialKeySize, 128),
+		EventsCacheMaxSizeBytes:   dc.GetIntProperty(dynamicconfig.EventsCacheMaxSizeBytes, 512*1024), // 512KB
+		EventsCacheTTL:            dc.GetDurationProperty(dynamicconfig.EventsCacheTTL, time.Hour),
 
 		RangeSizeBits:                20, // 20 bits for sequencer, 2^20 sequence number for any range
 		AcquireShardInterval:         dc.GetDurationProperty(dynamicconfig.AcquireShardInterval, time.Minute),

service/history/history_engine_test.go

@@ -161,7 +161,7 @@ func (s *engineSuite) SetupTest() {
 
 	s.eventsCache = events.NewEventsCache(
 		s.mockShard.GetShardID(),
-		s.mockShard.GetConfig().EventsCacheInitialSizeBytes(),
+		s.mockShard.GetConfig().EventsCacheInitialKeySize(),
 		s.mockShard.GetConfig().EventsCacheMaxSizeBytes(),
 		s.mockShard.GetConfig().EventsCacheTTL(),
 		s.mockShard.GetExecutionManager(),

service/history/replication/ack_manager_test.go

@@ -307,7 +307,7 @@ func (s *ackManagerSuite) TestGetTasks_SecondPersistenceErrorReturnsPartialResul
 
 	eventsCache := events.NewEventsCache(
 		s.mockShard.GetShardID(),
-		s.mockShard.GetConfig().EventsCacheInitialSizeBytes(),
+		s.mockShard.GetConfig().EventsCacheInitialKeySize(),
 		s.mockShard.GetConfig().EventsCacheMaxSizeBytes(),
 		s.mockShard.GetConfig().EventsCacheTTL(),
 		s.mockShard.GetExecutionManager(),
@@ -359,7 +359,7 @@ func (s *ackManagerSuite) TestGetTasks_FullPage() {
 
 	eventsCache := events.NewEventsCache(
 		s.mockShard.GetShardID(),
-		s.mockShard.GetConfig().EventsCacheInitialSizeBytes(),
+		s.mockShard.GetConfig().EventsCacheInitialKeySize(),
 		s.mockShard.GetConfig().EventsCacheMaxSizeBytes(),
 		s.mockShard.GetConfig().EventsCacheTTL(),
 		s.mockShard.GetExecutionManager(),
@@ -411,7 +411,7 @@ func (s *ackManagerSuite) TestGetTasks_PartialPage() {
 
 	eventsCache := events.NewEventsCache(
 		s.mockShard.GetShardID(),
-		s.mockShard.GetConfig().EventsCacheInitialSizeBytes(),
+		s.mockShard.GetConfig().EventsCacheInitialKeySize(),
 		s.mockShard.GetConfig().EventsCacheMaxSizeBytes(),
 		s.mockShard.GetConfig().EventsCacheTTL(),
 		s.mockShard.GetExecutionManager(),
@@ -500,7 +500,7 @@ func (s *ackManagerSuite) TestGetTasks_FilterNamespace() {
 
 	eventsCache := events.NewEventsCache(
 		s.mockShard.GetShardID(),
-		s.mockShard.GetConfig().EventsCacheInitialSizeBytes(),
+		s.mockShard.GetConfig().EventsCacheInitialKeySize(),
 		s.mockShard.GetConfig().EventsCacheMaxSizeBytes(),
 		s.mockShard.GetConfig().EventsCacheTTL(),
 		s.mockShard.GetExecutionManager(),

service/history/shard/context_impl.go

@@ -1957,7 +1957,7 @@ func newContext(
 	}
 	shardContext.eventsCache = events.NewEventsCache(
 		shardContext.GetShardID(),
-		shardContext.GetConfig().EventsCacheInitialSizeBytes(),
+		shardContext.GetConfig().EventsCacheInitialKeySize(),
 		shardContext.GetConfig().EventsCacheMaxSizeBytes(),
 		shardContext.GetConfig().EventsCacheTTL(),
 		shardContext.GetExecutionManager(),

service/history/timer_queue_active_task_executor_test.go

@@ -139,7 +139,7 @@ func (s *timerQueueActiveTaskExecutorSuite) SetupTest() {
 	)
 	s.mockShard.SetEventsCacheForTesting(events.NewEventsCache(
 		s.mockShard.GetShardID(),
-		s.mockShard.GetConfig().EventsCacheInitialSizeBytes(),
+		s.mockShard.GetConfig().EventsCacheInitialKeySize(),
 		s.mockShard.GetConfig().EventsCacheMaxSizeBytes(),
 		s.mockShard.GetConfig().EventsCacheTTL(),
 		s.mockShard.GetExecutionManager(),

service/history/timer_queue_standby_task_executor_test.go

@@ -142,7 +142,7 @@ func (s *timerQueueStandbyTaskExecutorSuite) SetupTest() {
 	)
 	s.mockShard.SetEventsCacheForTesting(events.NewEventsCache(
 		s.mockShard.GetShardID(),
-		s.mockShard.GetConfig().EventsCacheInitialSizeBytes(),
+		s.mockShard.GetConfig().EventsCacheInitialKeySize(),
 		s.mockShard.GetConfig().EventsCacheMaxSizeBytes(),
 		s.mockShard.GetConfig().EventsCacheTTL(),
 		s.mockShard.GetExecutionManager(),

service/history/transfer_queue_active_task_executor_test.go

@@ -175,7 +175,7 @@ func (s *transferQueueActiveTaskExecutorSuite) SetupTest() {
 	)
 	s.mockShard.SetEventsCacheForTesting(events.NewEventsCache(
 		s.mockShard.GetShardID(),
-		s.mockShard.GetConfig().EventsCacheInitialSizeBytes(),
+		s.mockShard.GetConfig().EventsCacheInitialKeySize(),
 		s.mockShard.GetConfig().EventsCacheMaxSizeBytes(),
 		s.mockShard.GetConfig().EventsCacheTTL(),
 		s.mockShard.GetExecutionManager(),

service/history/transfer_queue_standby_task_executor_test.go

@@ -149,7 +149,7 @@ func (s *transferQueueStandbyTaskExecutorSuite) SetupTest() {
 	)
 	s.mockShard.SetEventsCacheForTesting(events.NewEventsCache(
 		s.mockShard.GetShardID(),
-		s.mockShard.GetConfig().EventsCacheInitialSizeBytes(),
+		s.mockShard.GetConfig().EventsCacheInitialKeySize(),
 		s.mockShard.GetConfig().EventsCacheMaxSizeBytes(),
 		s.mockShard.GetConfig().EventsCacheTTL(),
 		s.mockShard.GetExecutionManager(),

service/history/visibility_queue_task_executor_test.go

@@ -121,7 +121,7 @@ func (s *visibilityQueueTaskExecutorSuite) SetupTest() {
 	)
 	s.mockShard.SetEventsCacheForTesting(events.NewEventsCache(
 		s.mockShard.GetShardID(),
-		s.mockShard.GetConfig().EventsCacheInitialSizeBytes(),
+		s.mockShard.GetConfig().EventsCacheInitialKeySize(),
 		s.mockShard.GetConfig().EventsCacheMaxSizeBytes(),
 		s.mockShard.GetConfig().EventsCacheTTL(),
 		s.mockShard.GetExecutionManager(),