Skip to content

Revert some IndexMap/Set changes that break --release builds for x86 #5847

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
dylan-apollo merged 2 commits into from
Aug 19, 2024
Merged

Revert some IndexMap/Set changes that break --release builds for x86 #5847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a9326f
Revert some IndexMap/Set changes that break `--release` builds for x86
dylan-apollo Aug 19, 2024
6cb1373
Reduce indexmap diff
dylan-apollo Aug 19, 2024
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
6 changes: 3 additions & 3 deletions apollo-federation/src/link/cost_spec_definition.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use apollo_compiler::ast::Argument;
use apollo_compiler::ast::Directive;
use apollo_compiler::collections::IndexMap;
use apollo_compiler::collections::HashMap;
use apollo_compiler::name;
use apollo_compiler::schema::Component;
use apollo_compiler::schema::EnumType;
Expand Down Expand Up @@ -40,7 +40,7 @@ macro_rules! propagate_demand_control_directives {
subgraph_schema: &FederationSchema,
source: &$directives_ty,
dest: &mut $directives_ty,
original_directive_names: &IndexMap<Name, Name>,
original_directive_names: &HashMap<Name, Name>,
) -> Result<(), FederationError> {
let cost_directive_name = original_directive_names.get(&COST_DIRECTIVE_NAME_IN_SPEC);
let cost_directive = cost_directive_name.and_then(|name| source.get(name.as_str()));
Expand Down Expand Up @@ -74,7 +74,7 @@ macro_rules! propagate_demand_control_directives_to_position {
subgraph_schema: &mut FederationSchema,
source: &Node<$source_ty>,
dest: &$dest_ty,
original_directive_names: &IndexMap<Name, Name>,
original_directive_names: &HashMap<Name, Name>,
) -> Result<(), FederationError> {
let cost_directive_name = original_directive_names.get(&COST_DIRECTIVE_NAME_IN_SPEC);
let cost_directive =
Expand Down
19 changes: 10 additions & 9 deletions apollo-federation/src/query_graph/extract_subgraphs_from_supergraph.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use std::sync::Arc;
use apollo_compiler::ast::Argument;
use apollo_compiler::ast::Directive;
use apollo_compiler::ast::FieldDefinition;
use apollo_compiler::collections::HashMap;
use apollo_compiler::collections::IndexMap;
use apollo_compiler::collections::IndexSet;
use apollo_compiler::executable;
Expand Down Expand Up @@ -329,8 +330,8 @@ struct TypeInfos {
/// when a custom directive's name conflicts with that of a default one.
fn get_apollo_directive_names(
supergraph_schema: &FederationSchema,
) -> Result<IndexMap<Name, Name>, FederationError> {
let mut hm: IndexMap<Name, Name> = IndexMap::default();
) -> Result<HashMap<Name, Name>, FederationError> {
let mut hm: HashMap<Name, Name> = HashMap::default();
for directive in &supergraph_schema.schema().schema_definition.directives {
if directive.name.as_str() == "link" {
if let Ok(link) = Link::from_directive_application(directive) {
Expand Down Expand Up @@ -489,7 +490,7 @@ fn add_all_empty_subgraph_types(
federation_spec_definitions: &IndexMap<Name, &'static FederationSpecDefinition>,
join_spec_definition: &'static JoinSpecDefinition,
filtered_types: &Vec<TypeDefinitionPosition>,
original_directive_names: &IndexMap<Name, Name>,
original_directive_names: &HashMap<Name, Name>,
) -> Result<TypeInfos, FederationError> {
let type_directive_definition =
join_spec_definition.type_directive_definition(supergraph_schema)?;
Expand Down Expand Up @@ -791,7 +792,7 @@ fn extract_object_type_content(
federation_spec_definitions: &IndexMap<Name, &'static FederationSpecDefinition>,
join_spec_definition: &JoinSpecDefinition,
info: &[TypeInfo],
original_directive_names: &IndexMap<Name, Name>,
original_directive_names: &HashMap<Name, Name>,
) -> Result<(), FederationError> {
let field_directive_definition =
join_spec_definition.field_directive_definition(supergraph_schema)?;
Expand Down Expand Up @@ -967,7 +968,7 @@ fn extract_interface_type_content(
federation_spec_definitions: &IndexMap<Name, &'static FederationSpecDefinition>,
join_spec_definition: &JoinSpecDefinition,
info: &[TypeInfo],
original_directive_names: &IndexMap<Name, Name>,
original_directive_names: &HashMap<Name, Name>,
) -> Result<(), FederationError> {
let field_directive_definition =
join_spec_definition.field_directive_definition(supergraph_schema)?;
Expand Down Expand Up @@ -1255,7 +1256,7 @@ fn extract_enum_type_content(
federation_spec_definitions: &IndexMap<Name, &'static FederationSpecDefinition>,
join_spec_definition: &JoinSpecDefinition,
info: &[TypeInfo],
original_directive_names: &IndexMap<Name, Name>,
original_directive_names: &HashMap<Name, Name>,
) -> Result<(), FederationError> {
// This was added in join 0.3, so it can genuinely be None.
let enum_value_directive_definition =
Expand Down Expand Up @@ -1364,7 +1365,7 @@ fn extract_input_object_type_content(
federation_spec_definitions: &IndexMap<Name, &'static FederationSpecDefinition>,
join_spec_definition: &JoinSpecDefinition,
info: &[TypeInfo],
original_directive_names: &IndexMap<Name, Name>,
original_directive_names: &HashMap<Name, Name>,
) -> Result<(), FederationError> {
let field_directive_definition =
join_spec_definition.field_directive_definition(supergraph_schema)?;
Expand Down Expand Up @@ -1471,7 +1472,7 @@ fn add_subgraph_field(
is_shareable: bool,
field_directive_application: Option<&FieldDirectiveArguments>,
cost_spec_definition: Option<&'static CostSpecDefinition>,
original_directive_names: &IndexMap<Name, Name>,
original_directive_names: &HashMap<Name, Name>,
) -> Result<(), FederationError> {
let field_directive_application =
field_directive_application.unwrap_or_else(|| &FieldDirectiveArguments {
Expand Down Expand Up @@ -1586,7 +1587,7 @@ fn add_subgraph_input_field(
subgraph: &mut FederationSubgraph,
field_directive_application: Option<&FieldDirectiveArguments>,
cost_spec_definition: Option<&'static CostSpecDefinition>,
original_directive_names: &IndexMap<Name, Name>,
original_directive_names: &HashMap<Name, Name>,
) -> Result<(), FederationError> {
let field_directive_application =
field_directive_application.unwrap_or_else(|| &FieldDirectiveArguments {
Expand Down