Skip to content

Commit 75b6513

Browse files
refactor: remove unused merge checker
## Summary ### Why? SubmitQueue validation already crosses the Runway boundary, so the older in-process merge checker and its result entities have no callers and duplicate ownership of merge execution. ### What? Remove the mergechecker contract and implementations, delete the orphaned MergeResult and PushResult entities, and stop generating mergechecker mocks. ## Test Plan - ✅ `make gazelle` - ✅ `make test` Co-authored-by: Cursor <cursoragent@cursor.com>
1 parent c9ee7a8 commit 75b6513

18 files changed

Lines changed: 1 addition & 1320 deletions

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,7 @@ local-stovepipe-stop: ## Stop the Stovepipe service
579579

580580
mocks: ## Generate mock files using mockgen
581581
@echo "Generating mocks..."
582-
@$(BAZEL) run @rules_go//go -- generate ./submitqueue/extension/storage/... ./submitqueue/extension/buildrunner/... ./submitqueue/extension/changeprovider/... ./platform/extension/counter/... ./platform/extension/consumergate/... ./platform/extension/hook/... ./platform/extension/messagequeue/... ./submitqueue/extension/queueconfig/... ./submitqueue/extension/mergechecker/... ./submitqueue/extension/conflict/... ./submitqueue/extension/speculation/... ./submitqueue/extension/validator/... ./platform/consumer/... ./stovepipe/core/requestlog/... ./stovepipe/extension/storage/... ./stovepipe/extension/sourcecontrol/...
582+
@$(BAZEL) run @rules_go//go -- generate ./submitqueue/extension/storage/... ./submitqueue/extension/buildrunner/... ./submitqueue/extension/changeprovider/... ./platform/extension/counter/... ./platform/extension/consumergate/... ./platform/extension/hook/... ./platform/extension/messagequeue/... ./submitqueue/extension/queueconfig/... ./submitqueue/extension/conflict/... ./submitqueue/extension/speculation/... ./submitqueue/extension/validator/... ./platform/consumer/... ./stovepipe/core/requestlog/... ./stovepipe/extension/storage/... ./stovepipe/extension/sourcecontrol/...
583583
@echo "Mocks generated successfully!"
584584

585585
proto: ## Generate protobuf files from .proto definitions

submitqueue/entity/BUILD.bazel

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ go_library(
1313
"conflict.go",
1414
"land.go",
1515
"list.go",
16-
"merge_result.go",
1716
"path_build.go",
18-
"push_result.go",
1917
"queue_batch_state.go",
2018
"queue_config.go",
2119
"request.go",

submitqueue/entity/merge_result.go

Lines changed: 0 additions & 24 deletions
This file was deleted.

submitqueue/entity/push_result.go

Lines changed: 0 additions & 67 deletions
This file was deleted.

submitqueue/extension/mergechecker/BUILD.bazel

Lines changed: 0 additions & 9 deletions
This file was deleted.

submitqueue/extension/mergechecker/fake/BUILD.bazel

Lines changed: 0 additions & 26 deletions
This file was deleted.

submitqueue/extension/mergechecker/fake/fake.go

Lines changed: 0 additions & 68 deletions
This file was deleted.

submitqueue/extension/mergechecker/fake/fake_test.go

Lines changed: 0 additions & 82 deletions
This file was deleted.

submitqueue/extension/mergechecker/github/BUILD.bazel

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)