Update benchmarks to latest incubating cache version (#6566)

Author: martinbonnin

benchmark/microbenchmark/src/androidTest/java/com/apollographql/apollo/benchmark/ApolloStoreIncubatingTests.kt

@@ -8,7 +8,7 @@ import com.apollographql.apollo.benchmark.Utils.dbName
 import com.apollographql.apollo.benchmark.Utils.operationBasedQuery
 import com.apollographql.apollo.benchmark.Utils.resource
 import com.apollographql.apollo.benchmark.test.R
-import com.apollographql.cache.normalized.ApolloStore
+import com.apollographql.cache.normalized.CacheManager
 import com.apollographql.cache.normalized.memory.MemoryCacheFactory
 import com.apollographql.cache.normalized.api.NormalizedCacheFactory
 import com.apollographql.cache.normalized.sql.SqlNormalizedCacheFactory
@@ -41,7 +41,7 @@ class ApolloStoreIncubatingTests {
   }
 
   private fun concurrentReadWrites(cacheFactory: NormalizedCacheFactory) {
-    val apolloStore = createApolloStore(cacheFactory)
+    val apolloStore = createCacheManager(cacheFactory)
     val query = operationBasedQuery
     val data = query.parseJsonResponse(resource(R.raw.calendar_response_simple).jsonReader()).data!!
     val threadPool = Executors.newFixedThreadPool(CONCURRENCY)
@@ -61,8 +61,8 @@ class ApolloStoreIncubatingTests {
     }
   }
 
-  private fun createApolloStore(cacheFactory: NormalizedCacheFactory): ApolloStore {
-    return ApolloStore(cacheFactory)
+  private fun createCacheManager(cacheFactory: NormalizedCacheFactory): CacheManager {
+    return CacheManager(cacheFactory)
   }
 
 

benchmark/microbenchmark/src/androidTest/java/com/apollographql/apollo/benchmark/CacheIncubatingIntegrationTests.kt

@@ -19,9 +19,10 @@ import com.apollographql.mockserver.MockServer
 import com.apollographql.mockserver.MockServerHandler
 import com.apollographql.apollo.testing.MapTestNetworkTransport
 import com.apollographql.apollo.testing.registerTestResponse
+import com.apollographql.cache.normalized.CacheManager
 import com.apollographql.cache.normalized.api.NormalizedCacheFactory
+import com.apollographql.cache.normalized.cacheManager
 import com.apollographql.cache.normalized.memory.MemoryCacheFactory
-import com.apollographql.cache.normalized.store
 import kotlinx.coroutines.joinAll
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
@@ -76,7 +77,7 @@ class CacheIncubatingIntegrationTests {
             it.networkTransport(MapTestNetworkTransport())
           }
         }
-        .store(createApolloStore(cacheFactory))
+        .cacheManager(createCacheManager(cacheFactory))
         .build()
     if (!withMockServer) {
       client.registerTestResponse(operationBasedQuery, operationBasedQuery.parseJsonResponse(resource(R.raw.calendar_response_simple).jsonReader()).data!!)
@@ -99,8 +100,8 @@ class CacheIncubatingIntegrationTests {
     }
   }
 
-  private fun createApolloStore(cacheFactory: NormalizedCacheFactory): ApolloStore {
-    return ApolloStore(cacheFactory)
+  private fun createCacheManager(cacheFactory: NormalizedCacheFactory): CacheManager {
+    return CacheManager(cacheFactory)
   }
 
 

benchmark/microbenchmark/src/androidTest/java/com/apollographql/apollo/benchmark/CacheIncubatingTests.kt

@@ -13,7 +13,7 @@ import com.apollographql.apollo.benchmark.Utils.registerCacheSize
 import com.apollographql.apollo.benchmark.Utils.resource
 import com.apollographql.apollo.benchmark.Utils.responseBasedQuery
 import com.apollographql.apollo.benchmark.test.R
-import com.apollographql.cache.normalized.ApolloStore
+import com.apollographql.cache.normalized.CacheManager
 import com.apollographql.cache.normalized.memory.MemoryCacheFactory
 import com.apollographql.cache.normalized.sql.SqlNormalizedCacheFactory
 import kotlinx.coroutines.runBlocking
@@ -55,7 +55,7 @@ class CacheIncubatingTests {
   }
 
   private fun <D : Query.Data> readFromCache(testName: String, query: Query<D>, jsonResponseResId: Int, sql: Boolean, check: (D) -> Unit) {
-    val store = ApolloStore(
+    val cacheManager = CacheManager(
         if (sql) {
           dbFile.delete()
           SqlNormalizedCacheFactory(name = dbName)
@@ -66,14 +66,14 @@ class CacheIncubatingTests {
 
     val data = query.parseJsonResponse(resource(jsonResponseResId).jsonReader()).data!!
     runBlocking {
-      store.writeOperation(query, data)
+      cacheManager.writeOperation(query, data)
     }
 
     if (sql) {
       registerCacheSize("CacheIncubatingTests", testName, dbFile.length())
     }
     benchmarkRule.measureRepeated {
-      val data2 = store.readOperation(query).data!!
+      val data2 = cacheManager.readOperation(query).data!!
       check(data2)
     }
   }

benchmark/microbenchmark/src/androidTest/java/com/apollographql/apollo/benchmark/FakeData.kt

@@ -5,13 +5,13 @@ import com.apollographql.apollo.conferences.GetConferenceDataQuery
 import com.apollographql.apollo.conferences.fragment.RoomDetails
 import com.apollographql.apollo.conferences.fragment.SessionDetails
 import com.apollographql.apollo.conferences.fragment.SpeakerDetails
-import com.apollographql.cache.normalized.ApolloStore
+import com.apollographql.cache.normalized.CacheManager
 import com.apollographql.cache.normalized.api.ApolloCacheHeaders
 import com.apollographql.cache.normalized.api.CacheHeaders
 
 const val SESSION_COUNT = 100
 
-fun primeCache(apolloStore: ApolloStore) {
+fun primeCache(cacheManager: CacheManager) {
   val query1 = GetConferenceDataQuery(Optional.present(SESSION_COUNT))
   var data: GetConferenceDataQuery.Data = GetConferenceDataQuery.Data(
       sessions = createSessions(0),
@@ -20,7 +20,7 @@ fun primeCache(apolloStore: ApolloStore) {
       config = createConfig(),
       venues = createVenues(),
   )
-  apolloStore.writeOperation(query1, data)
+  cacheManager.writeOperation(query1, data)
 
   // Sessions in the first half of the list become unreachable
   data = GetConferenceDataQuery.Data(
@@ -30,7 +30,7 @@ fun primeCache(apolloStore: ApolloStore) {
       config = createConfig(),
       venues = createVenues(),
   )
-  apolloStore.writeOperation(query1, data)
+  cacheManager.writeOperation(query1, data)
 
   // Some stale sessions
   val query2 = GetConferenceDataQuery(Optional.present(SESSION_COUNT), Optional.present((SESSION_COUNT * 2).toString()))
@@ -41,7 +41,7 @@ fun primeCache(apolloStore: ApolloStore) {
       config = createConfig(),
       venues = createVenues(),
   )
-  apolloStore.writeOperation(
+  cacheManager.writeOperation(
       query2,
       data,
       cacheHeaders = CacheHeaders.Builder()
@@ -52,6 +52,7 @@ fun primeCache(apolloStore: ApolloStore) {
 
 private fun createSessions(startingAt: Int): GetConferenceDataQuery.Sessions {
   return GetConferenceDataQuery.Sessions(
+      __typename = "SessionConnection",
       nodes = (0 + startingAt..<SESSION_COUNT + startingAt)
           .map { i ->
             GetConferenceDataQuery.Node(
@@ -78,6 +79,7 @@ private fun createSessions(startingAt: Int): GetConferenceDataQuery.Sessions {
                         ),
                     ),
                     room = SessionDetails.Room(
+                        __typename = "Room",
                         name = "Room ${i % 8}",
                     ),
                     tags = listOf("tag1", "tag2", "tag3"),
@@ -86,13 +88,15 @@ private fun createSessions(startingAt: Int): GetConferenceDataQuery.Sessions {
             )
           },
       pageInfo = GetConferenceDataQuery.PageInfo(
+          __typename = "PageInfo",
           endCursor = "endCursor",
       ),
   )
 }
 
 private fun createSpeakers(startingAt: Int): GetConferenceDataQuery.Speakers {
   return GetConferenceDataQuery.Speakers(
+      __typename = "SpeakerConnection",
       nodes = (0 + startingAt * 2..<(SESSION_COUNT + startingAt) * 2)
           .map { i ->
             GetConferenceDataQuery.Node1(
@@ -124,11 +128,13 @@ private fun speakerDetails(i: Int): SpeakerDetails = SpeakerDetails(
     ),
     socials = listOf(
         SpeakerDetails.Social(
+            __typename = "Social",
             name = "Twitter",
             url = "http://twitter.com/speaker-$i",
             icon = "twitter",
         ),
         SpeakerDetails.Social(
+            __typename = "Social",
             name = "LinkedIn",
             url = "http://linkedin.com/speaker-$i",
             icon = "linkedin",
@@ -150,6 +156,7 @@ private fun createRooms(): List<GetConferenceDataQuery.Room> {
     GetConferenceDataQuery.Room(
         __typename = "Room",
         roomDetails = RoomDetails(
+            __typename = "Room",
             id = i.toString(),
             name = "Room $i",
             capacity = 100,
@@ -160,6 +167,7 @@ private fun createRooms(): List<GetConferenceDataQuery.Room> {
 
 private fun createConfig(): GetConferenceDataQuery.Config {
   return GetConferenceDataQuery.Config(
+      __typename = "Config",
       id = "Conference-0",
       name = "The Conference",
       timezone = "UTC",
@@ -171,6 +179,7 @@ private fun createConfig(): GetConferenceDataQuery.Config {
 private fun createVenues(): List<GetConferenceDataQuery.Venue> {
   return listOf(
       GetConferenceDataQuery.Venue(
+          __typename = "Venue",
           id = "Venue-0",
           name = "The Venue",
           address = "123 Main St",

benchmark/microbenchmark/src/androidTest/java/com/apollographql/apollo/benchmark/GarbageCollectTests.kt

@@ -6,6 +6,7 @@ import com.apollographql.apollo.benchmark.Utils.dbFile
 import com.apollographql.apollo.benchmark.Utils.dbName
 import com.apollographql.apollo.conferences.cache.Cache
 import com.apollographql.cache.normalized.ApolloStore
+import com.apollographql.cache.normalized.CacheManager
 import com.apollographql.cache.normalized.api.SchemaCoordinatesMaxAgeProvider
 import com.apollographql.cache.normalized.garbageCollect
 import com.apollographql.cache.normalized.memory.MemoryCacheFactory
@@ -20,39 +21,45 @@ class GarbageCollectTests {
 
   @Test
   fun garbageCollectMemory() {
-    lateinit var store: ApolloStore
+    lateinit var cacheManager: CacheManager
     benchmarkRule.measureRepeated {
       runWithTimingDisabled {
-        store = ApolloStore(MemoryCacheFactory())
-        primeCache(store)
+        cacheManager = CacheManager(MemoryCacheFactory())
+        primeCache(cacheManager)
+      }
+      cacheManager.accessCache {
+        it.garbageCollect(maxAgeProvider)
       }
-      store.garbageCollect(maxAgeProvider)
     }
   }
 
   @Test
   fun garbageCollectSql() {
-    lateinit var store: ApolloStore
+    lateinit var cacheManager: CacheManager
     benchmarkRule.measureRepeated {
       runWithTimingDisabled {
         dbFile.delete()
-        store = ApolloStore(SqlNormalizedCacheFactory(dbName))
-        primeCache(store)
+        cacheManager = CacheManager(SqlNormalizedCacheFactory(dbName))
+        primeCache(cacheManager)
+      }
+      cacheManager.accessCache {
+        it.garbageCollect(maxAgeProvider)
       }
-      store.garbageCollect(maxAgeProvider)
     }
   }
 
   @Test
   fun garbageCollectMemoryThenSql() {
-    lateinit var store: ApolloStore
+    lateinit var cacheManager: CacheManager
     benchmarkRule.measureRepeated {
       runWithTimingDisabled {
         dbFile.delete()
-        store = ApolloStore(MemoryCacheFactory().chain(SqlNormalizedCacheFactory(dbName)))
-        primeCache(store)
+        cacheManager = CacheManager(MemoryCacheFactory().chain(SqlNormalizedCacheFactory(dbName)))
+        primeCache(cacheManager)
+      }
+      cacheManager.accessCache {
+        it.garbageCollect(maxAgeProvider)
       }
-      store.garbageCollect(maxAgeProvider)
     }
   }
 }

gradle/libraries.toml

@@ -17,7 +17,7 @@ androidx-sqlite = "2.3.1"
 # This is used by the gradle integration tests to get the artifacts locally
 apollo = "5.0.0-SNAPSHOT"
 apollo-execution = "0.1.0"
-apollo-normalizedcache-incubating = "0.0.8"
+apollo-normalizedcache-incubating = "1.0.0-alpha.3"
 # Used by the apollo-tooling project which uses a published version of Apollo
 apollo-published = "4.0.1"
 atomicfu = "0.26.0"
@@ -65,7 +65,7 @@ apollo-mockserver = { group = "com.apollographql.mockserver", name = "apollo-moc
 apollo-mpputils = { group = "com.apollographql.apollo", name = "apollo-mpp-utils", version.ref = "apollo" }
 apollo-normalizedcache = { group = "com.apollographql.apollo", name = "apollo-normalized-cache", version.ref = "apollo" }
 apollo-normalizedcache-sqlite = { group = "com.apollographql.apollo", name = "apollo-normalized-cache-sqlite", version.ref = "apollo" }
-apollo-normalizedcache-sqlite-incubating = { group = "com.apollographql.cache", name = "normalized-cache-sqlite-incubating", version.ref = "apollo-normalizedcache-incubating" }
+apollo-normalizedcache-sqlite-incubating = { group = "com.apollographql.cache", name = "normalized-cache-sqlite", version.ref = "apollo-normalizedcache-incubating" }
 apollo-normalizedcache-apollo-compiler-plugin-incubating = { group = "com.apollographql.cache", name = "normalized-cache-apollo-compiler-plugin", version.ref = "apollo-normalizedcache-incubating" }
 apollo-plugin = { group = "com.apollographql.apollo", name = "apollo-gradle-plugin", version.ref = "apollo" }
 apollo-runtime = { group = "com.apollographql.apollo", name = "apollo-runtime", version.ref = "apollo" }