Rename statusInPriority to priorityStatusEntries

Author: simolus3

packages/powersync_core/lib/src/database/powersync_db_mixin.dart

@@ -127,7 +127,7 @@ mixin PowerSyncDatabaseMixin implements SqliteConnection {
     const prioritySentinel = 2147483647;
     var hasSynced = false;
     DateTime? lastCompleteSync;
-    final priorityStatus = <SyncPriorityStatus>[];
+    final priorityStatusEntries = <SyncPriorityStatus>[];
 
     DateTime parseDateTime(String sql) {
       return DateTime.parse('${sql}Z').toLocal();
@@ -141,7 +141,7 @@ mixin PowerSyncDatabaseMixin implements SqliteConnection {
         hasSynced = true;
         lastCompleteSync = lastSyncedAt;
       } else {
-        priorityStatus.add((
+        priorityStatusEntries.add((
           hasSynced: true,
           lastSyncedAt: lastSyncedAt,
           priority: BucketPriority(priority)
@@ -153,7 +153,7 @@ mixin PowerSyncDatabaseMixin implements SqliteConnection {
       final status = SyncStatus(
         hasSynced: hasSynced,
         lastSyncedAt: lastCompleteSync,
-        statusInPriority: priorityStatus,
+        priorityStatusEntries: priorityStatusEntries,
       );
       setStatus(status);
     }

packages/powersync_core/lib/src/streaming_sync.dart

@@ -276,30 +276,13 @@ class StreamingSyncImplementation implements StreamingSync {
   }
 
   void _updateStatusForPriority(SyncPriorityStatus completed) {
-    // Note: statusInPriority is sorted by priorities (ascending)
-    final existingPriorityState = lastStatus.statusInPriority;
-
-    for (final (i, priority) in existingPriorityState.indexed) {
-      switch (
-          BucketPriority.comparator(priority.priority, completed.priority)) {
-        case > 0:
-          // Entries from here on have a higher priority than the one that was
-          // just completed
-          final copy = existingPriorityState.toList();
-          copy.insert(i, completed);
-          _updateStatus(statusInPriority: copy);
-          return;
-        case 0:
-          final copy = existingPriorityState.toList();
-          copy[i] = completed;
-          _updateStatus(statusInPriority: copy);
-          return;
-        case < 0:
-          continue;
-      }
-    }
-
-    _updateStatus(statusInPriority: [...existingPriorityState, completed]);
+    // All status entries with a higher priority can be deleted since this
+    // partial sync includes them.
+    _updateStatus(priorityStatusEntries: [
+      for (final entry in lastStatus.priorityStatusEntries)
+        if (entry.priority < completed.priority) entry,
+      completed
+    ]);
   }
 
   /// Update sync status based on any non-null parameters.
@@ -313,7 +296,7 @@ class StreamingSyncImplementation implements StreamingSync {
     bool? uploading,
     Object? uploadError,
     Object? downloadError,
-    List<SyncPriorityStatus>? statusInPriority,
+    List<SyncPriorityStatus>? priorityStatusEntries,
   }) {
     final c = connected ?? lastStatus.connected;
     var newStatus = SyncStatus(
@@ -329,7 +312,8 @@ class StreamingSyncImplementation implements StreamingSync {
       downloadError: downloadError == _noError
           ? null
           : (downloadError ?? lastStatus.downloadError),
-      statusInPriority: statusInPriority ?? lastStatus.statusInPriority,
+      priorityStatusEntries:
+          priorityStatusEntries ?? lastStatus.priorityStatusEntries,
     );
 
     if (!_statusStreamController.isClosed) {
@@ -412,7 +396,7 @@ class StreamingSyncImplementation implements StreamingSync {
               downloading: false,
               downloadError: _noError,
               lastSyncedAt: now,
-              statusInPriority: [
+              priorityStatusEntries: [
                 if (appliedCheckpoint.checksums.isNotEmpty)
                   (
                     hasSynced: true,

packages/powersync_core/lib/src/sync_status.dart

@@ -40,7 +40,7 @@ final class SyncStatus {
   /// Cleared on the next successful data download.
   final Object? downloadError;
 
-  final List<SyncPriorityStatus> statusInPriority;
+  final List<SyncPriorityStatus> priorityStatusEntries;
 
   const SyncStatus({
     this.connected = false,
@@ -51,7 +51,7 @@ final class SyncStatus {
     this.uploading = false,
     this.downloadError,
     this.uploadError,
-    this.statusInPriority = const [],
+    this.priorityStatusEntries = const [],
   });
 
   @override
@@ -65,7 +65,8 @@ final class SyncStatus {
         other.uploadError == uploadError &&
         other.lastSyncedAt == lastSyncedAt &&
         other.hasSynced == hasSynced &&
-        _statusEquality.equals(other.statusInPriority, statusInPriority));
+        _statusEquality.equals(
+            other.priorityStatusEntries, priorityStatusEntries));
   }
 
   SyncStatus copyWith({
@@ -77,7 +78,7 @@ final class SyncStatus {
     Object? downloadError,
     DateTime? lastSyncedAt,
     bool? hasSynced,
-    List<SyncPriorityStatus>? statusInPriority,
+    List<SyncPriorityStatus>? priorityStatusEntries,
   }) {
     return SyncStatus(
       connected: connected ?? this.connected,
@@ -88,7 +89,8 @@ final class SyncStatus {
       downloadError: downloadError ?? this.downloadError,
       lastSyncedAt: lastSyncedAt ?? this.lastSyncedAt,
       hasSynced: hasSynced ?? this.hasSynced,
-      statusInPriority: statusInPriority ?? this.statusInPriority,
+      priorityStatusEntries:
+          priorityStatusEntries ?? this.priorityStatusEntries,
     );
   }
 
@@ -111,14 +113,14 @@ final class SyncStatus {
   /// in priority `2` necessarily includes a consistent view over data in
   /// priority `1`.
   SyncPriorityStatus statusForPriority(BucketPriority priority) {
-    assert(statusInPriority.isSortedByCompare(
+    assert(priorityStatusEntries.isSortedByCompare(
         (e) => e.priority, BucketPriority.comparator));
 
-    for (final known in statusInPriority) {
+    for (final known in priorityStatusEntries) {
       // Lower-priority buckets are synchronized after higher-priority buckets,
-      // and since statusInPriority is sorted we look for the first entry that
-      // doesn't have a higher priority.
-      if (BucketPriority.comparator(known.priority, priority) <= 0) {
+      // and since priorityStatusEntries is sorted we look for the first entry
+      // that doesn't have a higher priority.
+      if (known.priority <= priority) {
         return known;
       }
     }
@@ -141,7 +143,7 @@ final class SyncStatus {
         uploadError,
         downloadError,
         lastSyncedAt,
-        _statusEquality.hash(statusInPriority));
+        _statusEquality.hash(priorityStatusEntries));
   }
 
   @override
@@ -161,6 +163,11 @@ extension type const BucketPriority._(int priorityNumber) {
     return BucketPriority._(i);
   }
 
+  bool operator >(BucketPriority other) => comparator(this, other) > 0;
+  bool operator >=(BucketPriority other) => comparator(this, other) >= 0;
+  bool operator <(BucketPriority other) => comparator(this, other) < 0;
+  bool operator <=(BucketPriority other) => comparator(this, other) <= 0;
+
   /// A [Comparator] instance suitable for comparing [BucketPriority] values.
   static int comparator(BucketPriority a, BucketPriority b) =>
       -a.priorityNumber.compareTo(b.priorityNumber);

packages/powersync_core/lib/src/web/sync_worker_protocol.dart

@@ -157,7 +157,7 @@ extension type SerializedSyncStatus._(JSObject _) implements JSObject {
     required bool? hasSyned,
     required String? uploadError,
     required String? downloadError,
-    required JSArray? statusInPriority,
+    required JSArray? priorityStatusEntries,
   });
 
   factory SerializedSyncStatus.from(SyncStatus status) {
@@ -170,8 +170,8 @@ extension type SerializedSyncStatus._(JSObject _) implements JSObject {
       hasSyned: status.hasSynced,
       uploadError: status.uploadError?.toString(),
       downloadError: status.downloadError?.toString(),
-      statusInPriority: <JSArray?>[
-        for (final entry in status.statusInPriority)
+      priorityStatusEntries: <JSArray?>[
+        for (final entry in status.priorityStatusEntries)
           [
             entry.priority.priorityNumber.toJS,
             entry.lastSyncedAt?.microsecondsSinceEpoch.toJS,
@@ -189,7 +189,7 @@ extension type SerializedSyncStatus._(JSObject _) implements JSObject {
   external bool? hasSynced;
   external String? uploadError;
   external String? downloadError;
-  external JSArray? statusInPriority;
+  external JSArray? priorityStatusEntries;
 
   SyncStatus asSyncStatus() {
     return SyncStatus(
@@ -203,7 +203,7 @@ extension type SerializedSyncStatus._(JSObject _) implements JSObject {
       hasSynced: hasSynced,
       uploadError: uploadError,
       downloadError: downloadError,
-      statusInPriority: statusInPriority?.toDart.map((e) {
+      priorityStatusEntries: priorityStatusEntries?.toDart.map((e) {
             final [rawPriority, rawSynced, rawHasSynced, ...] =
                 (e as JSArray).toDart;
             final syncedMillis = (rawSynced as JSNumber?)?.toDartInt;

packages/powersync_core/test/sync_types_test.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 
+import 'package:powersync_core/src/sync_status.dart';
 import 'package:powersync_core/src/sync_types.dart';
 import 'package:test/test.dart';
 
@@ -214,5 +215,12 @@ void main() {
         });
       }
     });
+
+    test('bucket priority comparisons', () {
+      expect(BucketPriority(0) < BucketPriority(3), isFalse);
+      expect(BucketPriority(0) > BucketPriority(3), isTrue);
+      expect(BucketPriority(0) >= BucketPriority(3), isTrue);
+      expect(BucketPriority(0) >= BucketPriority(0), isTrue);
+    });
   });
 }