improve db layer observability

Author: bubelov

app/src/main/kotlin/org/btcmap/db/table/place/PlaceQueries.kt

@@ -81,23 +81,8 @@ class PlaceQueries(private val conn: SQLiteConnection) {
         }
     }
 
-    fun selectMerchants(): List<Marker> {
-        conn.prepare(
-            """
-                SELECT ${MarkerProjection.COLUMNS}
-                FROM $TABLE
-                WHERE
-                    $ICON <> 'local_atm' AND $ICON <> 'currency_exchange'
-                ORDER BY $LAT DESC;
-            """
-        ).use {
-            val rows = mutableListOf<Marker>()
-            while (it.step()) {
-                rows.add(MarkerProjection.fromStatement(it))
-            }
-            return rows
-        }
-    }
+    var selectMerchantsByBoundsCallCount = 0
+    var selectMerchantsByBoundsLastCallDurationMs = 0L
 
     fun selectMerchantsByBounds(
         minLat: Double,
@@ -106,6 +91,8 @@ class PlaceQueries(private val conn: SQLiteConnection) {
         maxLon: Double,
         minVerifiedAt: ZonedDateTime? = null,
     ): List<Marker> {
+        val startTime = System.currentTimeMillis()
+        selectMerchantsByBoundsCallCount += 1
         val whereClause = buildString {
             append("$ICON <> 'local_atm' AND $ICON <> 'currency_exchange'")
             append(" AND $LAT >= ?1 AND $LAT <= ?2 AND $LON >= ?3 AND $LON <= ?4")
@@ -132,6 +119,7 @@ class PlaceQueries(private val conn: SQLiteConnection) {
             while (it.step()) {
                 rows.add(MarkerProjection.fromStatement(it))
             }
+            selectMerchantsByBoundsLastCallDurationMs = System.currentTimeMillis() - startTime
             return rows
         }
     }

app/src/main/kotlin/org/btcmap/map/MapFragment.kt

@@ -97,8 +97,6 @@ class MapFragment : Fragment() {
     var statusBarController: MapStatusBarController? = null
     var bottomSheetController: BottomSheetController? = null
 
-    private var dbCallCount = 0
-    private var lastDbCallTimeMs = 0L
     private var lastMerchantsGeoJson: String? = null
     private var lastEventsGeoJson: String? = null
     private var lastExchangesGeoJson: String? = null
@@ -631,8 +629,6 @@ class MapFragment : Fragment() {
         merchantsCache = PlaceCache()
         exchangesCache = PlaceCache()
         eventsCache = EventCache()
-        dbCallCount = 0
-        lastDbCallTimeMs = 0L
 
         when (filter) {
             Filter.MERCHANTS -> showMerchants()
@@ -663,8 +659,6 @@ class MapFragment : Fragment() {
             val expandedBounds = expandBounds(bounds)
             viewLifecycleOwner.lifecycleScope.launch {
                 if (!merchantsCache.contains(expandedBounds)) {
-                    dbCallCount++
-                    val startTime = System.currentTimeMillis()
                     val newMerchants = withContext(Dispatchers.IO) {
                         db().place.selectMerchantsByBounds(
                             expandedBounds.latitudeSouth,
@@ -675,7 +669,6 @@ class MapFragment : Fragment() {
                                 .minusYears(prefs.verifiedFilterYears.toLong()),
                         )
                     }
-                    lastDbCallTimeMs = System.currentTimeMillis() - startTime
                     merchantsCache = merchantsCache.add(newMerchants, expandedBounds)
                 }
                 val geoJson = merchantsCache.features.toGeoJson()
@@ -695,8 +688,6 @@ class MapFragment : Fragment() {
             val expandedBounds = expandBounds(bounds)
             viewLifecycleOwner.lifecycleScope.launch {
                 if (!eventsCache.contains(expandedBounds)) {
-                    dbCallCount++
-                    val startTime = System.currentTimeMillis()
                     val newEvents = withContext(Dispatchers.IO) {
                         db().event.selectByBounds(
                             expandedBounds.latitudeSouth,
@@ -705,7 +696,6 @@ class MapFragment : Fragment() {
                             expandedBounds.longitudeEast,
                         )
                     }
-                    lastDbCallTimeMs = System.currentTimeMillis() - startTime
                     eventsCache = eventsCache.add(newEvents, expandedBounds)
                 }
                 val geoJson = eventsCache.features.toEventsGeoJson()
@@ -725,8 +715,6 @@ class MapFragment : Fragment() {
             val expandedBounds = expandBounds(bounds)
             viewLifecycleOwner.lifecycleScope.launch {
                 if (!exchangesCache.contains(expandedBounds)) {
-                    dbCallCount++
-                    val startTime = System.currentTimeMillis()
                     val newExchanges = withContext(Dispatchers.IO) {
                         db().place.selectExchangesByBounds(
                             expandedBounds.latitudeSouth,
@@ -735,7 +723,6 @@ class MapFragment : Fragment() {
                             expandedBounds.longitudeEast,
                         )
                     }
-                    lastDbCallTimeMs = System.currentTimeMillis() - startTime
                     exchangesCache = exchangesCache.add(newExchanges, expandedBounds)
                 }
                 val geoJson = exchangesCache.features.toGeoJson()
@@ -786,7 +773,10 @@ class MapFragment : Fragment() {
             binding.debugStats.apply {
                 text =
                     "memcache: %d items\nmemcache bounds: %s\ndb queries: %d\nlast query: %dms".format(
-                        cacheSize, viewportInfo, dbCallCount, lastDbCallTimeMs
+                        cacheSize,
+                        viewportInfo,
+                        db().place.selectMerchantsByBoundsCallCount,
+                        db().place.selectMerchantsByBoundsLastCallDurationMs,
                     )
                 isVisible = true
             }

app/src/test/kotlin/org/btcmap/db/table/place/PlaceQueriesTest.kt

@@ -121,20 +121,6 @@ class PlaceQueriesTest {
         Assert.assertTrue(results.isEmpty())
     }
 
-    @Test
-    fun selectMerchants_excludesAtmAndExchange() {
-        val db = createDatabase()
-        db.place.insert(listOf(createPlace(id = 1L, icon = "restaurant")))
-        db.place.insert(listOf(createPlace(id = 2L, icon = "local_atm")))
-        db.place.insert(listOf(createPlace(id = 3L, icon = "currency_exchange")))
-        db.place.insert(listOf(createPlace(id = 4L, icon = "coffee")))
-
-        val results = db.place.selectMerchants()
-
-        Assert.assertEquals(2, results.size)
-        Assert.assertTrue(results.all { it.icon != "local_atm" && it.icon != "currency_exchange" })
-    }
-
     @Test
     fun selectExchanges_includesOnlyAtmAndExchange() {
         val db = createDatabase()
@@ -274,20 +260,6 @@ class PlaceQueriesTest {
         Assert.assertEquals(1L, db.place.selectCount())
     }
 
-    @Test
-    fun selectMerchants_withBoostedPlace() {
-        val db = createDatabase()
-        val boostedPlace = createPlace(id = 1L, icon = "restaurant")
-        val normalPlace = createPlace(id = 2L, icon = "coffee")
-
-        db.place.insert(listOf(boostedPlace))
-        db.place.insert(listOf(normalPlace))
-
-        val results = db.place.selectMerchants()
-
-        Assert.assertEquals(2, results.size)
-    }
-
     @Test
     fun selectMerchantsByBounds_withMinVerifiedAt_returnsOnlyRecentMerchants() {
         val db = createDatabase()