@powersync/service-core-tests 0.13.2 → 0.15.0

package/CHANGELOG.md

@@ -1,5 +1,48 @@
 # @powersync/service-core-tests
 
+## 0.15.0
+
+### Minor Changes
+
+- 8c5bb3b: [Internal] Allow using multiple BucketStorageBatch instances concurrently.
+- c15efc7: [Internal] Track and propagate source on buckets and parameter indexes to storage APIs.
+
+### Patch Changes
+
+- 642cb11: [Postgres Storage] Fix concurrency issue in compacting, leading to "[PSYNC_S1101] Unexpected PUT operation".
+- Updated dependencies [8c5bb3b]
+- Updated dependencies [dcddcf1]
+- Updated dependencies [c15efc7]
+- Updated dependencies [e7152ce]
+- Updated dependencies [e150c5c]
+- Updated dependencies [b410924]
+  - @powersync/service-core@1.20.1
+  - @powersync/service-sync-rules@0.33.0
+
+## 0.14.0
+
+### Minor Changes
+
+- 8a4c34e: Refactor `BucketStorageFactory` and `PersistedSyncRulesContent` to be abstract classes instead of interfaces.
+- 8bd83e8: Introduce storage versions.
+
+### Patch Changes
+
+- Updated dependencies [0998251]
+- Updated dependencies [65f3c89]
+- Updated dependencies [1c45667]
+- Updated dependencies [8785a3f]
+- Updated dependencies [8a4c34e]
+- Updated dependencies [b440093]
+- Updated dependencies [d7ff4ad]
+- Updated dependencies [c683322]
+- Updated dependencies [8bd83e8]
+- Updated dependencies [83989b2]
+- Updated dependencies [79a9729]
+- Updated dependencies [5edd95f]
+  - @powersync/service-core@1.20.0
+  - @powersync/service-sync-rules@0.32.0
+
 ## 0.13.2
 
 ### Patch Changes

package/dist/test-utils/general-utils.d.ts

@@ -1,17 +1,23 @@
-import { storage, utils } from '@powersync/service-core';
+import { BucketDataRequest, InternalOpId, storage, utils } from '@powersync/service-core';
 import { GetQuerierOptions, RequestParameters } from '@powersync/service-sync-rules';
 import * as bson from 'bson';
 export declare const ZERO_LSN = "0/0";
 export declare const PARSE_OPTIONS: storage.ParseSyncRulesOptions;
 export declare const BATCH_OPTIONS: storage.StartBatchOptions;
-export declare function testRules(content: string): storage.PersistedSyncRulesContent;
-export declare function makeTestTable(name: string, replicaIdColumns?: string[] | undefined): storage.SourceTable;
+export declare function makeTestTable(name: string, replicaIdColumns?: string[] | undefined, options?: {
+    tableIdStrings: boolean;
+}): storage.SourceTable;
 export declare function getBatchData(batch: utils.SyncBucketData[] | storage.SyncBucketDataChunk[] | storage.SyncBucketDataChunk): {
     op_id: string;
     op: "PUT" | "REMOVE" | "MOVE" | "CLEAR";
     object_id: string | undefined;
     checksum: number | bigint;
 }[];
