Skip to content

Commit beeb08c

Browse files
andrewmcgiveryandrewmcgivery
committed
Merge remote-tracking branch 'origin/dev' into feature/connectorsheadersvariable3
2 parents 4123a31 + 30edad1 commit beeb08c

File tree

8 files changed

+232
-214
lines changed

8 files changed

+232
-214
lines changed

‎Cargo.lock

Lines changed: 34 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ dependencies = [
169169
"ahash",
170170
"apollo-parser",
171171
"ariadne",
172-
"indexmap 2.7.1",
172+
"indexmap 2.9.0",
173173
"rowan",
174174
"serde",
175175
"serde_json_bytes",
@@ -201,7 +201,7 @@ dependencies = [
201201
"hashbrown 0.15.2",
202202
"hex",
203203
"http 1.3.1",
204-
"indexmap 2.7.1",
204+
"indexmap 2.9.0",
205205
"insta",
206206
"itertools 0.14.0",
207207
"line-col",
@@ -312,7 +312,7 @@ dependencies = [
312312
"hyper-rustls 0.27.5",
313313
"hyper-util",
314314
"hyperlocal",
315-
"indexmap 2.7.1",
315+
"indexmap 2.9.0",
316316
"insta",
317317
"itertools 0.14.0",
318318
"itoa",
@@ -366,7 +366,7 @@ dependencies = [
366366
"rstack",
367367
"rstest",
368368
"rust-embed",
369-
"rustls 0.23.25",
369+
"rustls 0.23.26",
370370
"rustls-native-certs 0.8.1",
371371
"rustls-pemfile 2.2.0",
372372
"ryu",
@@ -447,7 +447,7 @@ dependencies = [
447447
"apollo-compiler",
448448
"apollo-parser",
449449
"arbitrary",
450-
"indexmap 2.7.1",
450+
"indexmap 2.9.0",
451451
"once_cell",
452452
"thiserror 1.0.69",
453453
]
@@ -596,7 +596,7 @@ dependencies = [
596596
"futures-util",
597597
"handlebars",
598598
"http 1.3.1",
599-
"indexmap 2.7.1",
599+
"indexmap 2.9.0",
600600
"mime",
601601
"multer",
602602
"num-traits",
@@ -663,7 +663,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
663663
checksum = "d0cde74de18e3a00c5dd5cfa002ab6f532e1a06c2a79ee6671e2fc353b400b92"
664664
dependencies = [
665665
"bytes",
666-
"indexmap 2.7.1",
666+
"indexmap 2.9.0",
667667
"serde",
668668
"serde_json",
669669
]
@@ -1436,16 +1436,15 @@ dependencies = [
14361436

14371437
[[package]]
14381438
name = "bnf"
1439-
version = "0.4.4"
1439+
version = "0.5.0"
14401440
source = "registry+https://github.com/rust-lang/crates.io-index"
1441-
checksum = "388264829413cc604dc7251a6206b14118855e950dc4f83dc92eb3351a7bece6"
1441+
checksum = "14c09ea5795b3dd735ff47c4b8adf64c46e3ce056fa3c4880b865a352e4c40a2"
14421442
dependencies = [
14431443
"getrandom 0.2.15",
14441444
"nom",
14451445
"rand 0.8.5",
14461446
"serde",
14471447
"serde_json",
1448-
"stacker",
14491448
]
14501449

14511450
[[package]]
@@ -2515,9 +2514,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
25152514

25162515
[[package]]
25172516
name = "flate2"
2518-
version = "1.1.0"
2517+
version = "1.1.1"
25192518
source = "registry+https://github.com/rust-lang/crates.io-index"
2520-
checksum = "11faaf5a5236997af9848be0bef4db95824b1d534ebc64d0f0c6cf3e67bd38dc"
2519+
checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece"
25212520
dependencies = [
25222521
"crc32fast",
25232522
"miniz_oxide",
@@ -2640,7 +2639,7 @@ dependencies = [
26402639
"parking_lot",
26412640
"rand 0.8.5",
26422641
"redis-protocol",
2643-
"rustls 0.23.25",
2642+
"rustls 0.23.26",
26442643
"rustls-native-certs 0.7.3",
26452644
"semver",
26462645
"socket2",
@@ -3004,7 +3003,7 @@ dependencies = [
30043003
"futures-sink",
30053004
"futures-util",
30063005
"http 0.2.12",
3007-
"indexmap 2.7.1",
3006+
"indexmap 2.9.0",
30083007
"slab",
30093008
"tokio",
30103009
"tokio-util",
@@ -3023,7 +3022,7 @@ dependencies = [
30233022
"futures-core",
30243023
"futures-sink",
30253024
"http 1.3.1",
3026-
"indexmap 2.7.1",
3025+
"indexmap 2.9.0",
30273026
"slab",
30283027
"tokio",
30293028
"tokio-util",
@@ -3340,9 +3339,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
33403339

33413340
[[package]]
33423341
name = "humantime"
3343-
version = "2.1.0"
3342+
version = "2.2.0"
33443343
source = "registry+https://github.com/rust-lang/crates.io-index"
3345-
checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
3344+
checksum = "9b112acc8b3adf4b107a8ec20977da0273a8c386765a3ec0229bd500a1443f9f"
33463345

33473346
[[package]]
33483347
name = "humantime-serde"
@@ -3426,7 +3425,7 @@ dependencies = [
34263425
"hyper 1.6.0",
34273426
"hyper-util",
34283427
"log",
3429-
"rustls 0.23.25",
3428+
"rustls 0.23.26",
34303429
"rustls-native-certs 0.8.1",
34313430
"rustls-pki-types",
34323431
"tokio",
@@ -3662,9 +3661,9 @@ dependencies = [
36623661

36633662
[[package]]
36643663
name = "indexmap"
3665-
version = "2.7.1"
3664+
version = "2.9.0"
36663665
source = "registry+https://github.com/rust-lang/crates.io-index"
3667-
checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
3666+
checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
36683667
dependencies = [
36693668
"equivalent",
36703669
"hashbrown 0.15.2",
@@ -4559,7 +4558,7 @@ dependencies = [
45594558
"ahash",
45604559
"futures-core",
45614560
"http 1.3.1",
4562-
"indexmap 2.7.1",
4561+
"indexmap 2.9.0",
45634562
"itertools 0.11.0",
45644563
"itoa",
45654564
"once_cell",
@@ -4892,7 +4891,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
48924891
checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
48934892
dependencies = [
48944893
"fixedbitset",
4895-
"indexmap 2.7.1",
4894+
"indexmap 2.9.0",
48964895
"serde",
48974896
"serde_derive",
48984897
]
@@ -5227,15 +5226,6 @@ version = "2.28.0"
52275226
source = "registry+https://github.com/rust-lang/crates.io-index"
52285227
checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94"
52295228

5230-
[[package]]
5231-
name = "psm"
5232-
version = "0.1.24"
5233-
source = "registry+https://github.com/rust-lang/crates.io-index"
5234-
checksum = "200b9ff220857e53e184257720a14553b2f4aa02577d2ed9842d45d4b9654810"
5235-
dependencies = [
5236-
"cc",
5237-
]
5238-
52395229
[[package]]
52405230
name = "quick-error"
52415231
version = "1.2.3"
@@ -5253,7 +5243,7 @@ dependencies = [
52535243
"quinn-proto",
52545244
"quinn-udp",
52555245
"rustc-hash 2.1.0",
5256-
"rustls 0.23.25",
5246+
"rustls 0.23.26",
52575247
"socket2",
52585248
"thiserror 2.0.10",
52595249
"tokio",
@@ -5271,7 +5261,7 @@ dependencies = [
52715261
"rand 0.8.5",
52725262
"ring",
52735263
"rustc-hash 2.1.0",
5274-
"rustls 0.23.25",
5264+
"rustls 0.23.26",
52755265
"rustls-pki-types",
52765266
"slab",
52775267
"thiserror 2.0.10",
@@ -5586,7 +5576,7 @@ dependencies = [
55865576
"percent-encoding",
55875577
"pin-project-lite",
55885578
"quinn",
5589-
"rustls 0.23.25",
5579+
"rustls 0.23.26",
55905580
"rustls-native-certs 0.8.1",
55915581
"rustls-pemfile 2.2.0",
55925582
"rustls-pki-types",
@@ -5942,9 +5932,9 @@ dependencies = [
59425932

59435933
[[package]]
59445934
name = "rustls"
5945-
version = "0.23.25"
5935+
version = "0.23.26"
59465936
source = "registry+https://github.com/rust-lang/crates.io-index"
5947-
checksum = "822ee9188ac4ec04a2f0531e55d035fb2de73f18b41a63c70c2712503b6fb13c"
5937+
checksum = "df51b5869f3a441595eac5e8ff14d486ff285f7b8c0df8770e49c3b56351f0f0"
59485938
dependencies = [
59495939
"aws-lc-rs",
59505940
"log",
@@ -6218,7 +6208,7 @@ version = "1.0.140"
62186208
source = "registry+https://github.com/rust-lang/crates.io-index"
62196209
checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
62206210
dependencies = [
6221-
"indexmap 2.7.1",
6211+
"indexmap 2.9.0",
62226212
"itoa",
62236213
"memchr",
62246214
"ryu",
@@ -6233,7 +6223,7 @@ checksum = "a6a27c10711f94d1042b4c96d483556ec84371864e25d0e1cf3dc1024b0880b1"
62336223
dependencies = [
62346224
"ahash",
62356225
"bytes",
6236-
"indexmap 2.7.1",
6226+
"indexmap 2.9.0",
62376227
"jsonpath-rust",
62386228
"regex",
62396229
"serde",
@@ -6324,7 +6314,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
63246314
checksum = "27e114fc498dd1dcc20b12a9571a7b9b78396760e44b7a9024afa3a04ce26763"
63256315
dependencies = [
63266316
"apollo-compiler",
6327-
"indexmap 2.7.1",
6317+
"indexmap 2.9.0",
63286318
"serde_json",
63296319
"serde_json_bytes",
63306320
]
@@ -6464,19 +6454,6 @@ version = "1.2.0"
64646454
source = "registry+https://github.com/rust-lang/crates.io-index"
64656455
checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
64666456

6467-
[[package]]
6468-
name = "stacker"
6469-
version = "0.1.18"
6470-
source = "registry+https://github.com/rust-lang/crates.io-index"
6471-
checksum = "1d08feb8f695b465baed819b03c128dc23f57a694510ab1f06c77f763975685e"
6472-
dependencies = [
6473-
"cc",
6474-
"cfg-if",
6475-
"libc",
6476-
"psm",
6477-
"windows-sys 0.59.0",
6478-
]
6479-
64806457
[[package]]
64816458
name = "static_assertions"
64826459
version = "1.1.0"
@@ -6923,7 +6900,7 @@ version = "0.26.2"
69236900
source = "registry+https://github.com/rust-lang/crates.io-index"
69246901
checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
69256902
dependencies = [
6926-
"rustls 0.23.25",
6903+
"rustls 0.23.26",
69276904
"tokio",
69286905
]
69296906

@@ -6960,7 +6937,7 @@ checksum = "7a9daff607c6d2bf6c16fd681ccb7eecc83e4e2cdc1ca067ffaadfca5de7f084"
69606937
dependencies = [
69616938
"futures-util",
69626939
"log",
6963-
"rustls 0.23.25",
6940+
"rustls 0.23.26",
69646941
"rustls-native-certs 0.8.1",
69656942
"rustls-pki-types",
69666943
"tokio",
@@ -6995,7 +6972,7 @@ version = "0.22.22"
69956972
source = "registry+https://github.com/rust-lang/crates.io-index"
69966973
checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
69976974
dependencies = [
6998-
"indexmap 2.7.1",
6975+
"indexmap 2.9.0",
69996976
"toml_datetime",
70006977
"winnow",
70016978
]
@@ -7098,7 +7075,7 @@ dependencies = [
70987075
"futures-core",
70997076
"futures-util",
71007077
"hdrhistogram",
7101-
"indexmap 2.7.1",
7078+
"indexmap 2.9.0",
71027079
"pin-project-lite",
71037080
"slab",
71047081
"sync_wrapper 1.0.2",
@@ -7350,7 +7327,7 @@ dependencies = [
73507327
"httparse",
73517328
"log",
73527329
"rand 0.9.0",
7353-
"rustls 0.23.25",
7330+
"rustls 0.23.26",
73547331
"rustls-pki-types",
73557332
"sha1",
73567333
"thiserror 2.0.10",

‎apollo-federation/src/query_graph/graph_path.rs

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3975,19 +3975,10 @@ impl SimultaneousPathsWithLazyIndirectPaths {
39753975
/// For a given "input" path (identified by an idx in `paths`), each of its indirect options.
39763976
fn indirect_options(
39773977
&mut self,
3978-
updated_context: &OpGraphPathContext,
39793978
path_index: usize,
39803979
condition_resolver: &mut impl ConditionResolver,
39813980
override_conditions: &EnabledOverrideConditions,
39823981
) -> Result<OpIndirectPaths, FederationError> {
3983-
// Note that the provided context will usually be one we had during construction (the
3984-
// `updated_context` will be `self.context` updated by whichever operation we're looking at,
3985-
// but only operation elements with a @skip/@include will change the context so it's pretty
3986-
// rare), which is why we save recomputation by caching the computed value in that case, but
3987-
// in case it's different, we compute without caching.
3988-
if *updated_context != self.context {
3989-
self.compute_indirect_paths(path_index, condition_resolver, override_conditions)?;
3990-
}
39913982
if let Some(indirect_paths) = &self.lazily_computed_indirect_paths[path_index] {
39923983
Ok(indirect_paths.clone())
39933984
} else {
@@ -4134,12 +4125,7 @@ impl SimultaneousPathsWithLazyIndirectPaths {
41344125
if let OpPathElement::Field(operation_field) = operation_element {
41354126
// Add whatever options can be obtained by taking some non-collecting edges first.
41364127
let paths_with_non_collecting_edges = self
4137-
.indirect_options(
4138-
&updated_context,
4139-
path_index,
4140-
condition_resolver,
4141-
override_conditions,
4142-
)?
4128+
.indirect_options(path_index, condition_resolver, override_conditions)?
41434129
.filter_non_collecting_paths_for_field(operation_field)?;
41444130
if !paths_with_non_collecting_edges.paths.is_empty() {
41454131
debug!(
@@ -4292,12 +4278,8 @@ pub(crate) fn create_initial_options(
42924278
);
42934279

42944280
if initial_type.is_federated_root_type() {
4295-
let initial_options = lazy_initial_path.indirect_options(
4296-
&initial_context,
4297-
0,
4298-
condition_resolver,
4299-
override_conditions,
4300-
)?;
4281+
let initial_options =
4282+
lazy_initial_path.indirect_options(0, condition_resolver, override_conditions)?;
43014283
let options = initial_options
43024284
.paths
43034285
.iter()

0 commit comments

Comments
 (0)