Remove old code

Signed-off-by: Daniel Deluiggi <ddeluigg@amazon.com>

Author: danielblando

pkg/compactor/shuffle_sharding_grouper_test.go

@@ -761,6 +761,11 @@ func (r *RingMock) GetAllHealthy(op ring.Operation) (ring.ReplicationSet, error)
 	return args.Get(0).(ring.ReplicationSet), args.Error(1)
 }
 
+func (r *RingMock) GetInstanceDescsForOperation(op ring.Operation) (map[string]ring.InstanceDesc, error) {
+	args := r.Called(op)
+	return args.Get(0).(map[string]ring.InstanceDesc), args.Error(1)
+}
+
 func (r *RingMock) GetAllInstanceDescs(op ring.Operation) ([]ring.InstanceDesc, []ring.InstanceDesc, error) {
 	args := r.Called(op)
 	return args.Get(0).([]ring.InstanceDesc), make([]ring.InstanceDesc, 0), args.Error(1)
@@ -789,11 +794,6 @@ func (r *RingMock) ShuffleShardWithZoneStability(identifier string, size int) ri
 	return args.Get(0).(ring.ReadRing)
 }
 
-func (r *RingMock) ShuffleShardWithOperation(identifier string, size int, op ring.Operation) ring.ReadRing {
-	args := r.Called(identifier, size, op)
-	return args.Get(0).(ring.ReadRing)
-}
-
 func (r *RingMock) GetInstanceState(instanceID string) (ring.InstanceState, error) {
 	args := r.Called(instanceID)
 	return args.Get(0).(ring.InstanceState), args.Error(1)

pkg/ring/ring.go

@@ -739,10 +739,6 @@ func (r *Ring) ShuffleShard(identifier string, size int) ReadRing {
 	return r.shuffleShardWithCache(identifier, size, false)
 }
 
-func (r *Ring) ShuffleShardWithOperation(identifier string, size int) ReadRing {
-	return r.shuffleShardWithCache(identifier, size, false)
-}
-
 func (r *Ring) ShuffleShardWithZoneStability(identifier string, size int) ReadRing {
 	return r.shuffleShardWithCache(identifier, size, true)
 }
@@ -879,7 +875,27 @@ func (r *Ring) shuffleShard(identifier string, size int, lookbackPeriod time.Dur
 		}
 	}
 
-	return r.copyWithNewDesc(shard)
+	// Build a read-only ring for the shard.
+	shardDesc := &Desc{Ingesters: shard}
+	shardTokensByZone := shardDesc.getTokensByZone()
+
+	return &Ring{
+		cfg:              r.cfg,
+		strategy:         r.strategy,
+		ringDesc:         shardDesc,
+		ringTokens:       shardDesc.GetTokens(),
+		ringTokensByZone: shardTokensByZone,
+		ringZones:        getZones(shardTokensByZone),
+		KVClient:         r.KVClient,
+
+		// We reference the original map as is in order to avoid copying. It's safe to do
+		// because this map is immutable by design and it's a superset of the actual instances
+		// with the subring.
+		ringInstanceByToken: r.ringInstanceByToken,
+
+		// For caching to work, remember these values.
+		lastTopologyChange: r.lastTopologyChange,
+	}
 }
 
 // GetInstanceState returns the current state of an instance or an error if the
@@ -960,48 +976,6 @@ func (r *Ring) setCachedShuffledSubring(identifier string, size int, zoneStableS
 	}
 }
 
-// getRingForOperation Returns a new ring filtered for operation.
-// The ring read lock must be already taken when calling this function.
-func (r *Ring) getRingForOperation(op Operation) *Ring {
-	//Avoid filtering if we are receiving default operation or empty ring
-	if r.ringDesc == nil || len(r.ringDesc.Ingesters) == 0 || op == Reporting {
-		return r
-	}
-
-	instanceDescs := make(map[string]InstanceDesc)
-	for id, instance := range r.ringDesc.Ingesters {
-		if op.IsInstanceInStateHealthy(instance.State) {
-			instanceDescs[id] = instance
-		}
-	}
-
-	return r.copyWithNewDesc(instanceDescs)
-}
-
-// copyWithNewDesc Return a new ring with updated data for different InstanceDesc
-func (r *Ring) copyWithNewDesc(desc map[string]InstanceDesc) *Ring {
-	shardDesc := &Desc{Ingesters: desc}
-	shardTokensByZone := shardDesc.getTokensByZone()
-
-	return &Ring{
-		cfg:              r.cfg,
-		strategy:         r.strategy,
-		ringDesc:         shardDesc,
-		ringTokens:       shardDesc.GetTokens(),
-		ringTokensByZone: shardTokensByZone,
-		ringZones:        getZones(shardTokensByZone),
-		KVClient:         r.KVClient,
-
-		// We reference the original map as is in order to avoid copying. It's safe to do
-		// because this map is immutable by design and it's a superset of the actual instances
-		// with the subring.
-		ringInstanceByToken: r.ringInstanceByToken,
-
-		// For caching to work, remember these values.
-		lastTopologyChange: r.lastTopologyChange,
-	}
-}
-
 func (r *Ring) CleanupShuffleShardCache(identifier string) {
 	if r.cfg.SubringCacheDisabled {
 		return