Skip to content

refactor(speculation): move the scorer in with the rest of speculation #625

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

Open
behinddwalls wants to merge 1 commit into from
Open

refactor(speculation): move the scorer in with the rest of speculation #625

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 @@ -579,7 +579,7 @@ local-stovepipe-stop: ## Stop the Stovepipe service

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

proto: ## Generate protobuf files from .proto definitions
Expand Down
10 changes: 5 additions & 5 deletions service/submitqueue/orchestrator/server/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ go_library(
"//submitqueue/extension/conflict/fake:go_default_library",
"//submitqueue/extension/conflict/none:go_default_library",
"//submitqueue/extension/conflict/pathoverlap:go_default_library",
"//submitqueue/extension/scorer:go_default_library",
"//submitqueue/extension/scorer/composite:go_default_library",
"//submitqueue/extension/scorer/fake:go_default_library",
"//submitqueue/extension/scorer/heuristic:go_default_library",
"//submitqueue/extension/speculation/allocator/sticky:go_default_library",
"//submitqueue/extension/speculation/generator/bestfirst:go_default_library",
"//submitqueue/extension/speculation/scorer:go_default_library",
"//submitqueue/extension/speculation/scorer/composite:go_default_library",
"//submitqueue/extension/speculation/scorer/fake:go_default_library",
"//submitqueue/extension/speculation/scorer/heuristic:go_default_library",
"//submitqueue/extension/speculation/speculator:go_default_library",
"//submitqueue/extension/speculation/speculator/standard:go_default_library",
"//submitqueue/extension/storage:go_default_library",
Expand Down Expand Up @@ -118,7 +118,7 @@ go_test(
"//submitqueue/extension/buildrunner:go_default_library",
"//submitqueue/extension/changeprovider:go_default_library",
"//submitqueue/extension/conflict:go_default_library",
"//submitqueue/extension/scorer:go_default_library",
"//submitqueue/extension/speculation/scorer:go_default_library",
"//submitqueue/extension/speculation/speculator:go_default_library",
"//submitqueue/extension/storage:go_default_library",
"@com_github_stretchr_testify//assert:go_default_library",
Expand Down
8 changes: 4 additions & 4 deletions service/submitqueue/orchestrator/server/profiles.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ import (
conflictfake "github.com/uber/submitqueue/submitqueue/extension/conflict/fake"
"github.com/uber/submitqueue/submitqueue/extension/conflict/none"
"github.com/uber/submitqueue/submitqueue/extension/conflict/pathoverlap"
"github.com/uber/submitqueue/submitqueue/extension/scorer"
"github.com/uber/submitqueue/submitqueue/extension/scorer/composite"
scorerfake "github.com/uber/submitqueue/submitqueue/extension/scorer/fake"
"github.com/uber/submitqueue/submitqueue/extension/scorer/heuristic"
"github.com/uber/submitqueue/submitqueue/extension/speculation/scorer"
"github.com/uber/submitqueue/submitqueue/extension/speculation/scorer/composite"
scorerfake "github.com/uber/submitqueue/submitqueue/extension/speculation/scorer/fake"
"github.com/uber/submitqueue/submitqueue/extension/speculation/scorer/heuristic"
"github.com/uber/submitqueue/submitqueue/extension/speculation/allocator/sticky"
"github.com/uber/submitqueue/submitqueue/extension/speculation/generator/bestfirst"
"github.com/uber/submitqueue/submitqueue/extension/speculation/speculator"
Expand Down
2 changes: 1 addition & 1 deletion service/submitqueue/orchestrator/server/profiles_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"github.com/uber/submitqueue/submitqueue/extension/buildrunner"
"github.com/uber/submitqueue/submitqueue/extension/changeprovider"
"github.com/uber/submitqueue/submitqueue/extension/conflict"
"github.com/uber/submitqueue/submitqueue/extension/scorer"
"github.com/uber/submitqueue/submitqueue/extension/speculation/scorer"
"github.com/uber/submitqueue/submitqueue/extension/speculation/speculator"
"github.com/uber/submitqueue/submitqueue/extension/storage"
)
Expand Down
4 changes: 2 additions & 2 deletions submitqueue/extension/speculation/generator/bestfirst/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ go_library(
visibility = ["//visibility:public"],
deps = [
"//submitqueue/entity:go_default_library",
"//submitqueue/extension/scorer:go_default_library",
"//submitqueue/extension/speculation/generator:go_default_library",
"//submitqueue/extension/speculation/scorer:go_default_library",
],
)

Expand All @@ -18,8 +18,8 @@ go_test(
embed = [":go_default_library"],
deps = [
"//submitqueue/entity:go_default_library",
"//submitqueue/extension/scorer:go_default_library",
"//submitqueue/extension/speculation/generator:go_default_library",
"//submitqueue/extension/speculation/scorer:go_default_library",
"@com_github_stretchr_testify//assert:go_default_library",
"@com_github_stretchr_testify//require:go_default_library",
],
Expand Down
2 changes: 1 addition & 1 deletion submitqueue/extension/speculation/generator/bestfirst/bestfirst.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"slices"

"github.com/uber/submitqueue/submitqueue/entity"
"github.com/uber/submitqueue/submitqueue/extension/scorer"
"github.com/uber/submitqueue/submitqueue/extension/speculation/scorer"
"github.com/uber/submitqueue/submitqueue/extension/speculation/generator"
)

Expand Down
2 changes: 1 addition & 1 deletion submitqueue/extension/speculation/generator/bestfirst/bestfirst_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"github.com/stretchr/testify/require"

"github.com/uber/submitqueue/submitqueue/entity"
"github.com/uber/submitqueue/submitqueue/extension/scorer"
"github.com/uber/submitqueue/submitqueue/extension/speculation/scorer"
"github.com/uber/submitqueue/submitqueue/extension/speculation/generator"
)

Expand Down
2 changes: 1 addition & 1 deletion submitqueue/extension/scorer/BUILD.bazel → .../extension/speculation/scorer/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ load("@rules_go//go:def.bzl", "go_library")
go_library(
name = "go_default_library",
srcs = ["scorer.go"],
importpath = "github.com/uber/submitqueue/submitqueue/extension/scorer",
importpath = "github.com/uber/submitqueue/submitqueue/extension/speculation/scorer",
visibility = ["//visibility:public"],
deps = ["//submitqueue/entity:go_default_library"],
)
0 submitqueue/extension/scorer/README.md → ...ue/extension/speculation/scorer/README.md
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...ue/extension/scorer/composite/BUILD.bazel → .../speculation/scorer/composite/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ load("@rules_go//go:def.bzl", "go_library", "go_test")
go_library(
name = "go_default_library",
srcs = ["scorer.go"],
importpath = "github.com/uber/submitqueue/submitqueue/extension/scorer/composite",
importpath = "github.com/uber/submitqueue/submitqueue/extension/speculation/scorer/composite",
visibility = ["//visibility:public"],
deps = [
"//platform/metrics:go_default_library",
"//submitqueue/entity:go_default_library",
"//submitqueue/extension/scorer:go_default_library",
"//submitqueue/extension/speculation/scorer:go_default_library",
"@com_github_uber_go_tally//:go_default_library",
],
)
Expand All @@ -19,7 +19,7 @@ go_test(
embed = [":go_default_library"],
deps = [
"//submitqueue/entity:go_default_library",
"//submitqueue/extension/scorer:go_default_library",
"//submitqueue/extension/speculation/scorer:go_default_library",
"@com_github_stretchr_testify//assert:go_default_library",
"@com_github_stretchr_testify//require:go_default_library",
"@com_github_uber_go_tally//:go_default_library",
Expand Down
2 changes: 1 addition & 1 deletion ...ueue/extension/scorer/composite/scorer.go → ...on/speculation/scorer/composite/scorer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"github.com/uber-go/tally"
"github.com/uber/submitqueue/platform/metrics"
"github.com/uber/submitqueue/submitqueue/entity"
"github.com/uber/submitqueue/submitqueue/extension/scorer"
"github.com/uber/submitqueue/submitqueue/extension/speculation/scorer"
)

// ReduceFunc combines named scores into a single score.
Expand Down
2 changes: 1 addition & 1 deletion ...extension/scorer/composite/scorer_test.go → ...eculation/scorer/composite/scorer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/uber-go/tally"
"github.com/uber/submitqueue/submitqueue/entity"
"github.com/uber/submitqueue/submitqueue/extension/scorer"
"github.com/uber/submitqueue/submitqueue/extension/speculation/scorer"
)

// testCfg is the per-queue identity used by every case in this file.
Expand Down
8 changes: 4 additions & 4 deletions ...itqueue/extension/scorer/fake/BUILD.bazel → ...nsion/speculation/scorer/fake/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ load("@rules_go//go:def.bzl", "go_library", "go_test")
go_library(
name = "go_default_library",
srcs = ["fake.go"],
importpath = "github.com/uber/submitqueue/submitqueue/extension/scorer/fake",
importpath = "github.com/uber/submitqueue/submitqueue/extension/speculation/scorer/fake",
visibility = ["//visibility:public"],
deps = [
"//platform/fakemarker:go_default_library",
"//submitqueue/core/changeset:go_default_library",
"//submitqueue/entity:go_default_library",
"//submitqueue/extension/scorer:go_default_library",
"//submitqueue/extension/speculation/scorer:go_default_library",
],
)

Expand All @@ -21,8 +21,8 @@ go_test(
"//submitqueue/core/changeset:go_default_library",
"//submitqueue/core/changeset/fake:go_default_library",
"//submitqueue/entity:go_default_library",
"//submitqueue/extension/scorer:go_default_library",
"//submitqueue/extension/scorer/heuristic:go_default_library",
"//submitqueue/extension/speculation/scorer:go_default_library",
"//submitqueue/extension/speculation/scorer/heuristic:go_default_library",
"@com_github_stretchr_testify//assert:go_default_library",
"@com_github_stretchr_testify//require:go_default_library",
"@com_github_uber_go_tally//:go_default_library",
Expand Down
2 changes: 1 addition & 1 deletion submitqueue/extension/scorer/fake/fake.go → ...extension/speculation/scorer/fake/fake.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"github.com/uber/submitqueue/platform/fakemarker"
"github.com/uber/submitqueue/submitqueue/core/changeset"
"github.com/uber/submitqueue/submitqueue/entity"
"github.com/uber/submitqueue/submitqueue/extension/scorer"
"github.com/uber/submitqueue/submitqueue/extension/speculation/scorer"
)

// Recognized marker token. See the package doc for the convention.
Expand Down
4 changes: 2 additions & 2 deletions ...tqueue/extension/scorer/fake/fake_test.go → ...sion/speculation/scorer/fake/fake_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"github.com/uber/submitqueue/submitqueue/core/changeset"
changesetfake "github.com/uber/submitqueue/submitqueue/core/changeset/fake"
"github.com/uber/submitqueue/submitqueue/entity"
"github.com/uber/submitqueue/submitqueue/extension/scorer"
"github.com/uber/submitqueue/submitqueue/extension/scorer/heuristic"
"github.com/uber/submitqueue/submitqueue/extension/speculation/scorer"
"github.com/uber/submitqueue/submitqueue/extension/speculation/scorer/heuristic"
)

