@powersync/service-module-mongodb-storage 0.16.0 → 0.18.0

package/dist/storage/implementation/v3/MongoChecksumsV3.js

@@ -1,18 +1,11 @@
-import { bson } from '@powersync/service-core';
-import { emptyChecksumForRequest, MongoChecksums } from '../MongoChecksums.js';
+import * as lib_mongo from '@powersync/lib-service-mongodb';
+import { bson, isPartialChecksum } from '@powersync/service-core';
+import { checksumFromAggregate, emptyChecksumForRequest, MongoChecksums } from '../MongoChecksums.js';
 export class MongoChecksumsV3 extends MongoChecksums {
-    mapping;
+    syncConfigMapping;
     constructor(db, group_id, options) {
         super(db, group_id, options);
-        this.mapping = options.mapping;
-    }
-    normalizeBatch(batch) {
-        return batch.map((request) => ({
-            bucket: request.bucket,
-            definitionId: this.mapping.bucketSourceId(request.source),
-            start: request.start,
-            end: request.end
-        }));
+        this.syncConfigMapping = options.syncConfigMapping;
     }
     async computePartialChecksumsDirectByDefinition(batch) {
         const results = new Map();
@@ -23,7 +16,7 @@ export class MongoChecksumsV3 extends MongoChecksums {
             requestsByDefinition.set(request.definitionId, existing);
         }
         for (const [definitionId, requests] of requestsByDefinition.entries()) {
-            const groupResults = await this.computePartialChecksumsForCollection(requests, this.db.bucketDataV3(this.group_id, definitionId), createV3BucketFilter);
+            const groupResults = await this.computeChecksumsByDefinition(requests, this.db.bucketData(this.group_id, definitionId));
             for (const checksum of groupResults.values()) {
                 results.set(checksum.bucket, checksum);
             }
@@ -31,7 +24,13 @@ export class MongoChecksumsV3 extends MongoChecksums {
         return new Map(batch.map((request) => [request.bucket, results.get(request.bucket) ?? emptyChecksumForRequest(request)]));
     }
     async fetchPreStates(batch) {
-        const preFilters = this.normalizeBatch(batch)
+        const normalizedBatch = batch.map((request) => ({
+            bucket: request.bucket,
+            definitionId: this.syncConfigMapping().bucketSourceId(request.source),
+            start: request.start,
+            end: request.end
+        }));
+        const preFilters = normalizedBatch
             .filter((request) => request.start == null)
             .map((request) => ({
             _id: {
@@ -45,7 +44,7 @@ export class MongoChecksumsV3 extends MongoChecksums {
             return preStates;
         }
         const states = await this.db
-            .bucketStateV3(this.group_id)
+            .bucketState(this.group_id)
             .find({
             $or: preFilters
         })
@@ -64,10 +63,192 @@ export class MongoChecksumsV3 extends MongoChecksums {
         return preStates;
     }
     async computePartialChecksumsInternal(batch) {
-        return this.computePartialChecksumsDirectByDefinition(this.normalizeBatch(batch));
+        const normalized = batch.map((request) => ({
+            bucket: request.bucket,
+            definitionId: this.syncConfigMapping().bucketSourceId(request.source),
+            start: request.start,
+            end: request.end
+        }));
+        const results = new Map();
+        const requestsByDefinition = new Map();
+        for (const request of normalized) {
+            const existing = requestsByDefinition.get(request.definitionId) ?? [];
+            existing.push(request);
+            requestsByDefinition.set(request.definitionId, existing);
+        }
+        for (const [definitionId, requests] of requestsByDefinition.entries()) {
+            const groupResults = await this.computeChecksumsByDefinition(requests, this.db.bucketData(this.group_id, definitionId));
+            for (const checksum of groupResults.values()) {
+                results.set(checksum.bucket, checksum);
+            }
+        }
+        return new Map(normalized.map((request) => [request.bucket, results.get(request.bucket) ?? emptyChecksumForRequest(request)]));
+    }
+    async computeChecksumsByDefinition(batch, collection) {
+        const requests = new Map();
+        for (let request of batch) {
+            requests.set(request.bucket, request);
+        }
+        const pipeline = this.buildPartialChecksumPipeline(requests);
+        const aggregate = await collection
+            .aggregate(pipeline, {
+            session: undefined,
+            readConcern: 'snapshot',
+            maxTimeMS: lib_mongo.MONGO_CHECKSUM_TIMEOUT_MS
+        })
+            .toArray()
+            .catch((e) => {
+            throw lib_mongo.mapQueryError(e, 'while reading checksums');
+        });
+        return this.normalizePartialChecksumResults(batch, aggregate);
+    }
+    buildPartialChecksumPipeline(requests) {
+        const filters = Array.from(requests.values(), createBucketFilter);
+        return [
+            // $match with $or filters
+            {
+                $match: {
+                    $or: filters
+                }
+            },
+            {
+                $addFields: {
+                    bucket_start: {
+                        $switch: {
+                            branches: Array.from(requests.entries()).map(([bucket, req]) => ({
+                                case: { $eq: ['$_id.b', bucket] },
+                                then: req.start ?? new bson.MinKey()
+                            })),
+                            default: new bson.MinKey()
+                        }
+                    },
+                    bucket_end: {
+                        $switch: {
+                            branches: Array.from(requests.entries()).map(([bucket, req]) => ({
+                                case: { $eq: ['$_id.b', bucket] },
+                                then: req.end
+                            })),
+                            default: new bson.MaxKey()
+                        }
+                    }
+                }
+            },
+            // Determine if document is fully included within [start, end] range
+            {
+                $project: {
+                    _id: 1,
+                    min_op: 1,
+                    checksum: 1,
+                    count: 1,
+                    ops: 1,
+                    bucket_start: 1,
+                    bucket_end: 1,
+                    is_fully_included: {
+                        $and: [{ $gt: ['$min_op', '$bucket_start'] }, { $lte: ['$_id.o', '$bucket_end'] }]
+                    }
+                }
+            },
+            // Compute included checksum, count, and clear op detection
+            {
+                $project: {
+                    _id: 1,
+                    checksum_total: {
+                        $cond: {
+                            if: '$is_fully_included',
+                            then: '$checksum',
+                            else: {
+                                $sum: {
+                                    $map: {
+                                        input: {
+                                            $filter: {
+                                                input: '$ops',
+                                                cond: {
+                                                    $and: [{ $gt: ['$$this.o', '$bucket_start'] }, { $lte: ['$$this.o', '$bucket_end'] }]
+                                                }
+                                            }
+                                        },
+                                        in: '$$this.checksum'
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    count_total: {
+                        $cond: {
+                            if: '$is_fully_included',
+                            then: '$count',
+                            else: {
+                                $size: {
+                                    $filter: {
+                                        input: '$ops',
+                                        cond: {
+                                            $and: [{ $gt: ['$$this.o', '$bucket_start'] }, { $lte: ['$$this.o', '$bucket_end'] }]
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    has_clear_op: {
+                        $max: {
+                            $map: {
+                                input: {
+                                    $filter: {
+                                        input: '$ops',
+                                        cond: {
+                                            $and: [{ $gt: ['$$this.o', '$bucket_start'] }, { $lte: ['$$this.o', '$bucket_end'] }]
+                                        }
+                                    }
+                                },
+                                in: { $cond: [{ $eq: ['$$this.op', 'CLEAR'] }, 1, 0] }
+                            }
+                        }
+                    },
+                    last_op: { $max: '$_id.o' }
+                }
+            },
+            // Group by bucket
+            {
+                $group: {
+                    _id: '$_id.b',
+                    checksum_total: { $sum: '$checksum_total' },
+                    count: { $sum: '$count_total' },
+                    has_clear_op: { $max: '$has_clear_op' },
+                    last_op: { $max: '$last_op' }
+                }
+            },
+            // $sort results
+            { $sort: { _id: 1 } }
+        ];
+    }
+    normalizePartialChecksumResults(batch, aggregate) {
+        const partialChecksums = new Map();
+        for (let doc of aggregate) {
+            const bucket = doc._id;
+            partialChecksums.set(bucket, checksumFromAggregate(doc));
+        }
+        return new Map(batch.map((request) => {
+            const bucket = request.bucket;
+            let partialChecksum = partialChecksums.get(bucket);
+            if (partialChecksum == null) {
+                partialChecksum = {
+                    bucket,
+                    partialCount: 0,
+                    partialChecksum: 0
+                };
+            }
+            if (request.start == null && isPartialChecksum(partialChecksum)) {
+                partialChecksum = {
+                    bucket,
+                    count: partialChecksum.partialCount,
+                    checksum: partialChecksum.partialChecksum
+                };
+            }
+            return [bucket, partialChecksum];
+        }));
     }
 }
-function createV3BucketFilter(request) {
+function createBucketFilter(request) {
     return {
         _id: {
             $gt: {
@@ -76,8 +257,11 @@ function createV3BucketFilter(request) {
             },
             $lte: {
                 b: request.bucket,
-                o: request.end
+                o: new bson.MaxKey()
             }
+        },
+        min_op: {
+            $lte: request.end
         }
     };
 }

package/dist/storage/implementation/v3/MongoChecksumsV3.js.map

@@ -1 +1 @@
-{"version":3,"file":"MongoChecksumsV3.js","sourceRoot":"","sources":["../../../../src/storage/implementation/v3/MongoChecksumsV3.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"MongoChecksumsV3.js","sourceRoot":"","sources":["../../../../src/storage/implementation/v3/MongoChecksumsV3.ts"],"names":[],"mappings":"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"}

package/dist/storage/implementation/v3/MongoCompactorV3.d.ts

@@ -1,10 +1,10 @@
 import { mongo } from '@powersync/lib-service-mongodb';
 import { storage } from '@powersync/service-core';
-import { BucketDefinitionId } from '../BucketDefinitionMapping.js';
-import { SingleBucketStore } from '../common/SingleBucketStore.js';
+import { BucketDefinitionId } from '@powersync/service-sync-rules';
 import { BucketStateDocumentBase } from '../models.js';
 import { DirtyBucket, MongoCompactor } from '../MongoCompactor.js';
 import type { MongoSyncBucketStorageV3 } from './MongoSyncBucketStorageV3.js';
+import { SingleBucketStoreV3 } from './SingleBucketStoreV3.js';
 import { VersionedPowerSyncMongoV3 } from './VersionedPowerSyncMongoV3.js';
 export declare class MongoCompactorV3 extends MongoCompactor {
     protected readonly db: VersionedPowerSyncMongoV3;
@@ -17,7 +17,24 @@ export declare class MongoCompactorV3 extends MongoCompactor {
         minBucketChanges: number;
     }): Promise<DirtyBucket[]>;
     protected writeBucketStateUpdates(): Promise<void>;
+    /**
+     * The compactor operates on persisted definition ids only - never on parsed sources.
+     * This narrowed view makes the source-resolving checksum methods unreachable here.
+     */
+    private get definitionChecksums();
     protected computeChecksumsForBuckets(buckets: Pick<DirtyBucket, 'bucket' | 'definitionId'>[]): Promise<storage.PartialChecksumMap>;
     protected bucketStateFilter(bucket: string, definitionId: BucketDefinitionId | null): mongo.Filter<BucketStateDocumentBase>;
-    protected getBucketDataContext(bucket: string, definitionId: BucketDefinitionId | null): Promise<SingleBucketStore | null>;
+    protected getBucketDataContext(bucket: string, definitionId: BucketDefinitionId | null): Promise<SingleBucketStoreV3 | null>;
+    protected compactSingleBucket(bucket: string, definitionId?: BucketDefinitionId | null): Promise<void>;
+    /**
+     * Collapse the leading sequence of MOVE/REMOVE/CLEAR ops at the start
+     * of the bucket into a single CLEAR op. Reads whole clearable documents
+     * before the known boundary document, then splits that boundary document
+     * if it contains ops on both sides of lastNotPut.
+     *
+     * Returns the op count diff after replacing cleared ops with CLEAR ops.
+     */
+    private clearBucketLeading;
+    private clearLeadingFullDocuments;
+    private clearBoundaryDocument;
 }