@@ -27,7 +27,6 @@ import (
2727 "github.com/uber/submitqueue/submitqueue/extension/buildrunner"
2828 "github.com/uber/submitqueue/submitqueue/extension/changeprovider"
2929 "github.com/uber/submitqueue/submitqueue/extension/conflict"
30- "github.com/uber/submitqueue/submitqueue/extension/scorer"
3130 "github.com/uber/submitqueue/submitqueue/extension/storage"
3231 "github.com/uber/submitqueue/submitqueue/extension/validator"
3332 "github.com/uber/submitqueue/submitqueue/orchestrator/controller"
@@ -40,7 +39,6 @@ import (
4039 "github.com/uber/submitqueue/submitqueue/orchestrator/controller/merge"
4140 "github.com/uber/submitqueue/submitqueue/orchestrator/controller/mergeconflictsignal"
4241 "github.com/uber/submitqueue/submitqueue/orchestrator/controller/mergesignal"
43- "github.com/uber/submitqueue/submitqueue/orchestrator/controller/score"
4442 "github.com/uber/submitqueue/submitqueue/orchestrator/controller/speculate"
4543 "github.com/uber/submitqueue/submitqueue/orchestrator/controller/start"
4644 "github.com/uber/submitqueue/submitqueue/orchestrator/controller/validate"
@@ -70,9 +68,6 @@ type Deps struct {
7068 // ChangeProvider resolves the change provider for each queue.
7169 ChangeProvider changeprovider.Factory
7270
73- // Scorer resolves the scorer for each queue.
74- Scorer scorer.Factory
75-
7671 // Analyzer resolves the conflict analyzer for each queue.
7772 Analyzer conflict.Factory
7873
@@ -85,11 +80,11 @@ type Deps struct {
8580//
8681// Pipeline:
8782//
88- // start → cancel → validate ⇢ (runway) ⇢ mergeconflictsignal → batch → score → speculate → build → buildsignal ─┐
89- // ↑ ↘ ↻ poll │
90- // │ merge → conclude │
91- // │ │ │
92- // └──────── ┴───────────────────────┘
83+ // start → cancel → validate ⇢ (runway) ⇢ mergeconflictsignal → batch → speculate → build → buildsignal ─┐
84+ // ↑ ↘ ↻ poll │
85+ // │ merge → conclude │
86+ // │ │ │
87+ // └─────┴───────────────────────┘
9388var Stages = []pipeline.Stage [Deps ]{
9489 {
9590 Key : topickey .TopicKeyStart ,
@@ -146,17 +141,6 @@ var Stages = []pipeline.Stage[Deps]{
146141 return dlq .NewDLQRequestController (d .Logger , d .Scope , d .Storage , sc .Registry , dlq .DecodeRequestID , sc .TopicKey , sc .ConsumerGroup ), nil
147142 },
148143 },
149- {
150- Key : topickey .TopicKeyScore ,
151- Name : "score" ,
152- ConsumerGroup : "orchestrator-score" ,
153- New : func (d Deps , sc pipeline.StageContext ) (consumer.Controller , error ) {
154- return score .NewController (d .Logger , d .Scope , d .Storage , d .Scorer , sc .Registry , sc .TopicKey , sc .ConsumerGroup ), nil
155- },
156- DLQ : func (d Deps , sc pipeline.StageContext ) (consumer.Controller , error ) {
157- return dlq .NewDLQBatchController (d .Logger , d .Scope , d .Storage , sc .Registry , sc .TopicKey , sc .ConsumerGroup ), nil
158- },
159- },
160144 {
161145 Key : topickey .TopicKeySpeculate ,
162146 Name : "speculate" ,
0 commit comments