// testCfg is the per-queue identity used by every case in this file.
Expand Down
6 changes: 3 additions & 3 deletions ...ue/extension/scorer/heuristic/BUILD.bazel → .../speculation/scorer/heuristic/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ load("@rules_go//go:def.bzl", "go_library", "go_test")
go_library(
name = "go_default_library",
srcs = ["scorer.go"],
importpath = "github.com/uber/submitqueue/submitqueue/extension/scorer/heuristic",
importpath = "github.com/uber/submitqueue/submitqueue/extension/speculation/scorer/heuristic",
visibility = ["//visibility:public"],
deps = [
"//platform/metrics:go_default_library",
"//submitqueue/core/changeset:go_default_library",
"//submitqueue/entity:go_default_library",
"//submitqueue/extension/scorer:go_default_library",
"//submitqueue/extension/speculation/scorer:go_default_library",
"@com_github_uber_go_tally//:go_default_library",
],
)
Expand All @@ -21,7 +21,7 @@ go_test(
deps = [
"//submitqueue/core/changeset/fake:go_default_library",
"//submitqueue/entity:go_default_library",
"//submitqueue/extension/scorer:go_default_library",
"//submitqueue/extension/speculation/scorer:go_default_library",
"@com_github_stretchr_testify//assert:go_default_library",
"@com_github_stretchr_testify//require:go_default_library",
"@com_github_uber_go_tally//:go_default_library",
Expand Down
2 changes: 1 addition & 1 deletion ...ueue/extension/scorer/heuristic/scorer.go → ...on/speculation/scorer/heuristic/scorer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/uber/submitqueue/platform/metrics"
"github.com/uber/submitqueue/submitqueue/core/changeset"
"github.com/uber/submitqueue/submitqueue/entity"
"github.com/uber/submitqueue/submitqueue/extension/scorer"
"github.com/uber/submitqueue/submitqueue/extension/speculation/scorer"
)

// ValueFunc extracts a single numeric value from a batch of changes for bucketing.
Expand Down
2 changes: 1 addition & 1 deletion ...extension/scorer/heuristic/scorer_test.go → ...eculation/scorer/heuristic/scorer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/uber-go/tally"
changesetfake "github.com/uber/submitqueue/submitqueue/core/changeset/fake"
"github.com/uber/submitqueue/submitqueue/entity"
"github.com/uber/submitqueue/submitqueue/extension/scorer"
"github.com/uber/submitqueue/submitqueue/extension/speculation/scorer"
)

// testCfg is the per-queue identity used by every case in this file.
Expand Down
4 changes: 2 additions & 2 deletions ...itqueue/extension/scorer/mock/BUILD.bazel → ...nsion/speculation/scorer/mock/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ load("@rules_go//go:def.bzl", "go_library")
go_library(
name = "go_default_library",
srcs = ["scorer_mock.go"],
importpath = "github.com/uber/submitqueue/submitqueue/extension/scorer/mock",
importpath = "github.com/uber/submitqueue/submitqueue/extension/speculation/scorer/mock",
visibility = ["//visibility:public"],
deps = [
"//submitqueue/entity:go_default_library",
"//submitqueue/extension/scorer:go_default_library",
"//submitqueue/extension/speculation/scorer:go_default_library",
"@org_uber_go_mock//gomock:go_default_library",
],
)
2 changes: 1 addition & 1 deletion ...ueue/extension/scorer/mock/scorer_mock.go → ...on/speculation/scorer/mock/scorer_mock.go
View file
Open in desktop

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

0 submitqueue/extension/scorer/scorer.go → ...ue/extension/speculation/scorer/scorer.go
View file
Open in desktop
File renamed without changes.
Loading