Skip to content

refactor(storage): fold ChangeStore into storage, drop dead store #191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
behinddwalls merged 1 commit into from
Jun 5, 2026
+191 −633
Merged

refactor(storage): fold ChangeStore into storage, drop dead store #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ local-stovepipe-gateway-start: build-stovepipe-gateway-linux ## Start Stovepipe

mocks: ## Generate mock files using mockgen
@echo "Generating mocks..."
@$(BAZEL) run @rules_go//go -- generate ./submitqueue/extension/storage/... ./submitqueue/extension/buildrunner/... ./submitqueue/extension/changeprovider/... ./submitqueue/extension/changestore/... ./extension/counter/... ./extension/messagequeue/... ./submitqueue/extension/queueconfig/... ./submitqueue/extension/mergechecker/... ./submitqueue/extension/pusher/... ./submitqueue/extension/scorer/... ./submitqueue/extension/conflict/... ./submitqueue/core/consumer/...
@$(BAZEL) run @rules_go//go -- generate ./submitqueue/extension/storage/... ./submitqueue/extension/buildrunner/... ./submitqueue/extension/changeprovider/... ./extension/counter/... ./extension/messagequeue/... ./submitqueue/extension/queueconfig/... ./submitqueue/extension/mergechecker/... ./submitqueue/extension/pusher/... ./submitqueue/extension/scorer/... ./submitqueue/extension/conflict/... ./submitqueue/core/consumer/...
@echo "Mocks generated successfully!"

proto: ## Generate protobuf files from .proto definitions
Expand Down
2 changes: 0 additions & 2 deletions example/submitqueue/orchestrator/server/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ go_library(
"//submitqueue/extension/buildrunner/noop",
"//submitqueue/extension/changeprovider",
"//submitqueue/extension/changeprovider/github",
"//submitqueue/extension/changestore",
"//submitqueue/extension/changestore/mysql",
"//submitqueue/extension/conflict",
"//submitqueue/extension/conflict/all",
"//submitqueue/extension/mergechecker",
Expand Down
10 changes: 2 additions & 8 deletions example/submitqueue/orchestrator/server/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ import (
buildnoop "github.com/uber/submitqueue/submitqueue/extension/buildrunner/noop"
"github.com/uber/submitqueue/submitqueue/extension/changeprovider"
githubprovider "github.com/uber/submitqueue/submitqueue/extension/changeprovider/github"
"github.com/uber/submitqueue/submitqueue/extension/changestore"
mysqlchangestore "github.com/uber/submitqueue/submitqueue/extension/changestore/mysql"
"github.com/uber/submitqueue/submitqueue/extension/conflict"
"github.com/uber/submitqueue/submitqueue/extension/conflict/all"
"github.com/uber/submitqueue/submitqueue/extension/mergechecker"
Expand Down Expand Up @@ -164,8 +162,6 @@ func run() error {
return fmt.Errorf("failed to create storage: %w", err)
}

changeStore := mysqlchangestore.NewChangeStore(appDB, scope.SubScope("changestore"))

// Open queue database connection
// Docker Compose healthchecks ensure MySQL is ready before service starts
queueDSN := os.Getenv("QUEUE_MYSQL_DSN")
Expand Down Expand Up @@ -234,7 +230,7 @@ func run() error {
br := buildnoop.New()

// Register controllers
if err := registerControllers(c, logger.Sugar(), scope, registry, mc, cp, psh, br, cnt, store, changeStore); err != nil {
if err := registerControllers(c, logger.Sugar(), scope, registry, mc, cp, psh, br, cnt, store); err != nil {
return err
}

Expand Down Expand Up @@ -460,12 +456,11 @@ type conflictFactory struct{ impl conflict.Analyzer }

func (f conflictFactory) For(conflict.Config) (conflict.Analyzer, error) { return f.impl, nil }

func registerControllers(c consumer.Consumer, logger *zap.SugaredLogger, scope tally.Scope, registry consumer.TopicRegistry, mc mergechecker.MergeChecker, cp changeprovider.ChangeProvider, psh pusher.Pusher, br buildrunner.BuildRunner, cnt counter.Counter, store storage.Storage, changeStore changestore.ChangeStore) error {
func registerControllers(c consumer.Consumer, logger *zap.SugaredLogger, scope tally.Scope, registry consumer.TopicRegistry, mc mergechecker.MergeChecker, cp changeprovider.ChangeProvider, psh pusher.Pusher, br buildrunner.BuildRunner, cnt counter.Counter, store storage.Storage) error {
requestController := start.NewController(
logger,
scope,
store,
changeStore,
registry,
consumer.TopicKeyStart,
"orchestrator-start",
Expand All @@ -490,7 +485,6 @@ func registerControllers(c consumer.Consumer, logger *zap.SugaredLogger, scope t
logger,
scope,
store,
changeStore,
registry,
mergeCheckerFactory{impl: mc},
changeProviderFactory{impl: cp},
Expand Down
1 change: 0 additions & 1 deletion submitqueue/entity/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ go_library(
"batch_dependent.go",
"build.go",
"cancel_request.go",
"change_provider.go",
"change_record.go",
"land_request.go",
"queue_config.go",
Expand Down
29 changes: 0 additions & 29 deletions submitqueue/entity/change_provider.go
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions submitqueue/extension/changestore/BUILD.bazel
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions submitqueue/extension/changestore/README.md
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions submitqueue/extension/changestore/mock/BUILD.bazel
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions submitqueue/extension/changestore/mysql/BUILD.bazel
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions submitqueue/extension/changestore/mysql/schema/BUILD.bazel
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion submitqueue/extension/storage/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ go_library(
"batch_dependent_store.go",
"batch_store.go",
"build_store.go",
"change_provider_store.go",
"change_store.go",
"request_log_store.go",
"request_store.go",
"speculation_tree_store.go",
Expand Down
42 changes: 0 additions & 42 deletions submitqueue/extension/storage/change_provider_store.go
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...eue/extension/changestore/change_store.go → ...itqueue/extension/storage/change_store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package changestore
package storage

//go:generate mockgen -source=change_store.go -destination=mock/change_store_mock.go -package=mock

Expand Down
2 changes: 1 addition & 1 deletion submitqueue/extension/storage/mock/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ go_library(
"batch_dependent_store_mock.go",
"batch_store_mock.go",
"build_store_mock.go",
"change_provider_store_mock.go",
"change_store_mock.go",
"request_log_store_mock.go",
"request_store_mock.go",
"speculation_tree_store_mock.go",
Expand Down
71 changes: 0 additions & 71 deletions submitqueue/extension/storage/mock/change_provider_store_mock.go
View file
Open in desktop

This file was deleted.

0 ...ion/changestore/mock/change_store_mock.go → ...tension/storage/mock/change_store_mock.go
View file
Open in desktop
File renamed without changes.
14 changes: 7 additions & 7 deletions submitqueue/extension/storage/mock/storage_mock.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion submitqueue/extension/storage/mysql/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ go_library(
"batch_dependent_store.go",
"batch_store.go",
"build_store.go",
"change_provider_store.go",
"change_store.go",
"request_log_store.go",
"request_store.go",
"speculation_tree_store.go",
Expand Down
Loading
Loading