Rename build_schema_with_extensions to build_schema_with_extensions_parallel

Reviewed By: ginfung

Differential Revision: D97312038

fbshipit-source-id: 5c5e3ae2c46cec473544fade02852097e1144f28

Author: Ben Golub

compiler/crates/graphql-ir-diff/src/lib.rs

@@ -837,7 +837,7 @@ pub fn load_schema(schema_paths: Vec<String>) -> Result<Arc<SDLSchema>> {
         })
         .collect();
 
-    // Convert to (content, SourceLocationKey) tuples for build_schema_with_extensions
+    // Convert to (content, SourceLocationKey) tuples for build_schema_with_extensions_parallel
     let schema_sdls: Vec<(String, SourceLocationKey)> = schema_files
         .into_iter()
         .map(|(content, file_path)| {
@@ -846,7 +846,7 @@ pub fn load_schema(schema_paths: Vec<String>) -> Result<Arc<SDLSchema>> {
         })
         .collect();
 
-    let schema = schema::build_schema_with_extensions::<_, &str>(
+    let schema = schema::build_schema_with_extensions_parallel::<_, &str>(
         &schema_sdls
             .iter()
             .map(|(content, key)| (content.as_str(), *key))

compiler/crates/relay-compiler-playground/src/lib.rs

@@ -20,7 +20,7 @@ use relay_codegen::print_fragment;
 use relay_codegen::print_operation;
 use relay_codegen::print_provided_variables;
 use relay_config::ProjectConfig;
-use relay_schema::build_schema_with_extensions;
+use relay_schema::build_schema_with_extensions_parallel;
 use relay_transforms::Programs;
 use relay_transforms::apply_transforms;
 use relay_typegen::FragmentLocations;
@@ -93,7 +93,7 @@ pub fn parse_to_ir_impl(schema_text: &str, document_text: &str) -> PlaygroundRes
         .map_err(|diagnostics| map_diagnostics(diagnostics, &InputType::Document(document_text)))?;
 
     let schema = Arc::new(
-        build_schema_with_extensions(
+        build_schema_with_extensions_parallel(
             &[(schema_text, SourceLocationKey::generated())],
             &Vec::<(&str, SourceLocationKey)>::new(),
         )
@@ -129,7 +129,7 @@ pub fn parse_to_reader_ast_impl(
     document_text: &str,
 ) -> PlaygroundResult {
     let schema = Arc::new(
-        build_schema_with_extensions(
+        build_schema_with_extensions_parallel(
             &[(schema_text, SourceLocationKey::Generated)],
             &Vec::<(&str, SourceLocationKey)>::new(),
         )
@@ -176,7 +176,7 @@ pub fn parse_to_normalization_ast_impl(
     document_text: &str,
 ) -> PlaygroundResult {
     let schema = Arc::new(
-        build_schema_with_extensions(
+        build_schema_with_extensions_parallel(
             &[(schema_text, SourceLocationKey::Generated)],
             &Vec::<(&str, SourceLocationKey)>::new(),
         )
@@ -222,7 +222,7 @@ pub fn parse_to_types_impl(
     document_text: &str,
 ) -> PlaygroundResult {
     let schema = Arc::new(
-        build_schema_with_extensions(
+        build_schema_with_extensions_parallel(
             &[(schema_text, SourceLocationKey::Generated)],
             &Vec::<(&str, SourceLocationKey)>::new(),
         )
@@ -279,7 +279,7 @@ fn transform_impl(
     document_text: &str,
 ) -> PlaygroundResult {
     let schema = Arc::new(
-        build_schema_with_extensions(
+        build_schema_with_extensions_parallel(
             &[(schema_text, SourceLocationKey::Generated)],
             &Vec::<(&str, SourceLocationKey)>::new(),
         )

compiler/crates/relay-compiler/src/build_project/build_schema.rs

@@ -18,7 +18,7 @@ use relay_docblock::extend_schema_with_resolver_type_system_definition;
 use relay_docblock::validate_resolver_schema;
 use schema::SDLSchema;
 use schema::SchemaDocuments;
-use schema::parse_schema_with_extensions;
+use schema::parse_schema_with_extensions_parallel;
 use schema_validate_lib::SchemaValidationOptions;
 use schema_validate_lib::validate;
 
@@ -136,7 +136,7 @@ fn build_schema_impl(
         server: server_asts,
         extensions: mut extension_asts,
     } = log_event.time("parse_schema_time", || {
-        parse_schema_with_extensions(&schema_sources, &extensions)
+        parse_schema_with_extensions_parallel(&schema_sources, &extensions)
     })?;
 
     // Collect Relay Resolver schema IR

compiler/crates/relay-compiler/src/compiler_state.rs

@@ -612,7 +612,7 @@ impl CompilerState {
             .map(|(schema, location_key)| (schema.as_str(), location_key))
             .collect::<Vec<_>>();
 
-        relay_schema::build_schema_with_extensions(
+        relay_schema::build_schema_with_extensions_parallel(
             &current_sources_with_location,
             &Vec::<(&str, SourceLocationKey)>::new(),
         )

compiler/crates/relay-schema/src/lib.rs

@@ -37,7 +37,7 @@ lazy_static! {
     pub static ref EXPORT_NAME_CUSTOM_SCALAR_ARGUMENT_NAME: StringKey = intern!("export_name");
 }
 
-pub fn build_schema_with_extensions<
+pub fn build_schema_with_extensions_parallel<
     T: AsRef<str> + std::marker::Sync,
     U: AsRef<str> + std::marker::Sync,
 >(
@@ -53,7 +53,7 @@ pub fn build_schema_with_extensions<
             )
             .collect();
 
-    let mut schema = schema::build_schema_with_extensions(server_sdls, &extensions)?;
+    let mut schema = schema::build_schema_with_extensions_parallel(server_sdls, &extensions)?;
     remove_defer_stream_label(&mut schema);
     Ok(schema)
 }

compiler/crates/relay-test-schema/src/lib.rs

@@ -13,22 +13,22 @@ use std::sync::Arc;
 
 use common::SourceLocationKey;
 use lazy_static::lazy_static;
-use relay_schema::build_schema_with_extensions;
+use relay_schema::build_schema_with_extensions_parallel;
 use schema::SDLSchema;
 
 const TEST_SCHEMA_DATA: &str = include_str!("testschema.graphql");
 const TEST_SCHEMA_WITH_CUSTOM_ID_DATA: &str = include_str!("testschema_with_custom_id.graphql");
 
 lazy_static! {
     pub static ref TEST_SCHEMA: Arc<SDLSchema> = Arc::new(
-        build_schema_with_extensions::<_, &str>(
+        build_schema_with_extensions_parallel::<_, &str>(
             &[(TEST_SCHEMA_DATA, SourceLocationKey::generated())],
             &[]
         )
         .expect("Expected test schema to be valid")
     );
     pub static ref TEST_SCHEMA_WITH_CUSTOM_ID: Arc<SDLSchema> = Arc::new(
-        build_schema_with_extensions::<_, &str>(
+        build_schema_with_extensions_parallel::<_, &str>(
             &[(
                 TEST_SCHEMA_WITH_CUSTOM_ID_DATA,
                 SourceLocationKey::generated()
@@ -52,7 +52,7 @@ pub fn get_test_schema_with_located_extensions(
     source_location: SourceLocationKey,
 ) -> Arc<SDLSchema> {
     Arc::new(
-        build_schema_with_extensions(
+        build_schema_with_extensions_parallel(
             &[(TEST_SCHEMA_DATA, SourceLocationKey::generated())],
             &[(extensions_sdl, source_location)],
         )
@@ -66,7 +66,7 @@ pub fn get_test_schema_with_custom_id() -> Arc<SDLSchema> {
 
 pub fn get_test_schema_with_custom_id_with_extensions(extensions_sdl: &str) -> Arc<SDLSchema> {
     Arc::new(
-        build_schema_with_extensions(
+        build_schema_with_extensions_parallel(
             &[(
                 TEST_SCHEMA_WITH_CUSTOM_ID_DATA,
                 SourceLocationKey::generated(),

compiler/crates/schema-validate/src/main.rs

@@ -15,7 +15,7 @@ use common::TextSource;
 use graphql_cli::DiagnosticPrinter;
 use intern::intern::Lookup;
 use schema::SDLSchema;
-use schema::build_schema_with_extensions;
+use schema::build_schema_with_extensions_parallel;
 use schema_validate_lib::SchemaValidationOptions;
 use schema_validate_lib::validate;
 
@@ -62,7 +62,7 @@ fn build_schema_from_path(schema_file: &str) -> DiagnosticsResult<SDLSchema> {
     let extensions: &[(&str, SourceLocationKey)] = &[];
 
     if path.is_file() {
-        build_schema_with_extensions(&[path_to_schema_source(path)], extensions)
+        build_schema_with_extensions_parallel(&[path_to_schema_source(path)], extensions)
     } else {
         let paths = path
             .read_dir()
@@ -80,7 +80,7 @@ fn build_schema_from_path(schema_file: &str) -> DiagnosticsResult<SDLSchema> {
             .map(|path| path_to_schema_source(path))
             .collect();
 
-        build_schema_with_extensions(&sdls, extensions)
+        build_schema_with_extensions_parallel(&sdls, extensions)
     }
 }
 

compiler/crates/schema-validate/tests/validate_schema.rs

@@ -9,12 +9,12 @@ use common::SourceLocationKey;
 use common::TextSource;
 use fixture_tests::Fixture;
 use graphql_cli::DiagnosticPrinter;
-use schema::build_schema_with_extensions;
+use schema::build_schema_with_extensions_parallel;
 use schema_validate_lib::SchemaValidationOptions;
 use schema_validate_lib::validate;
 
 pub async fn transform_fixture(fixture: &Fixture<'_>) -> Result<String, String> {
-    let result = build_schema_with_extensions::<&str, &str>(
+    let result = build_schema_with_extensions_parallel::<&str, &str>(
         &[(
             fixture.content,
             SourceLocationKey::standalone(fixture.file_name),

compiler/crates/schema/src/lib.rs

@@ -67,27 +67,27 @@ const BUILTINS: &str = include_str!("./builtins.graphql");
 pub use flatbuffer::serialize_as_flatbuffer;
 
 pub fn build_schema(sdl: &str) -> DiagnosticsResult<SDLSchema> {
-    build_schema_with_extensions::<_, &str>(&[(sdl, SourceLocationKey::generated())], &[])
+    build_schema_with_extensions_parallel::<_, &str>(&[(sdl, SourceLocationKey::generated())], &[])
 }
 
 pub struct SchemaDocuments {
     pub server: Vec<SchemaDocument>,
     pub extensions: Vec<SchemaDocument>,
 }
 
-pub fn build_schema_with_extensions<
+pub fn build_schema_with_extensions_parallel<
     T: AsRef<str> + std::marker::Sync,
     U: AsRef<str> + std::marker::Sync,
 >(
     server_sdls: &[(T, SourceLocationKey)],
     extension_sdls: &[(U, SourceLocationKey)],
 ) -> DiagnosticsResult<SDLSchema> {
     let SchemaDocuments { server, extensions } =
-        parse_schema_with_extensions(server_sdls, extension_sdls)?;
+        parse_schema_with_extensions_parallel(server_sdls, extension_sdls)?;
     SDLSchema::build(&server, &extensions)
 }
 
-pub fn parse_schema_with_extensions<
+pub fn parse_schema_with_extensions_parallel<
     T: AsRef<str> + std::marker::Sync,
     U: AsRef<str> + std::marker::Sync,
 >(

compiler/crates/schema/tests/build_schema.rs

@@ -16,15 +16,15 @@ use schema::SDLSchema;
 use schema::Schema;
 use schema::Type;
 use schema::build_schema_from_flat_buffer;
-use schema::build_schema_with_extensions;
+use schema::build_schema_with_extensions_parallel;
 use schema::serialize_as_flatbuffer;
 
 const SCHEMA_SEPARATOR: &str = "%extensions%";
 
 pub async fn transform_fixture(fixture: &Fixture<'_>) -> Result<String, String> {
     let parts: Vec<_> = fixture.content.split(SCHEMA_SEPARATOR).collect();
     let result = match parts.as_slice() {
-        [base] => build_schema_with_extensions::<_, &str>(
+        [base] => build_schema_with_extensions_parallel::<_, &str>(
             &[(base, SourceLocationKey::standalone(fixture.file_name))],
             &[],
         ),
@@ -34,7 +34,7 @@ pub async fn transform_fixture(fixture: &Fixture<'_>) -> Result<String, String>
             let nchars_base = base.chars().count() + SCHEMA_SEPARATOR.chars().count();
             assert!(nchars_base > 0);
             let prepended_extension = format!("{}\n{}", "#".repeat(nchars_base - 1), extensions);
-            build_schema_with_extensions(
+            build_schema_with_extensions_parallel(
                 &[(base, SourceLocationKey::standalone(fixture.file_name))],
                 &[(
                     prepended_extension,