Skip to content

fix: refactor CoordinateDependencies, FetchReasons #1293

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
ysmolski merged 8 commits into from
Sep 9, 2025
Merged

fix: refactor CoordinateDependencies, FetchReasons #1293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
51ede51
chore: refactor CoordinateDependencies and FetchReasons
ysmolski Sep 8, 2025
517e2df
address comments, part 1
ysmolski Sep 8, 2025
fe0d374
remove DataSourceInfo()
ysmolski Sep 8, 2025
b13292b
fix lint issues
ysmolski Sep 9, 2025
e8b0e9d
comment the FetchInfo()
ysmolski Sep 9, 2025
73bb2da
add compile-time assert and fix comments
ysmolski Sep 9, 2025
5cc37be
add comments and early return
ysmolski Sep 9, 2025
4c2d0aa
relax the if condition
ysmolski Sep 9, 2025
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
5 changes: 3 additions & 2 deletions execution/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,13 @@ test-quick:
update-fixtures:
GOLDIE_UPDATE=1 go test -count=1 ./engine/...

# golangci-lint will find the config file in the root dir of the repo.
.PHONY: format
format:
golangci-lint fmt --config ../.golangci.yml
golangci-lint fmt
Comment thread
devsergiy marked this conversation as resolved.
Comment thread
devsergiy marked this conversation as resolved.

lint:
golangci-lint run --config ../.golangci.yml .
golangci-lint run

.PHONY: prepare-merge
prepare-merge: format test
Expand Down
17 changes: 10 additions & 7 deletions execution/engine/execution_engine_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,12 @@ func withValueCompletion() executionTestOptions {
}
}

func withFetchReasons() executionTestOptions {
return func(options *_executionTestOptions) {
options.propagateFetchReasons = true
}
}

func TestExecutionEngine_Execute(t *testing.T) {
run := func(testCase ExecutionEngineTestCase, withError bool, expectedErrorMessage string, options ...executionTestOptions) func(t *testing.T) {
t.Helper()
Expand Down Expand Up @@ -262,6 +268,7 @@ func TestExecutionEngine_Execute(t *testing.T) {
for _, option := range options {
option(&opts)
}
engineConf.plannerConfig.BuildFetchReasons = opts.propagateFetchReasons
engine, err := NewExecutionEngine(ctx, abstractlogger.Noop{}, engineConf, resolve.ResolverOptions{
MaxConcurrency: 1024,
ResolvableOptions: opts.resolvableOptions,
Expand Down Expand Up @@ -827,7 +834,7 @@ func TestExecutionEngine_Execute(t *testing.T) {
},
))

t.Run("execute simple hero operation with propagating to subgraphs reason for fields being requested", runWithoutError(
t.Run("execute simple hero operation with propagating to subgraphs fetch reasons", runWithoutError(
ExecutionEngineTestCase{
schema: graphql.StarwarsSchema(t),
operation: graphql.LoadStarWarsQuery(starwars.FileSimpleHeroQuery, nil),
Expand Down Expand Up @@ -875,9 +882,7 @@ func TestExecutionEngine_Execute(t *testing.T) {
fields: []plan.FieldConfiguration{},
expectedResponse: `{"data":{"hero":{"name":"Luke Skywalker"}}}`,
},
func(eto *_executionTestOptions) {
eto.propagateFetchReasons = true
},
withFetchReasons(),
))

t.Run("execute simple hero operation with graphql data source and empty errors list", runWithoutError(
Expand Down Expand Up @@ -4539,9 +4544,7 @@ func TestExecutionEngine_Execute(t *testing.T) {
dataSources: makeDataSource(t, true),
expectedResponse: `{"data":{"accounts":[{"some":{"title":"User1"}},{"some":{"__typename":"User","id":"2"}},{"some":{"title":"User3"}}]}}`,
},
func(eto *_executionTestOptions) {
eto.propagateFetchReasons = true
},
withFetchReasons(),
))
})
}
Expand Down
2 changes: 1 addition & 1 deletion go.work
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
go 1.25

toolchain go1.25
toolchain go1.25.1

use (
// v1
Expand Down
5 changes: 3 additions & 2 deletions v2/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,14 @@ test-quick:
update-fixtures:
GOLDIE_UPDATE=1 go test -count=1 ./pkg/...

# golangci-lint will find the config file in the root dir of the repo.
.PHONY: format
format:
golangci-lint fmt --config ../.golangci.yml
golangci-lint fmt
Comment thread
devsergiy marked this conversation as resolved.

.PHONY: lint
lint:
golangci-lint run --config ../.golangci.yml .
golangci-lint run
cd ../execution && make lint

.PHONY: prepare-merge
Expand Down
Loading
Loading