+/**
+ * Bucket names no longer purely depend on the sync rules.
+ * This converts a bucket name like "global[]" into the actual bucket name, for use in tests.
+ */
+export declare function bucketRequest(syncRules: storage.PersistedSyncRulesContent | storage.PersistedSyncRules, bucket: string, start?: InternalOpId | string | number): BucketDataRequest;
 export declare function getBatchMeta(batch: utils.SyncBucketData[] | storage.SyncBucketDataChunk[] | storage.SyncBucketDataChunk): {
     has_more: boolean;
     after: string;

package/dist/test-utils/general-utils.js

@@ -1,6 +1,4 @@
 import { storage, utils } from '@powersync/service-core';
-import { SqlSyncRules } from '@powersync/service-sync-rules';
-import { versionedHydrationState } from '@powersync/service-sync-rules/src/HydrationState.js';
 import * as bson from 'bson';
 export const ZERO_LSN = '0/0';
 export const PARSE_OPTIONS = {
@@ -11,31 +9,9 @@ export const BATCH_OPTIONS = {
     zeroLSN: ZERO_LSN,
     storeCurrentData: true
 };
-export function testRules(content) {
-    return {
-        id: 1,
-        sync_rules_content: content,
-        slot_name: 'test',
-        active: true,
-        last_checkpoint_lsn: '',
-        parsed(options) {
-            return {
-                id: 1,
-                sync_rules: SqlSyncRules.fromYaml(content, options),
-                slot_name: 'test',
-                hydratedSyncRules() {
-                    return this.sync_rules.config.hydrate({ hydrationState: versionedHydrationState(1) });
-                }
-            };
-        },
-        lock() {
-            throw new Error('Not implemented');
-        }
-    };
-}
-export function makeTestTable(name, replicaIdColumns) {
+export function makeTestTable(name, replicaIdColumns, options) {
     const relId = utils.hashData('table', name, (replicaIdColumns ?? ['id']).join(','));
-    const id = new bson.ObjectId('6544e3899293153fa7b38331');
+    const id = options?.tableIdStrings == false ? new bson.ObjectId('6544e3899293153fa7b38331') : '6544e3899293153fa7b38331';
     return new storage.SourceTable({
         id: id,
         connectionTag: storage.SourceTable.DEFAULT_TAG,
@@ -60,6 +36,30 @@ export function getBatchData(batch) {
         };
     });
 }
+function isParsedSyncRules(syncRules) {
+    return syncRules.sync_rules !== undefined;
+}
+/**
+ * Bucket names no longer purely depend on the sync rules.
+ * This converts a bucket name like "global[]" into the actual bucket name, for use in tests.
+ */
+export function bucketRequest(syncRules, bucket, start) {
+    const parsed = isParsedSyncRules(syncRules) ? syncRules : syncRules.parsed(PARSE_OPTIONS);
+    const hydrationState = parsed.hydrationState;
+    const parameterStart = bucket.indexOf('[');
+    const definitionName = bucket.substring(0, parameterStart);
+    const parameters = bucket.substring(parameterStart);
+    const source = parsed.sync_rules.config.bucketDataSources.find((b) => b.uniqueName === definitionName);
+    if (source == null) {
+        throw new Error(`Failed to find global bucket ${bucket}`);
+    }
+    const bucketName = hydrationState.getBucketSourceScope(source).bucketPrefix + parameters;
+    return {
+        bucket: bucketName,
+        start: BigInt(start ?? 0n),
+        source: source
+    };
+}
 export function getBatchMeta(batch) {
     const first = getFirst(batch);
     if (first == null) {

package/dist/test-utils/general-utils.js.map

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

package/dist/tests/register-compacting-tests.d.ts

@@ -1,2 +1,2 @@
 import { storage } from '@powersync/service-core';
-export declare function registerCompactTests(generateStorageFactory: storage.TestStorageFactory): void;
+export declare function registerCompactTests(config: storage.TestStorageConfig): void;

package/dist/tests/register-compacting-tests.js

@@ -50,24 +50,26 @@ var __disposeResources = (this && this.__disposeResources) || (function (Suppres
     var e = new Error(message);
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 });
-import { storage } from '@powersync/service-core';
+import { addChecksums, storage, updateSyncRulesFromYaml } from '@powersync/service-core';
 import { expect, test } from 'vitest';
 import * as test_utils from '../test-utils/test-utils-index.js';
-const TEST_TABLE = test_utils.makeTestTable('test', ['id']);
-export function registerCompactTests(generateStorageFactory) {
+import { bucketRequest } from '../test-utils/test-utils-index.js';
+import { bucketRequestMap, bucketRequests } from './util.js';
+export function registerCompactTests(config) {
+    const generateStorageFactory = config.factory;
+    const TEST_TABLE = test_utils.makeTestTable('test', ['id'], config);
     test('compacting (1)', async () => {
         const env_1 = { stack: [], error: void 0, hasError: false };
         try {
             const factory = __addDisposableResource(env_1, await generateStorageFactory(), true);
-            const syncRules = await factory.updateSyncRules({
-                content: `
+            const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
     data: [select * from test]
-    `
-            });
+    `));
             const bucketStorage = factory.getInstance(syncRules);
             const result = await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
+                await batch.markAllSnapshotDone('1/1');
                 await batch.save({
                     sourceTable: TEST_TABLE,
                     tag: storage.SaveOperationTag.INSERT,
@@ -95,24 +97,22 @@ bucket_definitions:
                 await batch.commit('1/1');
             });
             const checkpoint = result.flushed_op;
-            const batchBefore = await test_utils.oneFromAsync(bucketStorage.getBucketDataBatch(checkpoint, new Map([['global[]', 0n]])));
+            const request = bucketRequest(syncRules, 'global[]');
+            const batchBefore = await test_utils.oneFromAsync(bucketStorage.getBucketDataBatch(checkpoint, [request]));
             const dataBefore = batchBefore.chunkData.data;
-            const checksumBefore = await bucketStorage.getChecksums(checkpoint, ['global[]']);
+            const checksumBefore = await bucketStorage.getChecksums(checkpoint, [request]);
             expect(dataBefore).toMatchObject([
                 {
-                    checksum: 2634521662,
                     object_id: 't1',
                     op: 'PUT',
                     op_id: '1'
                 },
                 {
-                    checksum: 4243212114,
                     object_id: 't2',
                     op: 'PUT',
                     op_id: '2'
                 },
                 {
-                    checksum: 4243212114,
                     object_id: 't2',
                     op: 'PUT',
                     op_id: '3'
@@ -126,33 +126,28 @@ bucket_definitions:
                 minBucketChanges: 1,
                 minChangeRatio: 0
             });
-            const batchAfter = await test_utils.oneFromAsync(bucketStorage.getBucketDataBatch(checkpoint, new Map([['global[]', 0n]])));
+            const batchAfter = await test_utils.oneFromAsync(bucketStorage.getBucketDataBatch(checkpoint, [request]));
             const dataAfter = batchAfter.chunkData.data;
-            const checksumAfter = await bucketStorage.getChecksums(checkpoint, ['global[]']);
+            const checksumAfter = await bucketStorage.getChecksums(checkpoint, [request]);
             bucketStorage.clearChecksumCache();
-            const checksumAfter2 = await bucketStorage.getChecksums(checkpoint, ['global[]']);
+            const checksumAfter2 = await bucketStorage.getChecksums(checkpoint, [request]);
             expect(batchAfter.targetOp).toEqual(3n);
             expect(dataAfter).toMatchObject([
+                dataBefore[0],
                 {
-                    checksum: 2634521662,
-                    object_id: 't1',
-                    op: 'PUT',
-                    op_id: '1'
-                },
-                {
-                    checksum: 4243212114,
+                    checksum: dataBefore[1].checksum,
                     op: 'MOVE',
                     op_id: '2'
                 },
                 {
-                    checksum: 4243212114,
+                    checksum: dataBefore[2].checksum,
                     object_id: 't2',
                     op: 'PUT',
                     op_id: '3'
                 }
             ]);
-            expect(checksumAfter.get('global[]')).toEqual(checksumBefore.get('global[]'));
-            expect(checksumAfter2.get('global[]')).toEqual(checksumBefore.get('global[]'));
+            expect(checksumAfter.get(request.bucket)).toEqual(checksumBefore.get(request.bucket));
+            expect(checksumAfter2.get(request.bucket)).toEqual(checksumBefore.get(request.bucket));
             test_utils.validateCompactedBucket(dataBefore, dataAfter);
         }
         catch (e_1) {
@@ -169,15 +164,14 @@ bucket_definitions:
         const env_2 = { stack: [], error: void 0, hasError: false };
         try {
             const factory = __addDisposableResource(env_2, await generateStorageFactory(), true);
-            const syncRules = await factory.updateSyncRules({
-                content: `
+            const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
     data: [select * from test]
-    `
-            });
+    `));
             const bucketStorage = factory.getInstance(syncRules);
             const result = await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
+                await batch.markAllSnapshotDone('1/1');
                 await batch.save({
                     sourceTable: TEST_TABLE,
                     tag: storage.SaveOperationTag.INSERT,
@@ -213,33 +207,27 @@ bucket_definitions:
                 await batch.commit('1/1');
             });
             const checkpoint = result.flushed_op;
-            const batchBefore = await test_utils.oneFromAsync(bucketStorage.getBucketDataBatch(checkpoint, new Map([['global[]', 0n]])));
+            const request = bucketRequest(syncRules, 'global[]');
+            const batchBefore = await test_utils.oneFromAsync(bucketStorage.getBucketDataBatch(checkpoint, [request]));
             const dataBefore = batchBefore.chunkData.data;
-            const checksumBefore = await bucketStorage.getChecksums(checkpoint, ['global[]']);
+            const checksumBefore = await bucketStorage.getChecksums(checkpoint, [request]);
+            // op_id sequence depends on the storage implementation
             expect(dataBefore).toMatchObject([
                 {
-                    checksum: 2634521662,
                     object_id: 't1',
-                    op: 'PUT',
-                    op_id: '1'
+                    op: 'PUT'
                 },
                 {
-                    checksum: 4243212114,
                     object_id: 't2',
-                    op: 'PUT',
-                    op_id: '2'
+                    op: 'PUT'
                 },
                 {
-                    checksum: 4228978084,
                     object_id: 't1',
-                    op: 'REMOVE',
-                    op_id: '3'
+                    op: 'REMOVE'
                 },
                 {
-                    checksum: 4243212114,
                     object_id: 't2',
-                    op: 'PUT',
-                    op_id: '4'
+                    op: 'PUT'
                 }
             ]);
             await bucketStorage.compact({
@@ -249,26 +237,24 @@ bucket_definitions:
                 minBucketChanges: 1,
                 minChangeRatio: 0
             });
-            const batchAfter = await test_utils.oneFromAsync(bucketStorage.getBucketDataBatch(checkpoint, new Map([['global[]', 0n]])));
+            const batchAfter = await test_utils.oneFromAsync(bucketStorage.getBucketDataBatch(checkpoint, [request]));
             const dataAfter = batchAfter.chunkData.data;
             bucketStorage.clearChecksumCache();
-            const checksumAfter = await bucketStorage.getChecksums(checkpoint, ['global[]']);
-            expect(batchAfter.targetOp).toEqual(4n);
+            const checksumAfter = await bucketStorage.getChecksums(checkpoint, [request]);
+            expect(batchAfter.targetOp).toBeLessThanOrEqual(checkpoint);
             expect(dataAfter).toMatchObject([
                 {
-                    checksum: -1778190028,
-                    op: 'CLEAR',
-                    op_id: '3'
+                    checksum: addChecksums(addChecksums(dataBefore[0].checksum, dataBefore[1].checksum), dataBefore[2].checksum),
+                    op: 'CLEAR'
                 },
                 {
-                    checksum: 4243212114,
+                    checksum: dataBefore[3].checksum,
                     object_id: 't2',
-                    op: 'PUT',
-                    op_id: '4'
+                    op: 'PUT'
                 }
             ]);
-            expect(checksumAfter.get('global[]')).toEqual({
-                ...checksumBefore.get('global[]'),
+            expect(checksumAfter.get(request.bucket)).toEqual({
+                ...checksumBefore.get(request.bucket),
                 count: 2
             });
             test_utils.validateCompactedBucket(dataBefore, dataAfter);
@@ -287,15 +273,14 @@ bucket_definitions:
         const env_3 = { stack: [], error: void 0, hasError: false };
         try {
             const factory = __addDisposableResource(env_3, await generateStorageFactory(), true);
-            const syncRules = await factory.updateSyncRules({
-                content: `
+            const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
     data: [select * from test]
-    `
-            });
+    `));
             const bucketStorage = factory.getInstance(syncRules);
             const result = await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
+                await batch.markAllSnapshotDone('1/1');
                 await batch.save({
                     sourceTable: TEST_TABLE,
                     tag: storage.SaveOperationTag.INSERT,
@@ -323,7 +308,8 @@ bucket_definitions:
                 await batch.commit('1/1');
             });
             const checkpoint1 = result.flushed_op;
-            const checksumBefore = await bucketStorage.getChecksums(checkpoint1, ['global[]']);
+            const request = bucketRequest(syncRules, 'global[]');
+            const checksumBefore = await bucketStorage.getChecksums(checkpoint1, [request]);
             const result2 = await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
                 await batch.save({
                     sourceTable: TEST_TABLE,
@@ -343,22 +329,19 @@ bucket_definitions:
                 minBucketChanges: 1,
                 minChangeRatio: 0
             });
-            const batchAfter = await test_utils.oneFromAsync(bucketStorage.getBucketDataBatch(checkpoint2, new Map([['global[]', 0n]])));
+            const batchAfter = await test_utils.oneFromAsync(bucketStorage.getBucketDataBatch(checkpoint2, [request]));
             const dataAfter = batchAfter.chunkData.data;
             await bucketStorage.clearChecksumCache();
-            const checksumAfter = await bucketStorage.getChecksums(checkpoint2, ['global[]']);
-            expect(batchAfter.targetOp).toEqual(4n);
+            const checksumAfter = await bucketStorage.getChecksums(checkpoint2, [request]);
             expect(dataAfter).toMatchObject([
                 {
-                    checksum: 1874612650,
-                    op: 'CLEAR',
-                    op_id: '4'
+                    op: 'CLEAR'
                 }
             ]);
-            expect(checksumAfter.get('global[]')).toEqual({
-                bucket: 'global[]',
+            expect(checksumAfter.get(request.bucket)).toEqual({
+                bucket: request.bucket,
                 count: 1,
-                checksum: 1874612650
+                checksum: dataAfter[0].checksum
             });
         }
         catch (e_3) {
@@ -375,18 +358,17 @@ bucket_definitions:
         const env_4 = { stack: [], error: void 0, hasError: false };
         try {
             const factory = __addDisposableResource(env_4, await generateStorageFactory(), true);
-            const syncRules = await factory.updateSyncRules({
-                /* yaml */ content: ` bucket_definitions:
+            const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(` bucket_definitions:
           grouped:
             # The parameter query here is not important
             # We specifically don't want to create bucket_parameter records here
             # since the op_ids for bucket_data could vary between storage implementations.
             parameters: select 'b' as b
             data:
-              - select * from test where b = bucket.b`
-            });
+              - select * from test where b = bucket.b`));
             const bucketStorage = factory.getInstance(syncRules);
             const result = await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
+                await batch.markAllSnapshotDone('1/1');
                 /**
                  * Repeatedly create operations which fall into different buckets.
                  * The bucket operations are purposely interleaved as the op_id increases.
@@ -456,7 +438,7 @@ bucket_definitions:
                 minBucketChanges: 1,
                 minChangeRatio: 0
             });
-            const batchAfter = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, new Map([
+            const batchAfter = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, bucketRequestMap(syncRules, [
                 ['grouped["b1"]', 0n],
                 ['grouped["b2"]', 0n]
             ])));
@@ -499,15 +481,14 @@ bucket_definitions:
         const env_5 = { stack: [], error: void 0, hasError: false };
         try {
             const factory = __addDisposableResource(env_5, await generateStorageFactory(), true);
-            const syncRules = await factory.updateSyncRules({
-                content: `
+            const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
     data: [select * from test]
-    `
-            });
+    `));
             const bucketStorage = factory.getInstance(syncRules);
-            const result = await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
+            await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
+                await batch.markAllSnapshotDone('1/1');
                 await batch.save({
                     sourceTable: TEST_TABLE,
                     tag: storage.SaveOperationTag.INSERT,
@@ -553,13 +534,16 @@ bucket_definitions:
                 await batch.commit('2/1');
             });
             const checkpoint2 = result2.flushed_op;
+            const request = bucketRequest(syncRules, 'global[]');
             await bucketStorage.clearChecksumCache();
-            const checksumAfter = await bucketStorage.getChecksums(checkpoint2, ['global[]']);
-            expect(checksumAfter.get('global[]')).toEqual({
-                bucket: 'global[]',
-                count: 4,
-                checksum: 1874612650
+            const checksumAfter = await bucketStorage.getChecksums(checkpoint2, [request]);
+            const globalChecksum = checksumAfter.get(request.bucket);
+            expect(globalChecksum).toMatchObject({
+                bucket: request.bucket,
+                count: 4
             });
+            // storage-specific checksum - just check that it does not change
+            expect(globalChecksum).toMatchSnapshot();
         }
         catch (e_5) {
             env_5.error = e_5;
@@ -575,15 +559,14 @@ bucket_definitions:
         const env_6 = { stack: [], error: void 0, hasError: false };
         try {
             const factory = __addDisposableResource(env_6, await generateStorageFactory(), true);
-            const syncRules = await factory.updateSyncRules({
-                content: `
+            const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
     data: [select * from test]
-    `
-            });
+    `));
             const bucketStorage = factory.getInstance(syncRules);
             const result = await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
+                await batch.markAllSnapshotDone('1/1');
                 await batch.save({
                     sourceTable: TEST_TABLE,
                     tag: storage.SaveOperationTag.INSERT,
@@ -603,7 +586,7 @@ bucket_definitions:
                 await batch.commit('1/1');
             });
             // Get checksums here just to populate the cache
-            await bucketStorage.getChecksums(result.flushed_op, ['global[]']);
+            await bucketStorage.getChecksums(result.flushed_op, bucketRequests(syncRules, ['global[]']));
             const result2 = await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
                 await batch.save({
                     sourceTable: TEST_TABLE,
@@ -623,13 +606,16 @@ bucket_definitions:
                 minChangeRatio: 0
             });
             const checkpoint2 = result2.flushed_op;
+            const request = bucketRequest(syncRules, 'global[]');
             // Check that the checksum was correctly updated with the clear operation after having a cached checksum
-            const checksumAfter = await bucketStorage.getChecksums(checkpoint2, ['global[]']);
-            expect(checksumAfter.get('global[]')).toMatchObject({
-                bucket: 'global[]',
-                count: 1,
-                checksum: -1481659821
+            const checksumAfter = await bucketStorage.getChecksums(checkpoint2, [request]);
+            const globalChecksum = checksumAfter.get(request.bucket);
+            expect(globalChecksum).toMatchObject({
+                bucket: request.bucket,
+                count: 1
             });
+            // storage-specific checksum - just check that it does not change
+            expect(globalChecksum).toMatchSnapshot();
         }
         catch (e_6) {
             env_6.error = e_6;
@@ -641,5 +627,62 @@ bucket_definitions:
                 await result_6;
         }
     });
+    test('defaults maxOpId to current checkpoint', async () => {
+        const env_7 = { stack: [], error: void 0, hasError: false };
+        try {
+            const factory = __addDisposableResource(env_7, await generateStorageFactory(), true);
+            const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
+bucket_definitions:
+  global:
+    data: [select * from test]
+      `));
+            const bucketStorage = factory.getInstance(syncRules);
+            const result1 = await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
+                await batch.markAllSnapshotDone('1/1');
+                await batch.save({
+                    sourceTable: TEST_TABLE,
+                    tag: storage.SaveOperationTag.INSERT,
+                    after: { id: 't1' },
+                    afterReplicaId: test_utils.rid('t1')
+                });
+                await batch.commit('1/1');
+            });
+            const checkpoint1 = result1.flushed_op;
+            const result2 = await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
+                // This is flushed but not committed (does not advance the checkpoint)
+                await batch.save({
+                    sourceTable: TEST_TABLE,
+                    tag: storage.SaveOperationTag.UPDATE,
+                    after: { id: 't1' },
+                    afterReplicaId: test_utils.rid('t1')
+                });
+            });
+            const checkpoint2 = result2.flushed_op;
+            const checkpointBeforeCompact = await bucketStorage.getCheckpoint();
+            expect(checkpointBeforeCompact.checkpoint).toEqual(checkpoint1);
+            // With default options, Postgres compaction should use the active checkpoint.
+            await bucketStorage.compact({
+                moveBatchLimit: 1,
+                moveBatchQueryLimit: 1,
+                minBucketChanges: 1,
+                minChangeRatio: 0
+            });
+            const batchAfterDefaultCompact = await test_utils.oneFromAsync(bucketStorage.getBucketDataBatch(checkpoint2, bucketRequestMap(syncRules, [['global[]', 0n]])));
+            // Operation 1 should remain a PUT because op_id=2 is above the default maxOpId checkpoint.
+            expect(batchAfterDefaultCompact.chunkData.data).toMatchObject([
+                { op_id: '1', op: 'PUT', object_id: 't1' },
+                { op_id: '2', op: 'PUT', object_id: 't1' }
+            ]);
+        }
+        catch (e_7) {
+            env_7.error = e_7;
+            env_7.hasError = true;
+        }
+        finally {
+            const result_7 = __disposeResources(env_7);
+            if (result_7)
+                await result_7;
+        }
+    });
 }
 //# sourceMappingURL=register-compacting-tests.js.map