diff --git a/Makefile b/Makefile index f06d0aea6..8231b9664 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/service/submitqueue/orchestrator/server/BUILD.bazel b/service/submitqueue/orchestrator/server/BUILD.bazel index 53e39a233..c1f3332e3 100644 --- a/service/submitqueue/orchestrator/server/BUILD.bazel +++ b/service/submitqueue/orchestrator/server/BUILD.bazel @@ -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", @@ -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", diff --git a/service/submitqueue/orchestrator/server/profiles.go b/service/submitqueue/orchestrator/server/profiles.go index cfeac341e..31b72c58c 100644 --- a/service/submitqueue/orchestrator/server/profiles.go +++ b/service/submitqueue/orchestrator/server/profiles.go @@ -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" diff --git a/service/submitqueue/orchestrator/server/profiles_test.go b/service/submitqueue/orchestrator/server/profiles_test.go index a8b07adb6..25a7fb7ec 100644 --- a/service/submitqueue/orchestrator/server/profiles_test.go +++ b/service/submitqueue/orchestrator/server/profiles_test.go @@ -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" ) diff --git a/submitqueue/extension/speculation/generator/bestfirst/BUILD.bazel b/submitqueue/extension/speculation/generator/bestfirst/BUILD.bazel index ff2cdd219..3fbed48cb 100644 --- a/submitqueue/extension/speculation/generator/bestfirst/BUILD.bazel +++ b/submitqueue/extension/speculation/generator/bestfirst/BUILD.bazel @@ -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", ], ) @@ -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", ], diff --git a/submitqueue/extension/speculation/generator/bestfirst/bestfirst.go b/submitqueue/extension/speculation/generator/bestfirst/bestfirst.go index 7d72999c3..e0e4d45bc 100644 --- a/submitqueue/extension/speculation/generator/bestfirst/bestfirst.go +++ b/submitqueue/extension/speculation/generator/bestfirst/bestfirst.go @@ -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" ) diff --git a/submitqueue/extension/speculation/generator/bestfirst/bestfirst_test.go b/submitqueue/extension/speculation/generator/bestfirst/bestfirst_test.go index 4e3b7c713..7dd2ccdfd 100644 --- a/submitqueue/extension/speculation/generator/bestfirst/bestfirst_test.go +++ b/submitqueue/extension/speculation/generator/bestfirst/bestfirst_test.go @@ -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" ) diff --git a/submitqueue/extension/scorer/BUILD.bazel b/submitqueue/extension/speculation/scorer/BUILD.bazel similarity index 91% rename from submitqueue/extension/scorer/BUILD.bazel rename to submitqueue/extension/speculation/scorer/BUILD.bazel index 16053686c..72a500413 100644 --- a/submitqueue/extension/scorer/BUILD.bazel +++ b/submitqueue/extension/speculation/scorer/BUILD.bazel @@ -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"], ) diff --git a/submitqueue/extension/scorer/README.md b/submitqueue/extension/speculation/scorer/README.md similarity index 100% rename from submitqueue/extension/scorer/README.md rename to submitqueue/extension/speculation/scorer/README.md diff --git a/submitqueue/extension/scorer/composite/BUILD.bazel b/submitqueue/extension/speculation/scorer/composite/BUILD.bazel similarity index 81% rename from submitqueue/extension/scorer/composite/BUILD.bazel rename to submitqueue/extension/speculation/scorer/composite/BUILD.bazel index d854d6023..2286d51b3 100644 --- a/submitqueue/extension/scorer/composite/BUILD.bazel +++ b/submitqueue/extension/speculation/scorer/composite/BUILD.bazel @@ -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", ], ) @@ -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", diff --git a/submitqueue/extension/scorer/composite/scorer.go b/submitqueue/extension/speculation/scorer/composite/scorer.go similarity index 97% rename from submitqueue/extension/scorer/composite/scorer.go rename to submitqueue/extension/speculation/scorer/composite/scorer.go index 02ca5c6fd..92ef31fb3 100644 --- a/submitqueue/extension/scorer/composite/scorer.go +++ b/submitqueue/extension/speculation/scorer/composite/scorer.go @@ -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. diff --git a/submitqueue/extension/scorer/composite/scorer_test.go b/submitqueue/extension/speculation/scorer/composite/scorer_test.go similarity index 98% rename from submitqueue/extension/scorer/composite/scorer_test.go rename to submitqueue/extension/speculation/scorer/composite/scorer_test.go index 879e057ec..f210fcd55 100644 --- a/submitqueue/extension/scorer/composite/scorer_test.go +++ b/submitqueue/extension/speculation/scorer/composite/scorer_test.go @@ -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. diff --git a/submitqueue/extension/scorer/fake/BUILD.bazel b/submitqueue/extension/speculation/scorer/fake/BUILD.bazel similarity index 77% rename from submitqueue/extension/scorer/fake/BUILD.bazel rename to submitqueue/extension/speculation/scorer/fake/BUILD.bazel index 2d6635e7d..288d0623e 100644 --- a/submitqueue/extension/scorer/fake/BUILD.bazel +++ b/submitqueue/extension/speculation/scorer/fake/BUILD.bazel @@ -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", ], ) @@ -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", diff --git a/submitqueue/extension/scorer/fake/fake.go b/submitqueue/extension/speculation/scorer/fake/fake.go similarity index 97% rename from submitqueue/extension/scorer/fake/fake.go rename to submitqueue/extension/speculation/scorer/fake/fake.go index cb698d2a1..61168cf27 100644 --- a/submitqueue/extension/scorer/fake/fake.go +++ b/submitqueue/extension/speculation/scorer/fake/fake.go @@ -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. diff --git a/submitqueue/extension/scorer/fake/fake_test.go b/submitqueue/extension/speculation/scorer/fake/fake_test.go similarity index 94% rename from submitqueue/extension/scorer/fake/fake_test.go rename to submitqueue/extension/speculation/scorer/fake/fake_test.go index 418919514..a4f94607f 100644 --- a/submitqueue/extension/scorer/fake/fake_test.go +++ b/submitqueue/extension/speculation/scorer/fake/fake_test.go @@ -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. diff --git a/submitqueue/extension/scorer/heuristic/BUILD.bazel b/submitqueue/extension/speculation/scorer/heuristic/BUILD.bazel similarity index 83% rename from submitqueue/extension/scorer/heuristic/BUILD.bazel rename to submitqueue/extension/speculation/scorer/heuristic/BUILD.bazel index ff5f9e29b..7af1b7ab2 100644 --- a/submitqueue/extension/scorer/heuristic/BUILD.bazel +++ b/submitqueue/extension/speculation/scorer/heuristic/BUILD.bazel @@ -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", ], ) @@ -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", diff --git a/submitqueue/extension/scorer/heuristic/scorer.go b/submitqueue/extension/speculation/scorer/heuristic/scorer.go similarity index 97% rename from submitqueue/extension/scorer/heuristic/scorer.go rename to submitqueue/extension/speculation/scorer/heuristic/scorer.go index d12ba686a..55de3fde0 100644 --- a/submitqueue/extension/scorer/heuristic/scorer.go +++ b/submitqueue/extension/speculation/scorer/heuristic/scorer.go @@ -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. diff --git a/submitqueue/extension/scorer/heuristic/scorer_test.go b/submitqueue/extension/speculation/scorer/heuristic/scorer_test.go similarity index 98% rename from submitqueue/extension/scorer/heuristic/scorer_test.go rename to submitqueue/extension/speculation/scorer/heuristic/scorer_test.go index d0b600f02..3274fadec 100644 --- a/submitqueue/extension/scorer/heuristic/scorer_test.go +++ b/submitqueue/extension/speculation/scorer/heuristic/scorer_test.go @@ -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. diff --git a/submitqueue/extension/scorer/mock/BUILD.bazel b/submitqueue/extension/speculation/scorer/mock/BUILD.bazel similarity index 77% rename from submitqueue/extension/scorer/mock/BUILD.bazel rename to submitqueue/extension/speculation/scorer/mock/BUILD.bazel index b4942b452..f9a46ac18 100644 --- a/submitqueue/extension/scorer/mock/BUILD.bazel +++ b/submitqueue/extension/speculation/scorer/mock/BUILD.bazel @@ -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", ], ) diff --git a/submitqueue/extension/scorer/mock/scorer_mock.go b/submitqueue/extension/speculation/scorer/mock/scorer_mock.go similarity index 97% rename from submitqueue/extension/scorer/mock/scorer_mock.go rename to submitqueue/extension/speculation/scorer/mock/scorer_mock.go index 9b64b7547..af42e8267 100644 --- a/submitqueue/extension/scorer/mock/scorer_mock.go +++ b/submitqueue/extension/speculation/scorer/mock/scorer_mock.go @@ -14,7 +14,7 @@ import ( reflect "reflect" entity "github.com/uber/submitqueue/submitqueue/entity" - scorer "github.com/uber/submitqueue/submitqueue/extension/scorer" + scorer "github.com/uber/submitqueue/submitqueue/extension/speculation/scorer" gomock "go.uber.org/mock/gomock" ) diff --git a/submitqueue/extension/scorer/scorer.go b/submitqueue/extension/speculation/scorer/scorer.go similarity index 100% rename from submitqueue/extension/scorer/scorer.go rename to submitqueue/extension/speculation/scorer/scorer.go