@powersync/service-core 0.0.0-dev-20240718134716 → 0.0.0-dev-20240918082156

package/dist/storage/mongo/MongoCompactor.js

@@ -0,0 +1,293 @@
+import { logger } from '@powersync/lib-services-framework';
+import { MaxKey, MinKey } from 'mongodb';
+import { addChecksums } from '../../util/utils.js';
+import { cacheKey } from './OperationBatch.js';
+const DEFAULT_CLEAR_BATCH_LIMIT = 5000;
+const DEFAULT_MOVE_BATCH_LIMIT = 2000;
+const DEFAULT_MOVE_BATCH_QUERY_LIMIT = 10000;
+/** This default is primarily for tests. */
+const DEFAULT_MEMORY_LIMIT_MB = 64;
+export class MongoCompactor {
+    constructor(db, group_id, options) {
+        this.db = db;
+        this.group_id = group_id;
+        this.updates = [];
+        this.idLimitBytes = (options?.memoryLimitMB ?? DEFAULT_MEMORY_LIMIT_MB) * 1024 * 1024;
+        this.moveBatchLimit = options?.moveBatchLimit ?? DEFAULT_MOVE_BATCH_LIMIT;
+        this.moveBatchQueryLimit = options?.moveBatchQueryLimit ?? DEFAULT_MOVE_BATCH_QUERY_LIMIT;
+        this.clearBatchLimit = options?.clearBatchLimit ?? DEFAULT_CLEAR_BATCH_LIMIT;
+        this.maxOpId = options?.maxOpId;
+        this.buckets = options?.compactBuckets;
+    }
+    /**
+     * Compact buckets by converting operations into MOVE and/or CLEAR operations.
+     *
+     * See /docs/compacting-operations.md for details.
+     */
+    async compact() {
+        if (this.buckets) {
+            for (let bucket of this.buckets) {
+                // We can make this more efficient later on by iterating
+                // through the buckets in a single query.
+                // That makes batching more tricky, so we leave for later.
+                await this.compactInternal(bucket);
+            }
+        }
+        else {
+            await this.compactInternal(undefined);
+        }
+    }
+    async compactInternal(bucket) {
+        const idLimitBytes = this.idLimitBytes;
+        let currentState = null;
+        // Constant lower bound
+        const lowerBound = {
+            g: this.group_id,
+            b: bucket ?? new MinKey(),
+            o: new MinKey()
+        };
+        // Upper bound is adjusted for each batch
+        let upperBound = {
+            g: this.group_id,
+            b: bucket ?? new MaxKey(),
+            o: new MaxKey()
+        };
+        while (true) {
+            // Query one batch at a time, to avoid cursor timeouts
+            const batch = await this.db.bucket_data
+                .find({
+                _id: {
+                    $gte: lowerBound,
+                    $lt: upperBound
+                }
+            }, {
+                projection: {
+                    _id: 1,
+                    op: 1,
+                    table: 1,
+                    row_id: 1,
+                    source_table: 1,
+                    source_key: 1
+                },
+                limit: this.moveBatchQueryLimit,
+                sort: { _id: -1 },
+                singleBatch: true
+            })
+                .toArray();
+            if (batch.length == 0) {
+                // We've reached the end
+                break;
+            }
+            // Set upperBound for the next batch
+            upperBound = batch[batch.length - 1]._id;
+            for (let doc of batch) {
+                if (currentState == null || doc._id.b != currentState.bucket) {
+                    if (currentState != null && currentState.lastNotPut != null && currentState.opsSincePut >= 1) {
+                        // Important to flush before clearBucket()
+                        await this.flush();
+                        logger.info(`Inserting CLEAR at ${this.group_id}:${currentState.bucket}:${currentState.lastNotPut} to remove ${currentState.opsSincePut} operations`);
+                        const bucket = currentState.bucket;
+                        const clearOp = currentState.lastNotPut;
+                        // Free memory before clearing bucket
+                        currentState = null;
+                        await this.clearBucket(bucket, clearOp);
+                    }
+                    currentState = {
+                        bucket: doc._id.b,
+                        seen: new Map(),
+                        trackingSize: 0,
+                        lastNotPut: null,
+                        opsSincePut: 0
+                    };
+                }
+                if (this.maxOpId != null && doc._id.o > this.maxOpId) {
+                    continue;
+                }
+                let isPersistentPut = doc.op == 'PUT';
+                if (doc.op == 'REMOVE' || doc.op == 'PUT') {
+                    const key = `${doc.table}/${doc.row_id}/${cacheKey(doc.source_table, doc.source_key)}`;
+                    const targetOp = currentState.seen.get(key);
+                    if (targetOp) {
+                        // Will convert to MOVE, so don't count as PUT
+                        isPersistentPut = false;
+                        this.updates.push({
+                            updateOne: {
+                                filter: {
+                                    _id: doc._id
+                                },
+                                update: {
+                                    $set: {
+                                        op: 'MOVE',
+                                        target_op: targetOp
+                                    },
+                                    $unset: {
+                                        source_table: 1,
+                                        source_key: 1,
+                                        table: 1,
+                                        row_id: 1,
+                                        data: 1
+                                    }
+                                }
+                            }
+                        });
+                    }
+                    else {
+                        if (currentState.trackingSize >= idLimitBytes) {
+                            // Reached memory limit.
+                            // Keep the highest seen values in this case.
+                        }
+                        else {
+                            // flatstr reduces the memory usage by flattening the string
+                            currentState.seen.set(flatstr(key), doc._id.o);
+                            // length + 16 for the string
+                            // 24 for the bigint
+                            // 50 for map overhead
+                            // 50 for additional overhead
+                            currentState.trackingSize += key.length + 140;
+                        }
+                    }
+                }
+                if (isPersistentPut) {
+                    currentState.lastNotPut = null;
+                    currentState.opsSincePut = 0;
+                }
+                else if (doc.op != 'CLEAR') {
+                    if (currentState.lastNotPut == null) {
+                        currentState.lastNotPut = doc._id.o;
+                    }
+                    currentState.opsSincePut += 1;
+                }
+                if (this.updates.length >= this.moveBatchLimit) {
+                    await this.flush();
+                }
+            }
+        }
+        await this.flush();
+        currentState?.seen.clear();
+        if (currentState?.lastNotPut != null && currentState?.opsSincePut > 1) {
+            logger.info(`Inserting CLEAR at ${this.group_id}:${currentState.bucket}:${currentState.lastNotPut} to remove ${currentState.opsSincePut} operations`);
+            const bucket = currentState.bucket;
+            const clearOp = currentState.lastNotPut;
+            // Free memory before clearing bucket
+            currentState = null;
+            await this.clearBucket(bucket, clearOp);
+        }
+    }
+    async flush() {
+        if (this.updates.length > 0) {
+            logger.info(`Compacting ${this.updates.length} ops`);
+            await this.db.bucket_data.bulkWrite(this.updates, {
+                // Order is not important.
+                // Since checksums are not affected, these operations can happen in any order,
+                // and it's fine if the operations are partially applied.
+                // Each individual operation is atomic.
+                ordered: false
+            });
+            this.updates = [];
+        }
+    }
+    /**
+     * Perform a CLEAR compact for a bucket.
+     *
+     * @param bucket bucket name
+     * @param op op_id of the last non-PUT operation, which will be converted to CLEAR.
+     */
+    async clearBucket(bucket, op) {
+        const opFilter = {
+            _id: {
+                $gte: {
+                    g: this.group_id,
+                    b: bucket,
+                    o: new MinKey()
+                },
+                $lte: {
+                    g: this.group_id,
+                    b: bucket,
+                    o: op
+                }
+            }
+        };
+        const session = this.db.client.startSession();
+        try {
+            let done = false;
+            while (!done) {
+                // Do the CLEAR operation in batches, with each batch a separate transaction.
+                // The state after each batch is fully consistent.
+                // We need a transaction per batch to make sure checksums stay consistent.
+                await session.withTransaction(async () => {
+                    const query = this.db.bucket_data.find(opFilter, {
+                        session,
+                        sort: { _id: 1 },
+                        projection: {
+                            _id: 1,
+                            op: 1,
+                            checksum: 1,
+                            target_op: 1
+                        },
+                        limit: this.clearBatchLimit
+                    });
+                    let checksum = 0;
+                    let lastOpId = null;
+                    let targetOp = null;
+                    let gotAnOp = false;
+                    for await (let op of query.stream()) {
+                        if (op.op == 'MOVE' || op.op == 'REMOVE' || op.op == 'CLEAR') {
+                            checksum = addChecksums(checksum, op.checksum);
+                            lastOpId = op._id;
+                            if (op.op != 'CLEAR') {
+                                gotAnOp = true;
+                            }
+                            if (op.target_op != null) {
+                                if (targetOp == null || op.target_op > targetOp) {
+                                    targetOp = op.target_op;
+                                }
+                            }
+                        }
+                        else {
+                            throw new Error(`Unexpected ${op.op} operation at ${op._id.g}:${op._id.b}:${op._id.o}`);
+                        }
+                    }
+                    if (!gotAnOp) {
+                        done = true;
+                        return;
+                    }
+                    logger.info(`Flushing CLEAR at ${lastOpId?.o}`);
+                    await this.db.bucket_data.deleteMany({
+                        _id: {
+                            $gte: {
+                                g: this.group_id,
+                                b: bucket,
+                                o: new MinKey()
+                            },
+                            $lte: lastOpId
+                        }
+                    }, { session });
+                    await this.db.bucket_data.insertOne({
+                        _id: lastOpId,
+                        op: 'CLEAR',
+                        checksum: checksum,
+                        data: null,
+                        target_op: targetOp
+                    }, { session });
+                }, {
+                    writeConcern: { w: 'majority' },
+                    readConcern: { level: 'snapshot' }
+                });
+            }
+        }
+        finally {
+            await session.endSession();
+        }
+    }
+}
+/**
+ * Flattens string to reduce memory usage (around 320 bytes -> 120 bytes),
+ * at the cost of some upfront CPU usage.
+ *
+ * From: https://github.com/davidmarkclements/flatstr/issues/8
+ */
+function flatstr(s) {
+    s.match(/\n/g);
+    return s;
+}
+//# sourceMappingURL=MongoCompactor.js.map

