@@ -39,7 +39,6 @@ import (
39
39
"go.temporal.io/server/api/matchingservice/v1"
40
40
"go.temporal.io/server/common"
41
41
"go.temporal.io/server/common/debug"
42
- "go.temporal.io/server/common/dynamicconfig"
43
42
"go.temporal.io/server/common/namespace"
44
43
)
45
44
@@ -57,7 +56,6 @@ type clientImpl struct {
57
56
longPollTimeout time.Duration
58
57
clients common.ClientCache
59
58
loadBalancer LoadBalancer
60
- useOldRouting dynamicconfig.BoolPropertyFn
61
59
}
62
60
63
61
// NewClient creates a new history service gRPC client
@@ -66,14 +64,12 @@ func NewClient(
66
64
longPollTimeout time.Duration ,
67
65
clients common.ClientCache ,
68
66
lb LoadBalancer ,
69
- useOldRouting dynamicconfig.BoolPropertyFn ,
70
67
) matchingservice.MatchingServiceClient {
71
68
return & clientImpl {
72
69
timeout : timeout ,
73
70
longPollTimeout : longPollTimeout ,
74
71
clients : clients ,
75
72
loadBalancer : lb ,
76
- useOldRouting : useOldRouting ,
77
73
}
78
74
}
79
75
@@ -207,12 +203,7 @@ func (c *clientImpl) getClientForTaskqueue(
207
203
taskQueue * taskqueuepb.TaskQueue ,
208
204
taskQueueType enumspb.TaskQueueType ,
209
205
) (matchingservice.MatchingServiceClient , error ) {
210
- var key string
211
- if c .useOldRouting () {
212
- key = taskQueue .Name
213
- } else {
214
- key = fmt .Sprintf ("%s:%s:%d" , namespaceID , taskQueue .Name , int (taskQueueType ))
215
- }
206
+ key := fmt .Sprintf ("%s:%s:%d" , namespaceID , taskQueue .Name , int (taskQueueType ))
216
207
client , err := c .clients .GetClientForKey (key )
217
208
if err != nil {
218
209
return nil , err
0 commit comments