Merge branch 'harlow:master' into main

consumer.go

@@ -393,32 +393,22 @@ func isShardClosed(nextShardIterator, currentShardIterator *string) bool {
 }
 
 type shards struct {
-	*sync.RWMutex
+	shardsInProcess sync.Map
-	shardsInProcess map[string]struct{}
 }
 
 func newShardsInProcess() *shards {
-	return &shards{
+	return &shards{}
-		RWMutex:         &sync.RWMutex{},
-		shardsInProcess: make(map[string]struct{}),
-	}
 }
 
 func (s *shards) addShard(shardId string) {
-	s.Lock()
+	s.shardsInProcess.Store(shardId, struct{}{})
-	defer s.Unlock()
-	s.shardsInProcess[shardId] = struct{}{}
 }
 
 func (s *shards) doesShardExist(shardId string) bool {
-	s.RLock()
+	_, ok := s.shardsInProcess.Load(shardId)
-	defer s.RUnlock()
-	_, ok := s.shardsInProcess[shardId]
 	return ok
 }
 
 func (s *shards) deleteShard(shardId string) {
-	s.Lock()
+	s.shardsInProcess.Delete(shardId)
-	defer s.Unlock()
-	delete(s.shardsInProcess, shardId)
 }