package/dist/storage/mongo/MongoCompactor.js.map

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

package/dist/storage/mongo/MongoPersistedSyncRulesContent.d.ts

@@ -1,5 +1,5 @@
 import * as mongo from 'mongodb';
-import { PersistedSyncRulesContent } from '../BucketStorage.js';
+import { ParseSyncRulesOptions, PersistedSyncRulesContent } from '../BucketStorage.js';
 import { MongoPersistedSyncRules } from './MongoPersistedSyncRules.js';
 import { MongoSyncRulesLock } from './MongoSyncRulesLock.js';
 import { PowerSyncMongo } from './db.js';
@@ -15,6 +15,6 @@ export declare class MongoPersistedSyncRulesContent implements PersistedSyncRule
     readonly last_checkpoint_ts: Date | null;
     current_lock: MongoSyncRulesLock | null;
     constructor(db: PowerSyncMongo, doc: mongo.WithId<SyncRuleDocument>);
-    parsed(): MongoPersistedSyncRules;
+    parsed(options: ParseSyncRulesOptions): MongoPersistedSyncRules;
     lock(): Promise<MongoSyncRulesLock>;
 }

package/dist/storage/mongo/MongoPersistedSyncRulesContent.js

@@ -14,8 +14,8 @@ export class MongoPersistedSyncRulesContent {
         this.last_checkpoint_ts = doc.last_checkpoint_ts;
         this.last_keepalive_ts = doc.last_keepalive_ts;
     }
