Skip to content
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.

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

fix: propagate evaluated plans limit and paths limit to the native query planner #6316

Merged
merged 7 commits into from
Dec 2, 2024

Conversation

goto-bus-stop
Copy link
Member

@goto-bus-stop goto-bus-stop commented Nov 21, 2024

The experimental max_evaluated_plans and paths_limit options were only propagated to the legacy JS planner, not the native query planner.

Now they work with both planners.

Adds integration tests for the apollo.router.query_planning.plan.evaluated_plans metric, with and without max_evaluated_plans set, with the legacy and the native query planners.


Checklist

Complete the checklist (and note appropriate exceptions) before the PR is marked ready-for-review.

  • Changes are compatible1
  • Documentation2 completed
  • Performance impact assessed and acceptable
  • Tests added and passing3
    • Unit Tests
    • Integration Tests
    • Manual Tests

Exceptions

Note any exceptions here

Notes

Footnotes

  1. It may be appropriate to bring upcoming changes to the attention of other (impacted) groups. Please endeavour to do this before seeking PR approval. The mechanism for doing this will vary considerably, so use your judgement as to how and when to do this.

  2. Configuration is an important part of many changes. Where applicable please try to document configuration examples.

  3. Tick whichever testing boxes are applicable. If you are adding Manual Tests, please document the manual testing (extensively) in the Exceptions.

@svc-apollo-docs
Copy link
Collaborator

svc-apollo-docs commented Nov 21, 2024

✅ Docs Preview Ready

No new or changed pages found.

This comment has been minimized.

@router-perf
Copy link

router-perf bot commented Nov 21, 2024

CI performance tests

  • connectors-const - Connectors stress test that runs with a constant number of users
  • const - Basic stress test that runs with a constant number of users
  • demand-control-instrumented - A copy of the step test, but with demand control monitoring and metrics enabled
  • demand-control-uninstrumented - A copy of the step test, but with demand control monitoring enabled
  • enhanced-signature - Enhanced signature enabled
  • events - Stress test for events with a lot of users and deduplication ENABLED
  • events_big_cap_high_rate - Stress test for events with a lot of users, deduplication enabled and high rate event with a big queue capacity
  • events_big_cap_high_rate_callback - Stress test for events with a lot of users, deduplication enabled and high rate event with a big queue capacity using callback mode
  • events_callback - Stress test for events with a lot of users and deduplication ENABLED in callback mode
  • events_without_dedup - Stress test for events with a lot of users and deduplication DISABLED
  • events_without_dedup_callback - Stress test for events with a lot of users and deduplication DISABLED using callback mode
  • extended-reference-mode - Extended reference mode enabled
  • large-request - Stress test with a 1 MB request payload
  • no-tracing - Basic stress test, no tracing
  • reload - Reload test over a long period of time at a constant rate of users
  • step-jemalloc-tuning - Clone of the basic stress test for jemalloc tuning
  • step-local-metrics - Field stats that are generated from the router rather than FTV1
  • step-with-prometheus - A copy of the step test with the Prometheus metrics exporter enabled
  • step - Basic stress test that steps up the number of users over time
  • xlarge-request - Stress test with 10 MB request payload
  • xxlarge-request - Stress test with 100 MB request payload

@goto-bus-stop

This comment was marked as resolved.

@lrlna
Copy link
Member

lrlna commented Nov 29, 2024

@goto-bus-stop are you continuing this work still? is it just missing an integration test you wanted to do?

Wait. Why are there two QP configurations?

Looks like we are not using the rust_query_planner_config at all, or at least not in the same way we are using the neighbouring js_query_planner_config function. Probably something got lost along the way.

@goto-bus-stop goto-bus-stop force-pushed the renee/max-evaluated-plans-rs branch from 2831314 to d25d5e1 Compare November 29, 2024 11:02
@goto-bus-stop
Copy link
Member Author

rust_query_planner_config is used for a cache key. so it's important that we have only one source of truth for actual QP & the cache key.

the main thing this needs is a test indeed.

@goto-bus-stop goto-bus-stop marked this pull request as ready for review November 29, 2024 15:23
@goto-bus-stop goto-bus-stop requested review from a team as code owners November 29, 2024 15:23
lrlna
lrlna previously approved these changes Nov 29, 2024
…ery planner

The experimental `max_evaluated_plans` and `paths_limit` options were
only propagated to the legacy JS planner, not the native query planner.

Now they work with both planners.
@goto-bus-stop goto-bus-stop force-pushed the renee/max-evaluated-plans-rs branch from c02ea79 to 54ff4bd Compare November 29, 2024 16:22
@goto-bus-stop goto-bus-stop changed the base branch from dev to 1.58.1 November 29, 2024 16:22
@goto-bus-stop goto-bus-stop dismissed lrlna’s stale review November 29, 2024 16:22

The base branch was changed.

lrlna
lrlna previously approved these changes Nov 29, 2024
@goto-bus-stop goto-bus-stop enabled auto-merge (squash) November 29, 2024 16:30
@goto-bus-stop goto-bus-stop merged commit e05c27c into 1.58.1 Dec 2, 2024
12 checks passed
@goto-bus-stop goto-bus-stop deleted the renee/max-evaluated-plans-rs branch December 2, 2024 16:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants