Skip to content

Commit 14467e4

Browse files
yiyang5055yiyang5055
authored
remove duplicate RingMock (#6856)
Signed-off-by: yiyang5055 <[email protected]>
1 parent f8260cd commit 14467e4

File tree

4 files changed

+83
-147
lines changed

4 files changed

+83
-147
lines changed

‎pkg/compactor/partition_compaction_grouper_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2056,11 +2056,11 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) {
20562056
{Addr: "test-addr"},
20572057
},
20582058
}
2059-
subring := &RingMock{}
2059+
subring := &ring.RingMock{}
20602060
subring.On("GetAllHealthy", mock.Anything).Return(rs, nil)
20612061
subring.On("Get", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(rs, nil)
20622062

2063-
ring := &RingMock{}
2063+
ring := &ring.RingMock{}
20642064
ring.On("ShuffleShard", mock.Anything, mock.Anything).Return(subring, nil)
20652065

20662066
registerer := prometheus.NewPedanticRegistry()

‎pkg/compactor/shuffle_sharding_grouper_test.go

Lines changed: 2 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -338,11 +338,11 @@ func TestShuffleShardingGrouper_Groups(t *testing.T) {
338338
{Addr: "test-addr"},
339339
},
340340
}
341-
subring := &RingMock{}
341+
subring := &ring.RingMock{}
342342
subring.On("GetAllHealthy", mock.Anything).Return(rs, nil)
343343
subring.On("Get", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(rs, nil)
344344

345-
ring := &RingMock{}
345+
ring := &ring.RingMock{}
346346
ring.On("ShuffleShard", mock.Anything, mock.Anything).Return(subring, nil)
347347

348348
registerer := prometheus.NewPedanticRegistry()
@@ -737,74 +737,3 @@ func TestBlocksGroup_overlaps(t *testing.T) {
737737
assert.Equal(t, tc.expected, tc.second.overlaps(tc.first))
738738
}
739739
}
740-
741-
type RingMock struct {
742-
mock.Mock
743-
}
744-
745-
func (r *RingMock) GetInstanceIdByAddr(addr string) (string, error) {
746-
return "", nil
747-
}
748-
749-
func (r *RingMock) Collect(ch chan<- prometheus.Metric) {}
750-
751-
func (r *RingMock) Describe(ch chan<- *prometheus.Desc) {}
752-
753-
func (r *RingMock) Get(key uint32, op ring.Operation, bufDescs []ring.InstanceDesc, bufHosts []string, bufZones map[string]int) (ring.ReplicationSet, error) {
754-
args := r.Called(key, op, bufDescs, bufHosts, bufZones)
755-
return args.Get(0).(ring.ReplicationSet), args.Error(1)
756-
}
757-
758-
func (r *RingMock) GetAllHealthy(op ring.Operation) (ring.ReplicationSet, error) {
759-
args := r.Called(op)
760-
return args.Get(0).(ring.ReplicationSet), args.Error(1)
761-
}
762-
763-
func (r *RingMock) GetInstanceDescsForOperation(op ring.Operation) (map[string]ring.InstanceDesc, error) {
764-
args := r.Called(op)
765-
return args.Get(0).(map[string]ring.InstanceDesc), args.Error(1)
766-
}
767-
768-
func (r *RingMock) GetAllInstanceDescs(op ring.Operation) ([]ring.InstanceDesc, []ring.InstanceDesc, error) {
769-
args := r.Called(op)
770-
return args.Get(0).([]ring.InstanceDesc), make([]ring.InstanceDesc, 0), args.Error(1)
771-
}
772-
773-
func (r *RingMock) GetReplicationSetForOperation(op ring.Operation) (ring.ReplicationSet, error) {
774-
args := r.Called(op)
775-
return args.Get(0).(ring.ReplicationSet), args.Error(1)
776-
}
777-
778-
func (r *RingMock) ReplicationFactor() int {
779-
return 0
780-
}
781-
782-
func (r *RingMock) InstancesCount() int {
783-
return 0
784-
}
785-
786-
func (r *RingMock) ShuffleShard(identifier string, size int) ring.ReadRing {
787-
args := r.Called(identifier, size)
788-
return args.Get(0).(ring.ReadRing)
789-
}
790-
791-
func (r *RingMock) ShuffleShardWithZoneStability(identifier string, size int) ring.ReadRing {
792-
args := r.Called(identifier, size)
793-
return args.Get(0).(ring.ReadRing)
794-
}
795-
796-
func (r *RingMock) GetInstanceState(instanceID string) (ring.InstanceState, error) {
797-
args := r.Called(instanceID)
798-
return args.Get(0).(ring.InstanceState), args.Error(1)
799-
}
800-
801-
func (r *RingMock) ShuffleShardWithLookback(identifier string, size int, lookbackPeriod time.Duration, now time.Time) ring.ReadRing {
802-
args := r.Called(identifier, size, lookbackPeriod, now)
803-
return args.Get(0).(ring.ReadRing)
804-
}
805-
806-
func (r *RingMock) HasInstance(instanceID string) bool {
807-
return true
808-
}
809-
810-
func (r *RingMock) CleanupShuffleShardCache(identifier string) {}