-    parsed() {
-        return new MongoPersistedSyncRules(this.id, SqlSyncRules.fromYaml(this.sync_rules_content), this.last_checkpoint_lsn, this.slot_name);
+    parsed(options) {
+        return new MongoPersistedSyncRules(this.id, SqlSyncRules.fromYaml(this.sync_rules_content, options), this.last_checkpoint_lsn, this.slot_name);
     }
     async lock() {
         const lock = await MongoSyncRulesLock.createLock(this.db, this);

package/dist/storage/mongo/MongoPersistedSyncRulesContent.js.map

@@ -1 +1 @@
-{"version":3,"file":"MongoPersistedSyncRulesContent.js","sourceRoot":"","sources":["../../../src/storage/mongo/MongoPersistedSyncRulesContent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAI7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAI7D,MAAM,OAAO,8BAA8B;IAYzC,YAAoB,EAAkB,EAAE,GAAmC;QAAvD,OAAE,GAAF,EAAE,CAAgB;QAF/B,iBAAY,GAA8B,IAAI,CAAC;QAGpD,IAAI,CAAC,EAAE,GAAG,GAAG,CAAC,GAAG,CAAC;QAClB,IAAI,CAAC,kBAAkB,GAAG,GAAG,CAAC,OAAO,CAAC;QACtC,IAAI,CAAC,mBAAmB,GAAG,GAAG,CAAC,mBAAmB,CAAC;QACnD,uBAAuB;QACvB,IAAI,CAAC,SAAS,GAAG,GAAG,CAAC,SAAS,IAAI,aAAa,IAAI,CAAC,EAAE,EAAE,CAAC;QACzD,IAAI,CAAC,gBAAgB,GAAG,GAAG,CAAC,gBAAgB,CAAC;QAC7C,IAAI,CAAC,kBAAkB,GAAG,GAAG,CAAC,kBAAkB,CAAC;QACjD,IAAI,CAAC,iBAAiB,GAAG,GAAG,CAAC,iBAAiB,CAAC;IACjD,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,uBAAuB,CAChC,IAAI,CAAC,EAAE,EACP,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAC9C,IAAI,CAAC,mBAAmB,EACxB,IAAI,CAAC,SAAS,CACf,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,IAAI;QACR,MAAM,IAAI,GAAG,MAAM,kBAAkB,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAChE,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
+{"version":3,"file":"MongoPersistedSyncRulesContent.js","sourceRoot":"","sources":["../../../src/storage/mongo/MongoPersistedSyncRulesContent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAI7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAI7D,MAAM,OAAO,8BAA8B;IAYzC,YAAoB,EAAkB,EAAE,GAAmC;QAAvD,OAAE,GAAF,EAAE,CAAgB;QAF/B,iBAAY,GAA8B,IAAI,CAAC;QAGpD,IAAI,CAAC,EAAE,GAAG,GAAG,CAAC,GAAG,CAAC;QAClB,IAAI,CAAC,kBAAkB,GAAG,GAAG,CAAC,OAAO,CAAC;QACtC,IAAI,CAAC,mBAAmB,GAAG,GAAG,CAAC,mBAAmB,CAAC;QACnD,uBAAuB;QACvB,IAAI,CAAC,SAAS,GAAG,GAAG,CAAC,SAAS,IAAI,aAAa,IAAI,CAAC,EAAE,EAAE,CAAC;QACzD,IAAI,CAAC,gBAAgB,GAAG,GAAG,CAAC,gBAAgB,CAAC;QAC7C,IAAI,CAAC,kBAAkB,GAAG,GAAG,CAAC,kBAAkB,CAAC;QACjD,IAAI,CAAC,iBAAiB,GAAG,GAAG,CAAC,iBAAiB,CAAC;IACjD,CAAC;IAED,MAAM,CAAC,OAA8B;QACnC,OAAO,IAAI,uBAAuB,CAChC,IAAI,CAAC,EAAE,EACP,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,kBAAkB,EAAE,OAAO,CAAC,EACvD,IAAI,CAAC,mBAAmB,EACxB,IAAI,CAAC,SAAS,CACf,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,IAAI;QACR,MAAM,IAAI,GAAG,MAAM,kBAAkB,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAChE,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}

package/dist/storage/mongo/MongoStorageProvider.d.ts

@@ -0,0 +1,5 @@
+import { BucketStorageProvider, ActiveStorage, GetStorageOptions } from '../StorageProvider.js';
+export declare class MongoStorageProvider implements BucketStorageProvider {
+    get type(): string;
+    getStorage(options: GetStorageOptions): Promise<ActiveStorage>;
+}

package/dist/storage/mongo/MongoStorageProvider.js

@@ -0,0 +1,26 @@
+import * as db from '../../db/db-index.js';
+import { MongoBucketStorage } from '../MongoBucketStorage.js';
+import { PowerSyncMongo } from './db.js';
+import { logger } from '@powersync/lib-services-framework';
+export class MongoStorageProvider {
+    get type() {
+        return 'mongodb';
+    }
+    async getStorage(options) {
+        const { resolvedConfig } = options;
+        const client = db.mongo.createMongoClient(resolvedConfig.storage);
+        const database = new PowerSyncMongo(client, { database: resolvedConfig.storage.database });
+        return {
+            storage: new MongoBucketStorage(database, {
+                // TODO currently need the entire resolved config due to this
+                slot_name_prefix: resolvedConfig.slot_name_prefix
+            }),
+            shutDown: () => client.close(),
+            tearDown: () => {
+                logger.info(`Tearing down storage: ${database.db.namespace}...`);
+                return database.db.dropDatabase();
+            }
+        };
+    }
+}
+//# sourceMappingURL=MongoStorageProvider.js.map

package/dist/storage/mongo/MongoStorageProvider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MongoStorageProvider.js","sourceRoot":"","sources":["../../../src/storage/mongo/MongoStorageProvider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,mCAAmC,CAAC;AAE3D,MAAM,OAAO,oBAAoB;IAC/B,IAAI,IAAI;QACN,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,OAA0B;QACzC,MAAM,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC;QAEnC,MAAM,MAAM,GAAG,EAAE,CAAC,KAAK,CAAC,iBAAiB,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAElE,MAAM,QAAQ,GAAG,IAAI,cAAc,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,cAAc,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QAE3F,OAAO;YACL,OAAO,EAAE,IAAI,kBAAkB,CAAC,QAAQ,EAAE;gBACxC,6DAA6D;gBAC7D,gBAAgB,EAAE,cAAc,CAAC,gBAAgB;aAClD,CAAC;YACF,QAAQ,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE;YAC9B,QAAQ,EAAE,GAAG,EAAE;gBACb,MAAM,CAAC,IAAI,CAAC,yBAAyB,QAAQ,CAAC,EAAE,CAAC,SAAS,KAAK,CAAC,CAAC;gBACjE,OAAO,QAAQ,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC;YACpC,CAAC;SACsB,CAAC;IAC5B,CAAC;CACF"}

package/dist/storage/mongo/MongoSyncBucketStorage.d.ts

@@ -1,29 +1,31 @@
 import { SqliteJsonRow, SqliteJsonValue, SqlSyncRules } from '@powersync/service-sync-rules';
 import * as util from '../../util/util-index.js';
-import { BucketDataBatchOptions, BucketStorageBatch, FlushedResult, ResolveTableOptions, ResolveTableResult, SyncRulesBucketStorage, SyncRuleStatus } from '../BucketStorage.js';
+import { BucketDataBatchOptions, BucketStorageBatch, CompactOptions, FlushedResult, ParseSyncRulesOptions, PersistedSyncRulesContent, ResolveTableOptions, ResolveTableResult, StartBatchOptions, SyncBucketDataBatch, SyncRulesBucketStorage, SyncRuleStatus, TerminateOptions } from '../BucketStorage.js';
 import { MongoBucketStorage } from '../MongoBucketStorage.js';
 export declare class MongoSyncBucketStorage implements SyncRulesBucketStorage {
     readonly factory: MongoBucketStorage;
     readonly group_id: number;
-    readonly sync_rules: SqlSyncRules;
+    private readonly sync_rules;
     readonly slot_name: string;
     private readonly db;
     private checksumCache;
-    constructor(factory: MongoBucketStorage, group_id: number, sync_rules: SqlSyncRules, slot_name: string);
+    private parsedSyncRulesCache;
+    constructor(factory: MongoBucketStorage, group_id: number, sync_rules: PersistedSyncRulesContent, slot_name: string);
+    getParsedSyncRules(options: ParseSyncRulesOptions): SqlSyncRules;
     getCheckpoint(): Promise<{
         checkpoint: string;
-        lsn: string;
     }>;
-    startBatch(options: {}, callback: (batch: BucketStorageBatch) => Promise<void>): Promise<FlushedResult | null>;
+    startBatch(options: StartBatchOptions, callback: (batch: BucketStorageBatch) => Promise<void>): Promise<FlushedResult | null>;
     resolveTable(options: ResolveTableOptions): Promise<ResolveTableResult>;
     getParameterSets(checkpoint: util.OpId, lookups: SqliteJsonValue[][]): Promise<SqliteJsonRow[]>;
-    getBucketDataBatch(checkpoint: util.OpId, dataBuckets: Map<string, string>, options?: BucketDataBatchOptions): AsyncIterable<util.SyncBucketData>;
+    getBucketDataBatch(checkpoint: util.OpId, dataBuckets: Map<string, string>, options?: BucketDataBatchOptions): AsyncIterable<SyncBucketDataBatch>;
     getChecksums(checkpoint: util.OpId, buckets: string[]): Promise<util.ChecksumMap>;
     private getChecksumsInternal;
-    terminate(): Promise<void>;
+    terminate(options?: TerminateOptions): Promise<void>;
     getStatus(): Promise<SyncRuleStatus>;
     clear(): Promise<void>;
     setSnapshotDone(lsn: string): Promise<void>;
     autoActivate(): Promise<void>;
     reportError(e: any): Promise<void>;
+    compact(options?: CompactOptions): Promise<void>;
 }

package/dist/storage/mongo/MongoSyncBucketStorage.js

@@ -1,13 +1,13 @@
 import * as bson from 'bson';
 import * as db from '../../db/db-index.js';
-import * as replication from '../../replication/WalStream.js';
 import * as util from '../../util/util-index.js';
 import { DEFAULT_DOCUMENT_BATCH_LIMIT, DEFAULT_DOCUMENT_CHUNK_LIMIT_BYTES } from '../BucketStorage.js';
+import { ChecksumCache } from '../ChecksumCache.js';
 import { SourceTable } from '../SourceTable.js';
 import { SyncRuleState } from './models.js';
 import { MongoBucketBatch } from './MongoBucketBatch.js';
-import { BSON_DESERIALIZE_OPTIONS, idPrefixFilter, readSingleBatch, serializeLookup } from './util.js';
-import { ChecksumCache } from '../ChecksumCache.js';
+import { MongoCompactor } from './MongoCompactor.js';
+import { BSON_DESERIALIZE_OPTIONS, idPrefixFilter, mapOpEntry, readSingleBatch, serializeLookup } from './util.js';
 export class MongoSyncBucketStorage {
     constructor(factory, group_id, sync_rules, slot_name) {
         this.factory = factory;
@@ -21,13 +21,16 @@ export class MongoSyncBucketStorage {
         });
         this.db = factory.db;
     }
+    getParsedSyncRules(options) {
+        this.parsedSyncRulesCache ?? (this.parsedSyncRulesCache = this.sync_rules.parsed(options).sync_rules);
+        return this.parsedSyncRulesCache;
+    }
     async getCheckpoint() {
         const doc = await this.db.sync_rules.findOne({ _id: this.group_id }, {
-            projection: { last_checkpoint: 1, last_checkpoint_lsn: 1 }
+            projection: { last_checkpoint: 1 }
         });
         return {
-            checkpoint: util.timestampToOpId(doc?.last_checkpoint ?? 0n),
-            lsn: doc?.last_checkpoint_lsn ?? replication.ZERO_LSN
+            checkpoint: util.timestampToOpId(doc?.last_checkpoint ?? 0n)
         };
     }
     async startBatch(options, callback) {
@@ -35,7 +38,7 @@ export class MongoSyncBucketStorage {
             _id: this.group_id
         }, { projection: { last_checkpoint_lsn: 1, no_checkpoint_before: 1 } });
         const checkpoint_lsn = doc?.last_checkpoint_lsn ?? null;
-        const batch = new MongoBucketBatch(this.db, this.sync_rules, this.group_id, this.slot_name, checkpoint_lsn, doc?.no_checkpoint_before ?? null);
+        const batch = new MongoBucketBatch(this.db, this.sync_rules.parsed(options).sync_rules, this.group_id, this.slot_name, checkpoint_lsn, doc?.no_checkpoint_before ?? options.zeroLSN);
         try {
             await callback(batch);
             await batch.flush();
@@ -53,16 +56,20 @@ export class MongoSyncBucketStorage {
         }
     }
     async resolveTable(options) {
-        const { group_id, connection_id, connection_tag, relation } = options;
-        const { schema, name: table, relationId, replicationColumns } = relation;
-        const columns = replicationColumns.map((column) => ({ name: column.name, type_oid: column.typeOid }));
+        const { group_id, connection_id, connection_tag, entity_descriptor } = options;
+        const { schema, name: table, objectId, replicationColumns } = entity_descriptor;
+        const columns = replicationColumns.map((column) => ({
+            name: column.name,
+            type: column.type,
+            type_oid: column.typeId
+        }));
         let result = null;
         await this.db.client.withSession(async (session) => {
             const col = this.db.source_tables;
             let doc = await col.findOne({
                 group_id: group_id,
                 connection_id: connection_id,
-                relation_id: relationId,
+                relation_id: objectId,
                 schema_name: schema,
                 table_name: table,
                 replica_id_columns2: columns
@@ -72,7 +79,7 @@ export class MongoSyncBucketStorage {
                     _id: new bson.ObjectId(),
                     group_id: group_id,
                     connection_id: connection_id,
-                    relation_id: relationId,
+                    relation_id: objectId,
                     schema_name: schema,
                     table_name: table,
                     replica_id_columns: null,
@@ -81,7 +88,7 @@ export class MongoSyncBucketStorage {
                 };
                 await col.insertOne(doc, { session });
             }
-            const sourceTable = new SourceTable(doc._id, connection_tag, relationId, schema, table, replicationColumns, doc.snapshot_done ?? true);
+            const sourceTable = new SourceTable(doc._id, connection_tag, objectId, schema, table, replicationColumns, doc.snapshot_done ?? true);
             sourceTable.syncData = options.sync_rules.tableSyncsData(sourceTable);
             sourceTable.syncParameters = options.sync_rules.tableSyncsParameters(sourceTable);
             const truncate = await col
@@ -89,12 +96,12 @@ export class MongoSyncBucketStorage {
                 group_id: group_id,
                 connection_id: connection_id,
                 _id: { $ne: doc._id },
-                $or: [{ relation_id: relationId }, { schema_name: schema, table_name: table }]
+                $or: [{ relation_id: objectId }, { schema_name: schema, table_name: table }]
             }, { session })
                 .toArray();
             result = {
                 table: sourceTable,
-                dropTables: truncate.map((doc) => new SourceTable(doc._id, connection_tag, doc.relation_id ?? 0, doc.schema_name, doc.table_name, doc.replica_id_columns2?.map((c) => ({ name: c.name, typeOid: c.type_oid })) ?? [], doc.snapshot_done ?? true))
+                dropTables: truncate.map((doc) => new SourceTable(doc._id, connection_tag, doc.relation_id ?? 0, doc.schema_name, doc.table_name, doc.replica_id_columns2?.map((c) => ({ name: c.name, typeOid: c.type_oid, type: c.type })) ?? [], doc.snapshot_done ?? true))
             };
         });
         return result;
@@ -189,6 +196,7 @@ export class MongoSyncBucketStorage {
         }
         let batchSize = 0;
         let currentBatch = null;
+        let targetOp = null;
         // Ordered by _id, meaning buckets are grouped together
         for (let rawData of data) {
             const row = bson.deserialize(rawData, BSON_DESERIALIZE_OPTIONS);
@@ -203,7 +211,8 @@ export class MongoSyncBucketStorage {
                     start = currentBatch.after;
                     currentBatch = null;
                     batchSize = 0;
-                    yield yieldBatch;
+                    yield { batch: yieldBatch, targetOp: targetOp };
+                    targetOp = null;
                 }
                 start ?? (start = dataBuckets.get(bucket));
                 if (start == null) {
@@ -216,16 +225,15 @@ export class MongoSyncBucketStorage {
                     data: [],
                     next_after: start
                 };
+                targetOp = null;
+            }
+            const entry = mapOpEntry(row);
+            if (row.target_op != null) {
+                // MOVE, CLEAR
+                if (targetOp == null || row.target_op > targetOp) {
+                    targetOp = row.target_op;
+                }
             }
-            const entry = {
-                op_id: util.timestampToOpId(row._id.o),
-                op: row.op,
-                object_type: row.table,
-                object_id: row.row_id,
-                checksum: Number(row.checksum),
-                subkey: `${row.source_table}/${row.source_key.toHexString()}`,
-                data: row.data
-            };
             currentBatch.data.push(entry);
             currentBatch.next_after = entry.op_id;
             batchSize += rawData.byteLength;
@@ -233,7 +241,8 @@ export class MongoSyncBucketStorage {
         if (currentBatch != null) {
             const yieldBatch = currentBatch;
             currentBatch = null;
-            yield yieldBatch;
+            yield { batch: yieldBatch, targetOp: targetOp };
+            targetOp = null;
         }
     }
     async getChecksums(checkpoint, buckets) {
@@ -283,8 +292,11 @@ export class MongoSyncBucketStorage {
             ];
         }));
     }
-    async terminate() {
-        await this.clear();
+    async terminate(options) {
+        // Default is to clear the storage except when explicitly requested not to.
+        if (!options || options?.clearStorage) {
+            await this.clear();
+        }
         await this.db.sync_rules.updateOne({
             _id: this.group_id
         }, {
@@ -387,5 +399,8 @@ export class MongoSyncBucketStorage {
             }
         });
     }
+    async compact(options) {
+        return new MongoCompactor(this.db, this.group_id, options).compact();
+    }
 }
 //# sourceMappingURL=MongoSyncBucketStorage.js.map