Bump incubating cache in benchmarks (#6795)

Author: BoD

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

@@ -9,6 +9,8 @@ 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.CacheManager
+import com.apollographql.cache.normalized.api.DefaultCacheKeyGenerator
+import com.apollographql.cache.normalized.api.DefaultCacheResolver
 import com.apollographql.cache.normalized.memory.MemoryCacheFactory
 import com.apollographql.cache.normalized.api.NormalizedCacheFactory
 import com.apollographql.cache.normalized.sql.SqlNormalizedCacheFactory
@@ -65,7 +67,7 @@ class ApolloStoreIncubatingTests {
   }
 
   private fun createCacheManager(cacheFactory: NormalizedCacheFactory): CacheManager {
-    return CacheManager(cacheFactory)
+    return CacheManager(cacheFactory, cacheKeyGenerator = DefaultCacheKeyGenerator, cacheResolver = DefaultCacheResolver)
   }
 
 

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

@@ -20,6 +20,8 @@ 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.DefaultCacheKeyGenerator
+import com.apollographql.cache.normalized.api.DefaultCacheResolver
 import com.apollographql.cache.normalized.api.NormalizedCacheFactory
 import com.apollographql.cache.normalized.cacheManager
 import com.apollographql.cache.normalized.memory.MemoryCacheFactory
@@ -101,7 +103,7 @@ class CacheIncubatingIntegrationTests {
   }
 
   private fun createCacheManager(cacheFactory: NormalizedCacheFactory): CacheManager {
-    return CacheManager(cacheFactory)
+    return CacheManager(cacheFactory, cacheKeyGenerator = DefaultCacheKeyGenerator, cacheResolver = DefaultCacheResolver)
   }
 
 

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

@@ -14,6 +14,8 @@ 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.CacheManager
+import com.apollographql.cache.normalized.api.DefaultCacheKeyGenerator
+import com.apollographql.cache.normalized.api.DefaultCacheResolver
 import com.apollographql.cache.normalized.memory.MemoryCacheFactory
 import com.apollographql.cache.normalized.sql.SqlNormalizedCacheFactory
 import kotlinx.coroutines.runBlocking
@@ -61,7 +63,9 @@ class CacheIncubatingTests {
           SqlNormalizedCacheFactory(name = dbName)
         } else {
           MemoryCacheFactory()
-        }
+        },
+        cacheKeyGenerator = DefaultCacheKeyGenerator,
+        cacheResolver = DefaultCacheResolver,
     )
 
     val data = query.parseJsonResponse(resource(jsonResponseResId).jsonReader()).data!!

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

@@ -2,12 +2,15 @@ package com.apollographql.apollo.benchmark
 
 import androidx.benchmark.junit4.BenchmarkRule
 import androidx.benchmark.junit4.measureRepeated
+import com.apollographql.apollo.ApolloClient
 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.apollo.conferences.cache.Cache.cache
 import com.apollographql.cache.normalized.CacheManager
+import com.apollographql.cache.normalized.api.NormalizedCacheFactory
 import com.apollographql.cache.normalized.api.SchemaCoordinatesMaxAgeProvider
+import com.apollographql.cache.normalized.apolloStore
 import com.apollographql.cache.normalized.garbageCollect
 import com.apollographql.cache.normalized.memory.MemoryCacheFactory
 import com.apollographql.cache.normalized.sql.SqlNormalizedCacheFactory
@@ -25,7 +28,7 @@ class GarbageCollectTests {
     lateinit var cacheManager: CacheManager
     benchmarkRule.measureRepeated {
       runWithTimingDisabled {
-        cacheManager = CacheManager(MemoryCacheFactory())
+        cacheManager = cacheManager(MemoryCacheFactory())
         primeCache(cacheManager)
       }
       runBlocking {
@@ -42,7 +45,7 @@ class GarbageCollectTests {
     benchmarkRule.measureRepeated {
       runWithTimingDisabled {
         dbFile.delete()
-        cacheManager = CacheManager(SqlNormalizedCacheFactory(dbName))
+        cacheManager = cacheManager(SqlNormalizedCacheFactory(dbName))
         primeCache(cacheManager)
       }
       runBlocking {
@@ -59,7 +62,7 @@ class GarbageCollectTests {
     benchmarkRule.measureRepeated {
       runWithTimingDisabled {
         dbFile.delete()
-        cacheManager = CacheManager(MemoryCacheFactory().chain(SqlNormalizedCacheFactory(dbName)))
+        cacheManager = cacheManager(MemoryCacheFactory().chain(SqlNormalizedCacheFactory(dbName)))
         primeCache(cacheManager)
       }
       runBlocking {
@@ -71,6 +74,9 @@ class GarbageCollectTests {
   }
 }
 
+private fun cacheManager(factory: NormalizedCacheFactory): CacheManager =
+  ApolloClient.Builder().cache(factory).serverUrl("http://unused").build().apolloStore.cacheManager
+
 private val maxAgeProvider = SchemaCoordinatesMaxAgeProvider(
     Cache.maxAges,
     defaultMaxAge = 1.days,

benchmark/microbenchmark/src/main/graphql/conferences/extra.graphqls

@@ -5,7 +5,7 @@ extend schema
 )
 
 @link(
-  url: "https://specs.apollo.dev/cache/v0.1",
+  url: "https://specs.apollo.dev/cache/v0.3",
   import: ["@cacheControl", "@cacheControlField"]
 )
 

gradle/libraries.toml

@@ -13,7 +13,7 @@ androidx-sqlite = "2.6.0"
 # This is used by the Gradle integration tests to get the artifacts locally
 apollo = "5.0.0-alpha.4-SNAPSHOT"
 apollo-execution = "0.1.1"
-apollo-normalizedcache-incubating = "1.0.0-alpha.6"
+apollo-normalizedcache-incubating = "1.0.0-alpha.8"
 # Used by the apollo-tooling project which uses a published version of Apollo
 apollo-published = "4.3.3"
 #noinspection NewerVersionAvailable requires KGP 2.2