Merge branch 'main' into patch-1 + fix merge conflict

# Conflicts:
#	Apollo.xcodeproj/project.pbxproj

Author: designatednerd

.circleci/config.yml

@@ -3,16 +3,16 @@ version: 2.1
 parameters:
   xcode_version:
     type: string
-    default: "12.0.0"
+    default: "12.1.0"
   ios_current_version:
     type: string
-    default: "14.0"
+    default: "14.1"
   ios_previous_version:
     type: string
     default: "13.5"
   ios_sdk:
     type: string
-    default: "iphonesimulator14.0"
+    default: "iphonesimulator14.1"
   macos_version: # The user-facing version string for macOS builds
     type: string
     default: "10.15"
@@ -63,13 +63,33 @@ commands:
           command: xcodebuild clean build build-for-testing -project "Apollo.xcodeproj" -scheme "${CIRCLE_XCODE_SCHEME}" -sdk "${CIRCLE_XCODE_SDK}" -destination "${DESTINATION}" | xcpretty
           name: Clean and build for testing
       - run:
-          command: xcodebuild test-without-building -project "Apollo.xcodeproj" -scheme "${CIRCLE_XCODE_SCHEME}" -sdk "${CIRCLE_XCODE_SDK}" -destination "${DESTINATION}" | xcpretty
+          command: xcodebuild test-without-building -resultBundlePath ~/TestResults/ResultBundle.xcresult -project "Apollo.xcodeproj" -scheme "${CIRCLE_XCODE_SCHEME}" -sdk "${CIRCLE_XCODE_SDK}" -destination "${DESTINATION}" | xcpretty
           name: Run tests
+      - save-xcodebuild-artifacts
       - save_cache:
           key: starwars-server
           paths:
             - ../starwars-server
-
+  save-xcodebuild-artifacts:
+    description: Save artifacts logs, crash reports and test results generated by xcodebuild
+    steps:
+      - store_artifacts:
+          name: Save xcodebuild logs
+          path: logs
+          destination: logs
+      - store_artifacts:
+          name: Save crash logs
+          path: ~/Library/Logs/DiagnosticReports/
+          destination: crashes
+      - run:
+          name: Zip result bundle
+          working_directory: ~/TestResults
+          command: zip -r ResultBundle.zip ResultBundle.xcresult
+          when: always
+      - store_artifacts:
+          name: Save test results
+          path: ~/TestResults/ResultBundle.zip
+          destination: results
 
 # Important! When adding a new job to `jobs`, make sure to define when it
 # executes by also adding it to the `workflows` section below!

Apollo.xcodeproj/project.pbxproj

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1210"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "PerformanceTesting"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      disableMainThreadChecker = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "9F54C8B3255D760B0065AFD6"
+               BuildableName = "ApolloPerformanceTests.xctest"
+               BlueprintName = "ApolloPerformanceTests"
+               ReferencedContainer = "container:Apollo.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Apollo.xcodeproj/xcshareddata/xcschemes/ApolloPerformanceTests.xcscheme

@@ -3,7 +3,3 @@
 COPY_PHASE_STRIP = NO
 ENABLE_BITCODE = NO
 ENABLE_TESTABILITY = YES
-TEST_HOST = $(BUILT_PRODUCTS_DIR)/TestHost iOS.app/TestHost iOS
-
-CODE_SIGN_IDENTITY = iPhone Developer;
-CODE_SIGN_STYLE = Automatic;