‎pkg/ring/mock.go

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
package ring
2+
3+
import (
4+
"time"
5+
6+
"github.com/prometheus/client_golang/prometheus"
7+
"github.com/stretchr/testify/mock"
8+
)
9+
10+
type RingMock struct {
11+
mock.Mock
12+
}
13+
14+
func (r *RingMock) GetInstanceIdByAddr(addr string) (string, error) {
15+
return "", nil
16+
}
17+
18+
func (r *RingMock) Collect(ch chan<- prometheus.Metric) {}
19+
20+
func (r *RingMock) Describe(ch chan<- *prometheus.Desc) {}
21+
22+
func (r *RingMock) Get(key uint32, op Operation, bufDescs []InstanceDesc, bufHosts []string, bufZones map[string]int) (ReplicationSet, error) {
23+
args := r.Called(key, op, bufDescs, bufHosts, bufZones)
24+
return args.Get(0).(ReplicationSet), args.Error(1)
25+
}
26+
27+
func (r *RingMock) GetAllHealthy(op Operation) (ReplicationSet, error) {
28+
args := r.Called(op)
29+
return args.Get(0).(ReplicationSet), args.Error(1)
30+
}
31+
32+
func (r *RingMock) GetInstanceDescsForOperation(op Operation) (map[string]InstanceDesc, error) {
33+
args := r.Called(op)
34+
return args.Get(0).(map[string]InstanceDesc), args.Error(1)
35+
}
36+
37+
func (r *RingMock) GetAllInstanceDescs(op Operation) ([]InstanceDesc, []InstanceDesc, error) {
38+
args := r.Called(op)
39+
return args.Get(0).([]InstanceDesc), make([]InstanceDesc, 0), args.Error(1)
40+
}
41+
42+
func (r *RingMock) GetReplicationSetForOperation(op Operation) (ReplicationSet, error) {
43+
args := r.Called(op)
44+
return args.Get(0).(ReplicationSet), args.Error(1)
45+
}
46+
47+
func (r *RingMock) ReplicationFactor() int {
48+
return 0
49+
}
50+
51+
func (r *RingMock) InstancesCount() int {
52+
return 0
53+
}
54+
55+
func (r *RingMock) ShuffleShard(identifier string, size int) ReadRing {
56+
args := r.Called(identifier, size)
57+
return args.Get(0).(ReadRing)
58+
}
59+
60+
func (r *RingMock) ShuffleShardWithZoneStability(identifier string, size int) ReadRing {
61+
args := r.Called(identifier, size)
62+
return args.Get(0).(ReadRing)
63+
}
64+
65+
func (r *RingMock) GetInstanceState(instanceID string) (InstanceState, error) {
66+
args := r.Called(instanceID)
67+
return args.Get(0).(InstanceState), args.Error(1)
68+
}
69+
70+
func (r *RingMock) ShuffleShardWithLookback(identifier string, size int, lookbackPeriod time.Duration, now time.Time) ReadRing {
71+
args := r.Called(identifier, size, lookbackPeriod, now)
72+
return args.Get(0).(ReadRing)
73+
}
74+
75+
func (r *RingMock) HasInstance(instanceID string) bool {
76+
return true
77+
}
78+
79+
func (r *RingMock) CleanupShuffleShardCache(identifier string) {}

