re-use KeyRange from shard object

Signed-off-by: Tim Vaillancourt <[email protected]>

go/vt/vtorc/logic/keyspace_shard_discovery.go

@@ -121,19 +121,9 @@ func shouldWatchShard(shard *topo.ShardInfo) bool {
 		return false
 	}
 
-	shardRanges, err := key.ParseShardingSpec(shard.ShardName())
-	if err != nil {
-		// This parse should never fail because we get the shard names
-		// from the topo using ts.FindAllShardsInKeyspace().
-		log.Error(err)
-		return false
-	}
-
 	for _, keyRange := range watchRanges {
-		for _, shardRange := range shardRanges {
-			if key.KeyRangeContainsKeyRange(keyRange, shardRange) {
-				return true
-			}
+		if key.KeyRangeContainsKeyRange(keyRange, shard.GetKeyRange()) {
+			return true
 		}
 	}
 	return false
@@ -204,8 +194,7 @@ func refreshAllShards(ctx context.Context, keyspaceName string) error {
 		}
 		shardName := topoproto.KeyspaceShardString(keyspaceName, shard)
 		log.Infof("Forgetting shard: %s", shardName)
-		err = inst.DeleteShard(keyspaceName, shard)
-		if err != nil {
+		if err = inst.DeleteShard(keyspaceName, shard); err != nil {
 			log.Errorf("Failed to delete shard %s: %+v", shardName, err)
 			return err
 		}

go/vt/vtorc/logic/keyspace_shard_discovery_test.go

@@ -329,16 +329,13 @@ func TestRefreshAllShards(t *testing.T) {
 	ctx := context.Background()
 	ts = memorytopo.NewServer(ctx, "zone1")
 	require.NoError(t, initializeShardsToWatch())
-	require.NoError(t, ts.CreateKeyspace(ctx, "ks1", &topodatapb.Keyspace{
-		KeyspaceType:     topodatapb.KeyspaceType_NORMAL,
-		DurabilityPolicy: policy.DurabilityNone,
-	}))
-
-	// test shard refresh
+	require.NoError(t, ts.CreateKeyspace(ctx, "ks1", keyspaceDurabilityNone))
 	shards := []string{"-40", "40-80", "80-c0", "c0-"}
 	for _, shard := range shards {
 		require.NoError(t, ts.CreateShard(ctx, "ks1", shard))
 	}
+
+	// test shard refresh
 	require.NoError(t, refreshAllShards(ctx, "ks1"))
 	shardNames, err := inst.ReadShardNames("ks1")
 	require.NoError(t, err)