Fix database paths in benchmarks (#6835)

BoD · web-flow · commit 621383dc2c54 · 2026-01-16T14:16:40.000+01:00
* Fix database paths in benchmarks

* Bump incubating cache version
diff --git a/benchmark/microbenchmark/src/androidTest/java/com/apollographql/apollo/benchmark/ApolloStoreIncubatingTests.kt b/benchmark/microbenchmark/src/androidTest/java/com/apollographql/apollo/benchmark/ApolloStoreIncubatingTests.kt
@@ -4,7 +4,8 @@ import androidx.benchmark.junit4.BenchmarkRule
 import androidx.benchmark.junit4.measureRepeated
 import com.apollographql.apollo.api.json.jsonReader
 import com.apollographql.apollo.api.parseJsonResponse
-import com.apollographql.apollo.benchmark.Utils.getDbName
+import com.apollographql.apollo.benchmark.Utils.getIncubatingMemoryThenSqlCacheFactory
+import com.apollographql.apollo.benchmark.Utils.getIncubatingSqlCacheFactory
 import com.apollographql.apollo.benchmark.Utils.operationBasedQuery
 import com.apollographql.apollo.benchmark.Utils.resource
 import com.apollographql.apollo.benchmark.test.R
@@ -13,7 +14,6 @@ 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.memory.MemoryCacheFactory
-import com.apollographql.cache.normalized.sql.SqlNormalizedCacheFactory
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert
 import org.junit.Rule
@@ -31,16 +31,12 @@ class ApolloStoreIncubatingTests {
 
   @Test
   fun concurrentReadWritesSql() {
-    Utils.dbFile.delete()
-    val cacheFactory = SqlNormalizedCacheFactory(getDbName())
-    concurrentReadWrites(cacheFactory)
+    concurrentReadWrites(getIncubatingSqlCacheFactory())
   }
 
   @Test
   fun concurrentReadWritesMemoryThenSql() {
-    Utils.dbFile.delete()
-    val cacheFactory = MemoryCacheFactory().chain(SqlNormalizedCacheFactory(getDbName()))
-    concurrentReadWrites(cacheFactory)
+    concurrentReadWrites(getIncubatingMemoryThenSqlCacheFactory())
   }
 
   private fun concurrentReadWrites(cacheFactory: NormalizedCacheFactory) {
diff --git a/benchmark/microbenchmark/src/androidTest/java/com/apollographql/apollo/benchmark/ApolloStoreTests.kt b/benchmark/microbenchmark/src/androidTest/java/com/apollographql/apollo/benchmark/ApolloStoreTests.kt
@@ -4,14 +4,14 @@ import androidx.benchmark.junit4.BenchmarkRule
 import androidx.benchmark.junit4.measureRepeated
 import com.apollographql.apollo.api.json.jsonReader
 import com.apollographql.apollo.api.parseJsonResponse
-import com.apollographql.apollo.benchmark.Utils.getDbName
+import com.apollographql.apollo.benchmark.Utils.getMemoryThenSqlCacheFactory
+import com.apollographql.apollo.benchmark.Utils.getSqlCacheFactory
 import com.apollographql.apollo.benchmark.Utils.operationBasedQuery
 import com.apollographql.apollo.benchmark.Utils.resource
 import com.apollographql.apollo.benchmark.test.R
 import com.apollographql.apollo.cache.normalized.ApolloStore
 import com.apollographql.apollo.cache.normalized.api.MemoryCacheFactory
 import com.apollographql.apollo.cache.normalized.api.NormalizedCacheFactory
-import com.apollographql.apollo.cache.normalized.sql.SqlNormalizedCacheFactory
 import org.junit.Assert
 import org.junit.Rule
 import org.junit.Test
@@ -28,16 +28,12 @@ class ApolloStoreTests {
 
   @Test
   fun concurrentReadWritesSql() {
-    Utils.dbFile.delete()
-    val cacheFactory = SqlNormalizedCacheFactory(getDbName())
-    concurrentReadWrites(cacheFactory)
+    concurrentReadWrites(getSqlCacheFactory())
   }
 
   @Test
   fun concurrentReadWritesMemoryThenSql() {
-    Utils.dbFile.delete()
-    val cacheFactory = MemoryCacheFactory().chain(SqlNormalizedCacheFactory(getDbName()))
-    concurrentReadWrites(cacheFactory)
+    concurrentReadWrites(getMemoryThenSqlCacheFactory())
   }
 
   private fun concurrentReadWrites(cacheFactory: NormalizedCacheFactory) {
diff --git a/benchmark/microbenchmark/src/androidTest/java/com/apollographql/apollo/benchmark/CacheIncubatingIntegrationTests.kt b/benchmark/microbenchmark/src/androidTest/java/com/apollographql/apollo/benchmark/CacheIncubatingIntegrationTests.kt
@@ -5,7 +5,8 @@ import androidx.benchmark.junit4.measureRepeated
 import com.apollographql.apollo.ApolloClient
 import com.apollographql.apollo.api.json.jsonReader
 import com.apollographql.apollo.api.parseJsonResponse
-import com.apollographql.apollo.benchmark.Utils.getDbName
+import com.apollographql.apollo.benchmark.Utils.getIncubatingMemoryThenSqlCacheFactory
+import com.apollographql.apollo.benchmark.Utils.getIncubatingSqlCacheFactory
 import com.apollographql.apollo.benchmark.Utils.operationBasedQuery
 import com.apollographql.apollo.benchmark.Utils.resource
 import com.apollographql.apollo.benchmark.test.R
@@ -19,7 +20,6 @@ import com.apollographql.cache.normalized.api.NormalizedCacheFactory
 import com.apollographql.cache.normalized.cacheManager
 import com.apollographql.cache.normalized.fetchPolicy
 import com.apollographql.cache.normalized.memory.MemoryCacheFactory
-import com.apollographql.cache.normalized.sql.SqlNormalizedCacheFactory
 import com.apollographql.mockserver.MockRequestBase
 import com.apollographql.mockserver.MockResponse
 import com.apollographql.mockserver.MockServer
@@ -41,16 +41,12 @@ class CacheIncubatingIntegrationTests {
 
   @Test
   fun concurrentQueriesTestNetworkTransportSql() {
-    Utils.dbFile.delete()
-    val cacheFactory = SqlNormalizedCacheFactory(getDbName())
-    concurrentQueries(cacheFactory, withMockServer = false)
+    concurrentQueries(getIncubatingSqlCacheFactory(), withMockServer = false)
   }
 
   @Test
   fun concurrentQueriesTestNetworkTransportMemoryThenSql() {
-    Utils.dbFile.delete()
-    val cacheFactory = MemoryCacheFactory().chain(SqlNormalizedCacheFactory(getDbName()))
-    concurrentQueries(cacheFactory, withMockServer = false)
+    concurrentQueries(getIncubatingMemoryThenSqlCacheFactory(), withMockServer = false)
   }
 
 
diff --git a/benchmark/microbenchmark/src/androidTest/java/com/apollographql/apollo/benchmark/CacheIncubatingPaginationTests.kt b/benchmark/microbenchmark/src/androidTest/java/com/apollographql/apollo/benchmark/CacheIncubatingPaginationTests.kt
@@ -9,7 +9,8 @@ import com.apollographql.apollo.annotations.ApolloExperimental
 import com.apollographql.apollo.api.Optional
 import com.apollographql.apollo.api.json.jsonReader
 import com.apollographql.apollo.api.parseResponse
-import com.apollographql.apollo.benchmark.Utils.getDbName
+import com.apollographql.apollo.benchmark.Utils.getIncubatingMemoryThenSqlCacheFactory
+import com.apollographql.apollo.benchmark.Utils.getIncubatingSqlCacheFactory
 import com.apollographql.apollo.benchmark.Utils.resource
 import com.apollographql.apollo.benchmark.test.R
 import com.apollographql.apollo.pagination.UsersPageQuery
@@ -24,7 +25,6 @@ import com.apollographql.cache.normalized.apolloStore
 import com.apollographql.cache.normalized.fetchPolicy
 import com.apollographql.cache.normalized.memory.MemoryCacheFactory
 import com.apollographql.cache.normalized.normalizedCache
-import com.apollographql.cache.normalized.sql.SqlNormalizedCacheFactory
 import kotlinx.coroutines.runBlocking
 import org.junit.Rule
 import org.junit.Test
@@ -41,16 +41,12 @@ class CacheIncubatingPaginationTests {
 
   @Test
   fun paginationSql() {
-    Utils.dbFile.delete()
-    val cacheFactory = SqlNormalizedCacheFactory(getDbName())
-    paginationWritesAndRead(cacheFactory, paginationEnabled = true)
+    paginationWritesAndRead(getIncubatingSqlCacheFactory(), paginationEnabled = true)
   }
 
   @Test
   fun paginationMemoryThenSql() {
-    Utils.dbFile.delete()
-    val cacheFactory = MemoryCacheFactory().chain(SqlNormalizedCacheFactory(getDbName()))
-    paginationWritesAndRead(cacheFactory, paginationEnabled = true)
+    paginationWritesAndRead(getIncubatingMemoryThenSqlCacheFactory(), paginationEnabled = true)
   }
 
   @Test
@@ -60,16 +56,12 @@ class CacheIncubatingPaginationTests {
 
   @Test
   fun noPaginationSql() {
-    Utils.dbFile.delete()
-    val cacheFactory = SqlNormalizedCacheFactory(getDbName())
-    paginationWritesAndRead(cacheFactory, paginationEnabled = false)
+    paginationWritesAndRead(getIncubatingSqlCacheFactory(), paginationEnabled = false)
   }
 
   @Test
   fun noPaginationMemoryThenSql() {
-    Utils.dbFile.delete()
-    val cacheFactory = MemoryCacheFactory().chain(SqlNormalizedCacheFactory(getDbName()))
-    paginationWritesAndRead(cacheFactory, paginationEnabled = false)
+    paginationWritesAndRead(getIncubatingMemoryThenSqlCacheFactory(), paginationEnabled = false)
   }
 
   private fun paginationWritesAndRead(cacheFactory: NormalizedCacheFactory, paginationEnabled: Boolean) {
diff --git a/benchmark/microbenchmark/src/androidTest/java/com/apollographql/apollo/benchmark/CacheIncubatingTests.kt b/benchmark/microbenchmark/src/androidTest/java/com/apollographql/apollo/benchmark/CacheIncubatingTests.kt
@@ -5,7 +5,7 @@ import androidx.benchmark.junit4.measureRepeated
 import com.apollographql.apollo.api.Query
 import com.apollographql.apollo.api.json.jsonReader
 import com.apollographql.apollo.api.parseJsonResponse
-import com.apollographql.apollo.benchmark.Utils.dbFile
+import com.apollographql.apollo.benchmark.Utils.getDbFile
 import com.apollographql.apollo.benchmark.Utils.getDbName
 import com.apollographql.apollo.benchmark.Utils.largeListQuery
 import com.apollographql.apollo.benchmark.Utils.operationBasedQuery
@@ -57,10 +57,11 @@ class CacheIncubatingTests {
   }
 
   private fun <D : Query.Data> readFromCache(testName: String, query: Query<D>, jsonResponseResId: Int, sql: Boolean, check: (D) -> Unit) {
+    val dbFile = getDbFile(getDbName())
     val cacheManager = CacheManager(
         if (sql) {
           dbFile.delete()
-          SqlNormalizedCacheFactory(name = getDbName())
+          SqlNormalizedCacheFactory(dbFile.absolutePath)
         } else {
           MemoryCacheFactory()
         },
diff --git a/benchmark/microbenchmark/src/androidTest/java/com/apollographql/apollo/benchmark/CacheIntegrationTests.kt b/benchmark/microbenchmark/src/androidTest/java/com/apollographql/apollo/benchmark/CacheIntegrationTests.kt
@@ -1,11 +1,15 @@
+@file:OptIn(ApolloExperimental::class)
+
 package com.apollographql.apollo.benchmark
 
 import androidx.benchmark.junit4.BenchmarkRule
 import androidx.benchmark.junit4.measureRepeated
 import com.apollographql.apollo.ApolloClient
+import com.apollographql.apollo.annotations.ApolloExperimental
 import com.apollographql.apollo.api.json.jsonReader
 import com.apollographql.apollo.api.parseJsonResponse
-import com.apollographql.apollo.benchmark.Utils.getDbName
+import com.apollographql.apollo.benchmark.Utils.getMemoryThenSqlCacheFactory
+import com.apollographql.apollo.benchmark.Utils.getSqlCacheFactory
 import com.apollographql.apollo.benchmark.Utils.operationBasedQuery
 import com.apollographql.apollo.benchmark.Utils.resource
 import com.apollographql.apollo.benchmark.test.R
@@ -14,7 +18,6 @@ import com.apollographql.apollo.cache.normalized.FetchPolicy
 import com.apollographql.apollo.cache.normalized.api.MemoryCacheFactory
 import com.apollographql.apollo.cache.normalized.api.NormalizedCacheFactory
 import com.apollographql.apollo.cache.normalized.fetchPolicy
-import com.apollographql.apollo.cache.normalized.sql.SqlNormalizedCacheFactory
 import com.apollographql.apollo.cache.normalized.store
 import com.apollographql.apollo.testing.MapTestNetworkTransport
 import com.apollographql.apollo.testing.registerTestResponse
@@ -39,16 +42,12 @@ class CacheIntegrationTests {
 
   @Test
   fun concurrentQueriesTestNetworkTransportSql() {
-    Utils.dbFile.delete()
-    val cacheFactory = SqlNormalizedCacheFactory(getDbName())
-    concurrentQueries(cacheFactory, withMockServer = false)
+    concurrentQueries(getSqlCacheFactory(), withMockServer = false)
   }
 
   @Test
   fun concurrentQueriesTestNetworkTransportMemoryThenSql() {
-    Utils.dbFile.delete()
-    val cacheFactory = MemoryCacheFactory().chain(SqlNormalizedCacheFactory(getDbName()))
-    concurrentQueries(cacheFactory, withMockServer = false)
+    concurrentQueries(getMemoryThenSqlCacheFactory(), withMockServer = false)
   }
 
 
diff --git a/benchmark/microbenchmark/src/androidTest/java/com/apollographql/apollo/benchmark/CacheTests.kt b/benchmark/microbenchmark/src/androidTest/java/com/apollographql/apollo/benchmark/CacheTests.kt
@@ -5,7 +5,7 @@ import androidx.benchmark.junit4.measureRepeated
 import com.apollographql.apollo.api.Query
 import com.apollographql.apollo.api.json.jsonReader
 import com.apollographql.apollo.api.parseJsonResponse
-import com.apollographql.apollo.benchmark.Utils.dbFile
+import com.apollographql.apollo.benchmark.Utils.getDbFile
 import com.apollographql.apollo.benchmark.Utils.getDbName
 import com.apollographql.apollo.benchmark.Utils.largeListQuery
 import com.apollographql.apollo.benchmark.Utils.operationBasedQuery
@@ -55,10 +55,12 @@ class CacheTests {
   }
 
   private fun <D : Query.Data> readFromCache(testName: String, query: Query<D>, jsonResponseResId: Int, sql: Boolean, check: (D) -> Unit) {
+    val dbName = getDbName()
+    val dbFile = getDbFile(dbName)
     val store = ApolloStore(
         if (sql) {
           dbFile.delete()
-          SqlNormalizedCacheFactory(name = getDbName())
+          SqlNormalizedCacheFactory(name = dbName)
         } else {
           MemoryCacheFactory()
         }
diff --git a/benchmark/microbenchmark/src/androidTest/java/com/apollographql/apollo/benchmark/GarbageCollectTests.kt b/benchmark/microbenchmark/src/androidTest/java/com/apollographql/apollo/benchmark/GarbageCollectTests.kt
@@ -3,8 +3,8 @@ 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.getDbName
+import com.apollographql.apollo.benchmark.Utils.getIncubatingMemoryThenSqlCacheFactory
+import com.apollographql.apollo.benchmark.Utils.getIncubatingSqlCacheFactory
 import com.apollographql.apollo.conferences.cache.Cache
 import com.apollographql.apollo.conferences.cache.Cache.cache
 import com.apollographql.cache.normalized.CacheManager
@@ -13,7 +13,6 @@ 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
 import kotlinx.coroutines.runBlocking
 import org.junit.Rule
 import org.junit.Test
@@ -44,8 +43,7 @@ class GarbageCollectTests {
     lateinit var cacheManager: CacheManager
     benchmarkRule.measureRepeated {
       runWithTimingDisabled {
-        dbFile.delete()
-        cacheManager = cacheManager(SqlNormalizedCacheFactory(getDbName()))
+        cacheManager = cacheManager(getIncubatingSqlCacheFactory())
         primeCache(cacheManager)
       }
       runBlocking {
@@ -61,8 +59,7 @@ class GarbageCollectTests {
     lateinit var cacheManager: CacheManager
     benchmarkRule.measureRepeated {
       runWithTimingDisabled {
-        dbFile.delete()
-        cacheManager = cacheManager(MemoryCacheFactory().chain(SqlNormalizedCacheFactory(getDbName())))
+        cacheManager = cacheManager(getIncubatingMemoryThenSqlCacheFactory())
         primeCache(cacheManager)
       }
       runBlocking {
diff --git a/benchmark/microbenchmark/src/androidTest/java/com/apollographql/apollo/benchmark/Utils.kt b/benchmark/microbenchmark/src/androidTest/java/com/apollographql/apollo/benchmark/Utils.kt
@@ -5,6 +5,9 @@ import androidx.test.platform.app.InstrumentationRegistry
 import com.apollographql.apollo.api.AnyAdapter
 import com.apollographql.apollo.api.CustomScalarAdapters
 import com.apollographql.apollo.api.json.buildJsonString
+import com.apollographql.apollo.cache.normalized.api.MemoryCacheFactory
+import com.apollographql.apollo.cache.normalized.api.NormalizedCacheFactory
+import com.apollographql.apollo.cache.normalized.sql.SqlNormalizedCacheFactory
 import com.apollographql.apollo.calendar.operation.ItemsQuery
 import com.apollographql.apollo.calendar.response.ItemsQuery.Data.Items.Edge.Node.Companion.itemFragment
 import com.apollographql.apollo.calendar.response.fragment.CalendarFragment.Provider.Node.Companion.calendarProviderFragment
@@ -19,7 +22,8 @@ object Utils {
   private val cache = mutableMapOf<Int, BufferedSource>()
 
   fun getDbName(): String = "testDb-${System.currentTimeMillis()}"
-  val dbFile: File = InstrumentationRegistry.getInstrumentation().context.getDatabasePath(getDbName())
+  fun getDbFile(dbName: String): File = InstrumentationRegistry.getInstrumentation().context.getDatabasePath(dbName)
+
   val responseBasedQuery = com.apollographql.apollo.calendar.response.ItemsQuery(endingAfter = "", startingBefore = "")
   val operationBasedQuery = ItemsQuery(endingAfter = "", startingBefore = "")
   val largeListQuery = PlaylistRawTracksQuery("42")
@@ -74,4 +78,29 @@ object Utils {
   internal fun checkLargeList(data: PlaylistRawTracksQuery.Data) {
     check(data.playlist!!.rawTracks.size == 10000 && data.playlist.rawTracks[9999]!!.trackId == "142429999")
   }
+
+  fun getSqlCacheFactory(): NormalizedCacheFactory {
+    val dbName = getDbName()
+    getDbFile(dbName).delete()
+    return SqlNormalizedCacheFactory(dbName)
+  }
+
+  fun getMemoryThenSqlCacheFactory(): NormalizedCacheFactory {
+    val dbName = getDbName()
+    getDbFile(dbName).delete()
+    return MemoryCacheFactory().chain(SqlNormalizedCacheFactory(dbName))
+  }
+
+  fun getIncubatingSqlCacheFactory(): com.apollographql.cache.normalized.api.NormalizedCacheFactory {
+    val dbFile = getDbFile(getDbName())
+    dbFile.delete()
+    return com.apollographql.cache.normalized.sql.SqlNormalizedCacheFactory(dbFile.absolutePath)
+  }
+
+  fun getIncubatingMemoryThenSqlCacheFactory(): com.apollographql.cache.normalized.api.NormalizedCacheFactory {
+    val dbFile = getDbFile(getDbName())
+    dbFile.delete()
+    return com.apollographql.cache.normalized.memory.MemoryCacheFactory()
+        .chain(com.apollographql.cache.normalized.sql.SqlNormalizedCacheFactory(dbFile.absolutePath))
+  }
 }
diff --git a/gradle/libraries.toml b/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-beta.1"
+apollo-normalizedcache-incubating = "1.0.0-beta.3"
 # Used by the apollo-tooling project which uses a published version of Apollo
 apollo-published = "4.3.3"
 #noinspection NewerVersionAvailable requires KGP 2.2