‎pkg/ring/util_test.go

Lines changed: 0 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -7,83 +7,11 @@ import (
77
"time"
88

99
"github.com/pkg/errors"
10-
"github.com/prometheus/client_golang/prometheus"
1110
"github.com/stretchr/testify/assert"
1211
"github.com/stretchr/testify/mock"
1312
"github.com/stretchr/testify/require"
1413
)
1514

16-
type RingMock struct {
17-
mock.Mock
18-
}
19-
20-
func (r *RingMock) GetInstanceIdByAddr(addr string) (string, error) {
21-
return "", nil
22-
}
23-
24-
func (r *RingMock) Collect(ch chan<- prometheus.Metric) {}
25-
26-
func (r *RingMock) Describe(ch chan<- *prometheus.Desc) {}
27-
28-
func (r *RingMock) Get(key uint32, op Operation, bufDescs []InstanceDesc, bufHosts []string, bufZones map[string]int) (ReplicationSet, error) {
29-
args := r.Called(key, op, bufDescs, bufHosts, bufZones)
30-
return args.Get(0).(ReplicationSet), args.Error(1)
31-
}
32-
33-
func (r *RingMock) GetAllHealthy(op Operation) (ReplicationSet, error) {
34-
args := r.Called(op)
35-
return args.Get(0).(ReplicationSet), args.Error(1)
36-
}
37-
38-
func (r *RingMock) GetInstanceDescsForOperation(op Operation) (map[string]InstanceDesc, error) {
39-
args := r.Called(op)
40-
return args.Get(0).(map[string]InstanceDesc), args.Error(1)
41-
}
42-
43-
func (r *RingMock) GetAllInstanceDescs(op Operation) ([]InstanceDesc, []InstanceDesc, error) {
44-
args := r.Called(op)
45-
return args.Get(0).([]InstanceDesc), make([]InstanceDesc, 0), args.Error(1)
46-
}
47-
48-
func (r *RingMock) GetReplicationSetForOperation(op Operation) (ReplicationSet, error) {
49-
args := r.Called(op)
50-
return args.Get(0).(ReplicationSet), args.Error(1)
51-
}
52-
53-
func (r *RingMock) ReplicationFactor() int {
54-
return 0
55-
}
56-
57-
func (r *RingMock) InstancesCount() int {
58-
return 0
59-
}
60-
61-
func (r *RingMock) ShuffleShard(identifier string, size int) ReadRing {
62-
args := r.Called(identifier, size)
63-
return args.Get(0).(ReadRing)
64-
}
65-
66-
func (r *RingMock) ShuffleShardWithZoneStability(identifier string, size int) ReadRing {
67-
args := r.Called(identifier, size)
68-
return args.Get(0).(ReadRing)
69-
}
70-
71-
func (r *RingMock) GetInstanceState(instanceID string) (InstanceState, error) {
72-
args := r.Called(instanceID)
73-
return args.Get(0).(InstanceState), args.Error(1)
74-
}
75-
76-
func (r *RingMock) ShuffleShardWithLookback(identifier string, size int, lookbackPeriod time.Duration, now time.Time) ReadRing {
77-
args := r.Called(identifier, size, lookbackPeriod, now)
78-
return args.Get(0).(ReadRing)
79-
}
80-
81-
func (r *RingMock) HasInstance(instanceID string) bool {
82-
return true
83-
}
84-
85-
func (r *RingMock) CleanupShuffleShardCache(identifier string) {}
86-
8715
func createStartingRing() *Ring {
8816
// Init the ring.
8917
ringDesc := &Desc{Ingesters: map[string]InstanceDesc{

0 commit comments

Comments
 (0)