Apollo.xcodeproj/xcuserdata/martijnwalraven.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -101,7 +101,7 @@ public final class ApolloStore {
       self.queue.async {
         self.cacheLock.lockForReading()
 
-        fulfill(ReadTransaction(cache: self.cache, cacheKeyForObject: self.cacheKeyForObject))
+        fulfill(ReadTransaction(store: self))
       }
     }.flatMap(body)
      .finally {
@@ -137,9 +137,7 @@ public final class ApolloStore {
     return Promise<ReadWriteTransaction> { fulfill, reject in
       self.queue.async(flags: .barrier) {
         self.cacheLock.lockForWriting()
-        fulfill(ReadWriteTransaction(cache: self.cache,
-                                     cacheKeyForObject: self.cacheKeyForObject,
-                                     updateChangedKeysFunc: self.didChangeKeys))
+        fulfill(ReadWriteTransaction(store: self))
       }
     }.flatMap(body)
      .finally {
@@ -203,14 +201,16 @@ public final class ApolloStore {
   }
 
   public class ReadTransaction {
+    fileprivate let queue: DispatchQueue
     fileprivate let cache: NormalizedCache
     fileprivate let cacheKeyForObject: CacheKeyForObject?
 
     fileprivate lazy var loader: DataLoader<CacheKey, Record?> = DataLoader(self.cache.loadRecordsPromise)
 
-    init(cache: NormalizedCache, cacheKeyForObject: CacheKeyForObject?) {
-      self.cache = cache
-      self.cacheKeyForObject = cacheKeyForObject
+    fileprivate init(store: ApolloStore) {
+      self.queue = DispatchQueue(label: "com.apollographql.ApolloStore.\(type(of: self))")
+      self.cache = store.cache
+      self.cacheKeyForObject = store.cacheKeyForObject
     }
 
     public func read<Query: GraphQLQuery>(query: Query) throws -> Query.Data {
@@ -242,17 +242,15 @@ public final class ApolloStore {
         return .promise(loader[reference.key].map { $0?.fields })
       } else if let array = value as? Array<Any?> {
         let completedValues = array.map(complete)
-        // Make sure to dispatch on a global queue and not on the local queue,
-        // because that could result in a deadlock (if someone is waiting for the write lock).
-        return whenAll(completedValues, notifyOn: .global()).map { $0 }
+        return whenAll(completedValues, notifyOn: queue).map { $0 }
       } else {
         return .result(.success(value))
       }
     }
 
-    final func execute<Accumulator: GraphQLResultAccumulator>(selections: [GraphQLSelection], onObjectWithKey key: CacheKey, variables: GraphQLMap?, accumulator: Accumulator) throws -> Promise<Accumulator.FinalResult> {
-      return loadObject(forKey: key).flatMap { object in
-        let executor = GraphQLExecutor { object, info in
+    fileprivate func execute<Accumulator: GraphQLResultAccumulator>(selections: [GraphQLSelection], onObjectWithKey key: CacheKey, variables: GraphQLMap?, accumulator: Accumulator) throws -> Promise<Accumulator.FinalResult> {
+      return loadObject(forKey: key).flatMap { [queue] object in
+        let executor = GraphQLExecutor(queue: queue) { object, info in
           let value = object[info.cacheKeyForField]
           return self.complete(value: value)
         }
@@ -282,9 +280,9 @@ public final class ApolloStore {
 
     fileprivate var updateChangedKeysFunc: DidChangeKeysFunc?
 
-    init(cache: NormalizedCache, cacheKeyForObject: CacheKeyForObject?, updateChangedKeysFunc: @escaping DidChangeKeysFunc) {
-      self.updateChangedKeysFunc = updateChangedKeysFunc
-      super.init(cache: cache, cacheKeyForObject: cacheKeyForObject)
+    override init(store: ApolloStore) {
+      self.updateChangedKeysFunc = store.didChangeKeys
+      super.init(store: store)
     }
 
     public func update<Query: GraphQLQuery>(query: Query, _ body: (inout Query.Data) throws -> Void) throws {
@@ -323,7 +321,7 @@ public final class ApolloStore {
                        withKey key: CacheKey,
                        variables: GraphQLMap?) throws {
       let normalizer = GraphQLResultNormalizer()
-      let executor = GraphQLExecutor { object, info in
+      let executor = GraphQLExecutor(queue: queue) { object, info in
         return .result(.success(object[info.responseKeyForField]))
       }
 
@@ -337,6 +335,10 @@ public final class ApolloStore {
       .flatMap {
         self.cache.mergePromise(records: $0)
       }.andThen { changedKeys in
+        // Remove cached values from the data loader, so subsequent reads
+        // within the same transaction will reload the updated value.
+        self.loader.removeAll()
+        
         if let didChangeKeysFunc = self.updateChangedKeysFunc {
           didChangeKeysFunc(changedKeys, nil)
         }