Fixed bug in bulk downloader (htWriteTile(s))

Discovered bug in `rootSize` calculation
JaffaKetchup · Feb 28, 2024 · 2745f0e · 2745f0e
1 parent 4153e1c
commit 2745f0e
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 10 deletions.
diff --git a/lib/src/backend/impls/objectbox/backend/internal_thread_safe.dart b/lib/src/backend/impls/objectbox/backend/internal_thread_safe.dart
@@ -78,19 +78,30 @@ class _ObjectBoxBackendThreadSafeImpl implements FMTCBackendInternalThreadSafe {
             (throw StoreNotExists(storeName: storeName));
 
         if (existingTile == null) {
+          // If tile doesn't exist, just add to this store
           storesToUpdate[storeName] = store
             ..length += 1
             ..size += bytes.lengthInBytes;
         } else {
-          storesToUpdate[storeName] = store
-            ..size += -existingTile.bytes.lengthInBytes + bytes.lengthInBytes;
+          // If tile exists in this store, just update size, otherwise
+          // length and size
+          // Also update size of all related stores
+          bool didContainAlready = false;
 
           for (final relatedStore in existingTile.stores) {
+            if (relatedStore.name == storeName) didContainAlready = true;
+
             storesToUpdate[relatedStore.name] =
                 (storesToUpdate[relatedStore.name] ?? relatedStore)
                   ..size +=
                       -existingTile.bytes.lengthInBytes + bytes.lengthInBytes;
           }
+
+          if (!didContainAlready) {
+            storesToUpdate[storeName] = store
+              ..length += 1
+              ..size += bytes.lengthInBytes;
+          }
         }
 
         tiles.put(
@@ -139,20 +150,30 @@ class _ObjectBoxBackendThreadSafeImpl implements FMTCBackendInternalThreadSafe {
                 .findUnique();
 
             if (existingTile == null) {
-              storesToUpdate[storeName] = store
+              // If tile doesn't exist, just add to this store
+              storesToUpdate[storeName] = (storesToUpdate[storeName] ?? store)
                 ..length += 1
                 ..size += bytess[i].lengthInBytes;
             } else {
-              storesToUpdate[storeName] = store
-                ..size +=
-                    -existingTile.bytes.lengthInBytes + bytess[i].lengthInBytes;
+              // If tile exists in this store, just update size, otherwise
+              // length and size
+              // Also update size of all related stores
+              bool didContainAlready = false;
 
               for (final relatedStore in existingTile.stores) {
+                if (relatedStore.name == storeName) didContainAlready = true;
+
                 storesToUpdate[relatedStore.name] =
                     (storesToUpdate[relatedStore.name] ?? relatedStore)
                       ..size += -existingTile.bytes.lengthInBytes +
                           bytess[i].lengthInBytes;
               }
+
+              if (!didContainAlready) {
+                storesToUpdate[storeName] = store
+                  ..length += 1
+                  ..size += bytess[i].lengthInBytes;
+              }
             }
 
             return ObjectBoxTile(

diff --git a/lib/src/backend/impls/objectbox/backend/internal_worker.dart b/lib/src/backend/impls/objectbox/backend/internal_worker.dart
@@ -180,6 +180,7 @@ Future<void> _worker(
             },
           );
         case _WorkerCmdType.rootSize:
+          // TODO: Invalid, considers ALL tiles (related ones multiple times), not UNIQUE tiles
           final query = root
               .box<ObjectBoxStore>()
               .query()
@@ -583,10 +584,8 @@ Future<void> _worker(
           sendRes(
             id: cmd.id,
             data: {
-              'numOrphans': deleteTiles(
-                storeName: storeName,
-                tilesQuery: tilesQuery,
-              ),
+              'numOrphans':
+                  deleteTiles(storeName: storeName, tilesQuery: tilesQuery),
             },
           );