@powersync/service-core-tests 0.15.0 → 0.15.2

package/dist/tests/register-data-storage-data-tests.js

@@ -54,7 +54,6 @@ import { CURRENT_STORAGE_VERSION, getUuidReplicaIdentityBson, reduceBucket, stor
 import { describe, expect, test } from 'vitest';
 import * as test_utils from '../test-utils/test-utils-index.js';
 import { bucketRequest } from '../test-utils/test-utils-index.js';
-import { bucketRequestMap, bucketRequests } from './util.js';
 /**
  * Normalize data from OplogEntries for comparison in tests.
  * Tests typically expect the stringified result
@@ -78,7 +77,6 @@ const normalizeOplogData = (data) => {
 export function registerDataStorageDataTests(config) {
     const generateStorageFactory = config.factory;
     const storageVersion = config.storageVersion ?? storage.CURRENT_STORAGE_VERSION;
-    const TEST_TABLE = test_utils.makeTestTable('test', ['id'], config);
     test('removing row', async () => {
         const env_1 = { stack: [], error: void 0, hasError: false };
         try {
@@ -90,27 +88,27 @@ bucket_definitions:
       - SELECT id, description FROM "%"
 `, { storageVersion }));
             const bucketStorage = factory.getInstance(syncRules);
-            await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
-                const sourceTable = TEST_TABLE;
-                await batch.markAllSnapshotDone('1/1');
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.INSERT,
-                    after: {
-                        id: 'test1',
-                        description: 'test1'
-                    },
-                    afterReplicaId: test_utils.rid('test1')
-                });
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.DELETE,
-                    beforeReplicaId: test_utils.rid('test1')
-                });
-                await batch.commit('1/1');
+            const writer = __addDisposableResource(env_1, await bucketStorage.createWriter(test_utils.BATCH_OPTIONS), true);
+            const testTable = await test_utils.resolveTestTable(writer, 'test', ['id'], config);
+            await writer.markAllSnapshotDone('1/1');
+            await writer.save({
+                sourceTable: testTable,
+                tag: storage.SaveOperationTag.INSERT,
+                after: {
+                    id: 'test1',
+                    description: 'test1'
+                },
+                afterReplicaId: test_utils.rid('test1')
             });
+            await writer.save({
+                sourceTable: testTable,
+                tag: storage.SaveOperationTag.DELETE,
+                beforeReplicaId: test_utils.rid('test1')
+            });
+            await writer.commit('1/1');
             const { checkpoint } = await bucketStorage.getCheckpoint();
-            const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, bucketRequestMap(syncRules, [['global[]', 0n]])));
+            const request = bucketRequest(syncRules, 'global[]');
+            const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, [request]));
             const data = batch[0].chunkData.data.map((d) => {
                 return {
                     op: d.op,
@@ -124,12 +122,10 @@ bucket_definitions:
                 { op: 'PUT', object_id: 'test1', checksum: c1 },
                 { op: 'REMOVE', object_id: 'test1', checksum: c2 }
             ]);
-            const checksums = [
-                ...(await bucketStorage.getChecksums(checkpoint, bucketRequests(syncRules, ['global[]']))).values()
-            ];
+            const checksums = [...(await bucketStorage.getChecksums(checkpoint, [request])).values()];
             expect(checksums).toEqual([
                 {
-                    bucket: bucketRequest(syncRules, 'global[]').bucket,
+                    bucket: request.bucket,
                     checksum: (c1 + c2) & 0xffffffff,
                     count: 2
                 }
@@ -156,31 +152,28 @@ bucket_definitions:
       - SELECT id, description FROM "%"
 `, { storageVersion }));
             const bucketStorage = factory.getInstance(syncRules);
-            const sourceTable = TEST_TABLE;
-            await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
-                await batch.markAllSnapshotDone('1/1');
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.DELETE,
-                    beforeReplicaId: test_utils.rid('test1')
-                });
-                await batch.commit('0/1');
+            const writer = __addDisposableResource(env_2, await bucketStorage.createWriter(test_utils.BATCH_OPTIONS), true);
+            const testTable = await test_utils.resolveTestTable(writer, 'test', ['id'], config);
+            await writer.markAllSnapshotDone('1/1');
+            await writer.save({
+                sourceTable: testTable,
+                tag: storage.SaveOperationTag.DELETE,
+                beforeReplicaId: test_utils.rid('test1')
             });
-            await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
-                const sourceTable = TEST_TABLE;
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.INSERT,
-                    after: {
-                        id: 'test1',
-                        description: 'test1'
-                    },
-                    afterReplicaId: test_utils.rid('test1')
-                });
-                await batch.commit('2/1');
+            await writer.commit('0/1');
+            await writer.save({
+                sourceTable: testTable,
+                tag: storage.SaveOperationTag.INSERT,
+                after: {
+                    id: 'test1',
+                    description: 'test1'
+                },
+                afterReplicaId: test_utils.rid('test1')
             });
+            await writer.commit('2/1');
             const { checkpoint } = await bucketStorage.getCheckpoint();
-            const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, bucketRequestMap(syncRules, [['global[]', 0n]])));
+            const request = bucketRequest(syncRules, 'global[]');
+            const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, [request]));
             const data = batch[0].chunkData.data.map((d) => {
                 return {
                     op: d.op,
@@ -190,12 +183,10 @@ bucket_definitions:
             });
             const c1 = 2871785649;
             expect(data).toEqual([{ op: 'PUT', object_id: 'test1', checksum: c1 }]);
-            const checksums = [
-                ...(await bucketStorage.getChecksums(checkpoint, bucketRequests(syncRules, ['global[]']))).values()
-            ];
+            const checksums = [...(await bucketStorage.getChecksums(checkpoint, [request])).values()];
             expect(checksums).toEqual([
                 {
-                    bucket: bucketRequest(syncRules, 'global[]').bucket,
+                    bucket: request.bucket,
                     checksum: c1 & 0xffffffff,
                     count: 1
                 }
@@ -223,35 +214,32 @@ bucket_definitions:
       - SELECT id, description FROM "%"
 `, { storageVersion }));
             const bucketStorage = factory.getInstance(syncRules);
-            const sourceTable = TEST_TABLE;
-            await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
-                await batch.markAllSnapshotDone('1/1');
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.DELETE,
-                    beforeReplicaId: test_utils.rid('test1')
-                });
-                await batch.commit('0/1');
+            const writer = __addDisposableResource(env_3, await bucketStorage.createWriter(test_utils.BATCH_OPTIONS), true);
+            const testTable = await test_utils.resolveTestTable(writer, 'test', ['id'], config);
+            await writer.markAllSnapshotDone('1/1');
+            await writer.save({
+                sourceTable: testTable,
+                tag: storage.SaveOperationTag.DELETE,
+                beforeReplicaId: test_utils.rid('test1')
             });
-            await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
-                const sourceTable = TEST_TABLE;
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.UPDATE,
-                    before: {
-                        id: 'test1'
-                    },
-                    after: {
-                        id: 'test1',
-                        description: 'test1'
-                    },
-                    beforeReplicaId: test_utils.rid('test1'),
-                    afterReplicaId: test_utils.rid('test1')
-                });
-                await batch.commit('2/1');
+            await writer.commit('0/1');
+            await writer.save({
+                sourceTable: testTable,
+                tag: storage.SaveOperationTag.UPDATE,
+                before: {
+                    id: 'test1'
+                },
+                after: {
+                    id: 'test1',
+                    description: 'test1'
+                },
+                beforeReplicaId: test_utils.rid('test1'),
+                afterReplicaId: test_utils.rid('test1')
             });
+            await writer.commit('2/1');
             const { checkpoint } = await bucketStorage.getCheckpoint();
-            const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, bucketRequestMap(syncRules, [['global[]', 0n]])));
+            const request = bucketRequest(syncRules, 'global[]');
+            const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, [request]));
             const data = batch[0].chunkData.data.map((d) => {
                 return {
                     op: d.op,
@@ -261,12 +249,10 @@ bucket_definitions:
             });
             const c1 = 2871785649;
             expect(data).toEqual([{ op: 'PUT', object_id: 'test1', checksum: c1 }]);
-            const checksums = [
-                ...(await bucketStorage.getChecksums(checkpoint, bucketRequests(syncRules, ['global[]']))).values()
-            ];
+            const checksums = [...(await bucketStorage.getChecksums(checkpoint, [request])).values()];
             expect(checksums).toEqual([
                 {
-                    bucket: bucketRequest(syncRules, 'global[]').bucket,
+                    bucket: request.bucket,
                     checksum: c1 & 0xffffffff,
                     count: 1
                 }
@@ -295,27 +281,27 @@ bucket_definitions:
                 storageVersion
             }));
             const bucketStorage = factory.getInstance(syncRules);
-            await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
-                const sourceTable = TEST_TABLE;
-                await batch.markAllSnapshotDone('1/1');
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.DELETE,
-                    beforeReplicaId: test_utils.rid('test1')
-                });
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.INSERT,
-                    after: {
-                        id: 'test1',
-                        description: 'test1'
-                    },
-                    afterReplicaId: test_utils.rid('test1')
-                });
-                await batch.commit('1/1');
+            const writer = __addDisposableResource(env_4, await bucketStorage.createWriter(test_utils.BATCH_OPTIONS), true);
+            const testTable = await test_utils.resolveTestTable(writer, 'test', ['id'], config);
+            await writer.markAllSnapshotDone('1/1');
+            await writer.save({
+                sourceTable: testTable,
+                tag: storage.SaveOperationTag.DELETE,
+                beforeReplicaId: test_utils.rid('test1')
+            });
+            await writer.save({
+                sourceTable: testTable,
+                tag: storage.SaveOperationTag.INSERT,
+                after: {
+                    id: 'test1',
+                    description: 'test1'
+                },
+                afterReplicaId: test_utils.rid('test1')
             });
+            await writer.commit('1/1');
             const { checkpoint } = await bucketStorage.getCheckpoint();
-            const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, bucketRequestMap(syncRules, [['global[]', 0n]])));
+            const request = bucketRequest(syncRules, 'global[]');
+            const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, [request]));
             const data = batch[0].chunkData.data.map((d) => {
                 return {
                     op: d.op,
@@ -325,12 +311,10 @@ bucket_definitions:
             });
             const c1 = 2871785649;
             expect(data).toEqual([{ op: 'PUT', object_id: 'test1', checksum: c1 }]);
-            const checksums = [
-                ...(await bucketStorage.getChecksums(checkpoint, bucketRequests(syncRules, ['global[]']))).values()
-            ];
+            const checksums = [...(await bucketStorage.getChecksums(checkpoint, [request])).values()];
             expect(checksums).toEqual([
                 {
-                    bucket: bucketRequest(syncRules, 'global[]').bucket,
+                    bucket: request.bucket,
                     checksum: c1 & 0xffffffff,
                     count: 1
                 }
@@ -359,46 +343,73 @@ bucket_definitions:
                 storageVersion
             }));
             const bucketStorage = factory.getInstance(syncRules);
-            await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
-                const sourceTable = TEST_TABLE;
-                await batch.markAllSnapshotDone('1/1');
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.INSERT,
-                    after: {
-                        id: 'test1',
-                        description: 'test1'
-                    },
-                    afterReplicaId: test_utils.rid('test1')
-                });
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.DELETE,
-                    beforeReplicaId: test_utils.rid('test1')
-                });
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.INSERT,
-                    after: {
-                        id: 'test1',
-                        description: 'test1'
-                    },
-                    afterReplicaId: test_utils.rid('test1')
-                });
-                await batch.commit('1/1');
-            });
-            await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
-                const sourceTable = TEST_TABLE;
-                await batch.markAllSnapshotDone('1/1');
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.DELETE,
-                    beforeReplicaId: test_utils.rid('test1')
-                });
-                await batch.commit('2/1');
-            });
+            {
+                const env_6 = { stack: [], error: void 0, hasError: false };
+                try {
+                    const writer = __addDisposableResource(env_6, await bucketStorage.createWriter(test_utils.BATCH_OPTIONS), true);
+                    const sourceTable = await test_utils.resolveTestTable(writer, 'test', ['id'], config);
+                    await writer.markAllSnapshotDone('1/1');
+                    await writer.save({
+                        sourceTable,
+                        tag: storage.SaveOperationTag.INSERT,
+                        after: {
+                            id: 'test1',
+                            description: 'test1'
+                        },
+                        afterReplicaId: test_utils.rid('test1')
+                    });
+                    await writer.save({
+                        sourceTable,
+                        tag: storage.SaveOperationTag.DELETE,
+                        beforeReplicaId: test_utils.rid('test1')
+                    });
+                    await writer.save({
+                        sourceTable,
+                        tag: storage.SaveOperationTag.INSERT,
+                        after: {
+                            id: 'test1',
+                            description: 'test1'
+                        },
+                        afterReplicaId: test_utils.rid('test1')
+                    });
+                    await writer.commit('1/1');
+                }
+                catch (e_5) {
+                    env_6.error = e_5;
+                    env_6.hasError = true;
+                }
+                finally {
+                    const result_5 = __disposeResources(env_6);
+                    if (result_5)
+                        await result_5;
+                }
+            }
+            {
+                const env_7 = { stack: [], error: void 0, hasError: false };
+                try {
+                    const writer = __addDisposableResource(env_7, await bucketStorage.createWriter(test_utils.BATCH_OPTIONS), true);
+                    const sourceTable = await test_utils.resolveTestTable(writer, 'test', ['id'], config);
+                    await writer.markAllSnapshotDone('1/1');
+                    await writer.save({
+                        sourceTable,
+                        tag: storage.SaveOperationTag.DELETE,
+                        beforeReplicaId: test_utils.rid('test1')
+                    });
+                    await writer.commit('2/1');
+                }
+                catch (e_6) {
+                    env_7.error = e_6;
+                    env_7.hasError = true;
+                }
+                finally {
+                    const result_6 = __disposeResources(env_7);
+                    if (result_6)
+                        await result_6;
+                }
+            }
             const { checkpoint } = await bucketStorage.getCheckpoint();
-            const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, bucketRequestMap(syncRules, [['global[]', 0n]])));
+            const request = bucketRequest(syncRules, 'global[]');
+            const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, [request]));
             expect(reduceBucket(batch[0].chunkData.data).slice(1)).toEqual([]);
             const data = batch[0].chunkData.data.map((d) => {
                 return {
@@ -409,20 +420,20 @@ bucket_definitions:
             });
             expect(data).toMatchSnapshot();
         }
-        catch (e_5) {
-            env_5.error = e_5;
+        catch (e_7) {
+            env_5.error = e_7;
             env_5.hasError = true;
         }
         finally {
-            const result_5 = __disposeResources(env_5);
-            if (result_5)
-                await result_5;
+            const result_7 = __disposeResources(env_5);
+            if (result_7)
+                await result_7;
         }
     });
     test('changing client ids', async () => {
-        const env_6 = { stack: [], error: void 0, hasError: false };
+        const env_8 = { stack: [], error: void 0, hasError: false };
         try {
-            const factory = __addDisposableResource(env_6, await generateStorageFactory(), true);
+            const factory = __addDisposableResource(env_8, await generateStorageFactory(), true);
             const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
@@ -432,43 +443,42 @@ bucket_definitions:
                 storageVersion
             }));
             const bucketStorage = factory.getInstance(syncRules);
-            const sourceTable = TEST_TABLE;
-            await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
-                await batch.markAllSnapshotDone('1/1');
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.INSERT,
-                    after: {
-                        id: 'test1',
-                        client_id: 'client1a',
-                        description: 'test1a'
-                    },
-                    afterReplicaId: test_utils.rid('test1')
-                });
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.UPDATE,
-                    after: {
-                        id: 'test1',
-                        client_id: 'client1b',
-                        description: 'test1b'
-                    },
-                    afterReplicaId: test_utils.rid('test1')
-                });
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.INSERT,
-                    after: {
-                        id: 'test2',
-                        client_id: 'client2',
-                        description: 'test2'
-                    },
-                    afterReplicaId: test_utils.rid('test2')
-                });
-                await batch.commit('1/1');
+            const writer = __addDisposableResource(env_8, await bucketStorage.createWriter(test_utils.BATCH_OPTIONS), true);
+            const sourceTable = await test_utils.resolveTestTable(writer, 'test', ['id'], config);
+            await writer.markAllSnapshotDone('1/1');
+            await writer.save({
+                sourceTable,
+                tag: storage.SaveOperationTag.INSERT,
+                after: {
+                    id: 'test1',
+                    client_id: 'client1a',
+                    description: 'test1a'
+                },
+                afterReplicaId: test_utils.rid('test1')
+            });
+            await writer.save({
+                sourceTable,
+                tag: storage.SaveOperationTag.UPDATE,
+                after: {
+                    id: 'test1',
+                    client_id: 'client1b',
+                    description: 'test1b'
+                },
+                afterReplicaId: test_utils.rid('test1')
             });
+            await writer.save({
+                sourceTable,
+                tag: storage.SaveOperationTag.INSERT,
+                after: {
+                    id: 'test2',
+                    client_id: 'client2',
+                    description: 'test2'
+                },
+                afterReplicaId: test_utils.rid('test2')
+            });
+            await writer.commit('1/1');
             const { checkpoint } = await bucketStorage.getCheckpoint();
-            const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, bucketRequestMap(syncRules, [['global[]', 0n]])));
+            const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, [bucketRequest(syncRules, 'global[]')]));
             const data = batch[0].chunkData.data.map((d) => {
                 return {
                     op: d.op,
@@ -482,20 +492,20 @@ bucket_definitions:
                 { op: 'PUT', object_id: 'client2' }
             ]);
         }
-        catch (e_6) {
-            env_6.error = e_6;
-            env_6.hasError = true;
+        catch (e_8) {
+            env_8.error = e_8;
+            env_8.hasError = true;
         }
         finally {
-            const result_6 = __disposeResources(env_6);
-            if (result_6)
-                await result_6;
+            const result_8 = __disposeResources(env_8);
+            if (result_8)
+                await result_8;
         }
     });
     test('re-apply delete', async () => {
-        const env_7 = { stack: [], error: void 0, hasError: false };
+        const env_9 = { stack: [], error: void 0, hasError: false };
         try {
-            const factory = __addDisposableResource(env_7, await generateStorageFactory(), true);
+            const factory = __addDisposableResource(env_9, await generateStorageFactory(), true);
             const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
@@ -505,38 +515,34 @@ bucket_definitions:
                 storageVersion
             }));
             const bucketStorage = factory.getInstance(syncRules);
-            await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
-                const sourceTable = TEST_TABLE;
-                await batch.markAllSnapshotDone('1/1');
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.INSERT,
-                    after: {
-                        id: 'test1',
-                        description: 'test1'
-                    },
-                    afterReplicaId: test_utils.rid('test1')
-                });
+            const writer = __addDisposableResource(env_9, await bucketStorage.createWriter(test_utils.BATCH_OPTIONS), true);
+            const sourceTable = await test_utils.resolveTestTable(writer, 'test', ['id'], config);
+            await writer.markAllSnapshotDone('1/1');
+            await writer.save({
+                sourceTable,
+                tag: storage.SaveOperationTag.INSERT,
+                after: {
+                    id: 'test1',
+                    description: 'test1'
+                },
+                afterReplicaId: test_utils.rid('test1')
             });
-            await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
-                const sourceTable = TEST_TABLE;
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.DELETE,
-                    beforeReplicaId: test_utils.rid('test1')
-                });
-                await batch.commit('1/1');
+            await writer.flush();
+            await writer.save({
+                sourceTable,
+                tag: storage.SaveOperationTag.DELETE,
+                beforeReplicaId: test_utils.rid('test1')
             });
-            await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
-                const sourceTable = TEST_TABLE;
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.DELETE,
-                    beforeReplicaId: test_utils.rid('test1')
-                });
+            await writer.commit('1/1');
+            await writer.save({
+                sourceTable,
+                tag: storage.SaveOperationTag.DELETE,
+                beforeReplicaId: test_utils.rid('test1')
             });
+            await writer.flush();
             const { checkpoint } = await bucketStorage.getCheckpoint();
-            const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, bucketRequestMap(syncRules, [['global[]', 0n]])));
+            const request = bucketRequest(syncRules, 'global[]');
+            const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, [request]));
             const data = batch[0].chunkData.data.map((d) => {
                 return {
                     op: d.op,
@@ -550,9 +556,7 @@ bucket_definitions:
                 { op: 'PUT', object_id: 'test1', checksum: c1 },
                 { op: 'REMOVE', object_id: 'test1', checksum: c2 }
             ]);
-            const checksums = [
-                ...(await bucketStorage.getChecksums(checkpoint, bucketRequests(syncRules, ['global[]']))).values()
-            ];
+            const checksums = [...(await bucketStorage.getChecksums(checkpoint, [request])).values()];
             expect(checksums).toEqual([
                 {
                     bucket: bucketRequest(syncRules, 'global[]').bucket,
@@ -561,20 +565,20 @@ bucket_definitions:
                 }
             ]);
         }
-        catch (e_7) {
-            env_7.error = e_7;
-            env_7.hasError = true;
+        catch (e_9) {
+            env_9.error = e_9;
+            env_9.hasError = true;
         }
         finally {
-            const result_7 = __disposeResources(env_7);
-            if (result_7)
-                await result_7;
+            const result_9 = __disposeResources(env_9);
+            if (result_9)
+                await result_9;
         }
     });
     test('re-apply update + delete', async () => {
-        const env_8 = { stack: [], error: void 0, hasError: false };
+        const env_10 = { stack: [], error: void 0, hasError: false };
         try {
-            const factory = __addDisposableResource(env_8, await generateStorageFactory(), true);
+            const factory = __addDisposableResource(env_10, await generateStorageFactory(), true);
             const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
@@ -582,77 +586,72 @@ bucket_definitions:
       - SELECT id, description FROM "%"
 `, { storageVersion }));
             const bucketStorage = factory.getInstance(syncRules);
-            await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
-                await batch.markAllSnapshotDone('1/1');
-                const sourceTable = TEST_TABLE;
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.INSERT,
-                    after: {
-                        id: 'test1',
-                        description: 'test1'
-                    },
-                    afterReplicaId: test_utils.rid('test1')
-                });
+            const writer = __addDisposableResource(env_10, await bucketStorage.createWriter(test_utils.BATCH_OPTIONS), true);
+            const sourceTable = await test_utils.resolveTestTable(writer, 'test', ['id'], config);
+            await writer.markAllSnapshotDone('1/1');
+            await writer.save({
+                sourceTable,
+                tag: storage.SaveOperationTag.INSERT,
+                after: {
+                    id: 'test1',
+                    description: 'test1'
+                },
+                afterReplicaId: test_utils.rid('test1')
             });
-            await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
-                await batch.markAllSnapshotDone('1/1');
-                const sourceTable = TEST_TABLE;
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.UPDATE,
-                    after: {
-                        id: 'test1',
-                        description: undefined
-                    },
-                    afterReplicaId: test_utils.rid('test1')
-                });
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.UPDATE,
-                    after: {
-                        id: 'test1',
-                        description: undefined
-                    },
-                    afterReplicaId: test_utils.rid('test1')
-                });
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.DELETE,
-                    beforeReplicaId: test_utils.rid('test1')
-                });
-                await batch.commit('1/1');
+            await writer.flush();
+            await writer.markAllSnapshotDone('1/1');
+            await writer.save({
+                sourceTable,
+                tag: storage.SaveOperationTag.UPDATE,
+                after: {
+                    id: 'test1',
+                    description: undefined
+                },
+                afterReplicaId: test_utils.rid('test1')
             });
-            await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
-                await batch.markAllSnapshotDone('1/1');
-                const sourceTable = TEST_TABLE;
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.UPDATE,
-                    after: {
-                        id: 'test1',
-                        description: undefined
-                    },
-                    afterReplicaId: test_utils.rid('test1')
-                });
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.UPDATE,
-                    after: {
-                        id: 'test1',
-                        description: undefined
-                    },
-                    afterReplicaId: test_utils.rid('test1')
-                });
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.DELETE,
-                    beforeReplicaId: test_utils.rid('test1')
-                });
-                await batch.commit('2/1');
+            await writer.save({
+                sourceTable,
+                tag: storage.SaveOperationTag.UPDATE,
+                after: {
+                    id: 'test1',
+                    description: undefined
+                },
+                afterReplicaId: test_utils.rid('test1')
+            });
+            await writer.save({
+                sourceTable,
+                tag: storage.SaveOperationTag.DELETE,
+                beforeReplicaId: test_utils.rid('test1')
+            });
+            await writer.commit('1/1');
+            await writer.markAllSnapshotDone('1/1');
+            await writer.save({
+                sourceTable,
+                tag: storage.SaveOperationTag.UPDATE,
+                after: {
+                    id: 'test1',
+                    description: undefined
+                },
+                afterReplicaId: test_utils.rid('test1')
             });
+            await writer.save({
+                sourceTable,
+                tag: storage.SaveOperationTag.UPDATE,
+                after: {
+                    id: 'test1',
+                    description: undefined
+                },
+                afterReplicaId: test_utils.rid('test1')
+            });
+            await writer.save({
+                sourceTable,
+                tag: storage.SaveOperationTag.DELETE,
+                beforeReplicaId: test_utils.rid('test1')
+            });
+            await writer.commit('2/1');
             const { checkpoint } = await bucketStorage.getCheckpoint();
-            const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, bucketRequestMap(syncRules, [['global[]', 0n]])));
+            const request = bucketRequest(syncRules, 'global[]');
+            const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, [request]));
             const data = batch[0].chunkData.data.map((d) => {
                 return {
                     op: d.op,
@@ -668,9 +667,7 @@ bucket_definitions:
                 { op: 'PUT', object_id: 'test1', checksum: c1 },
                 { op: 'REMOVE', object_id: 'test1', checksum: c2 }
             ]);
-            const checksums = [
-                ...(await bucketStorage.getChecksums(checkpoint, bucketRequests(syncRules, ['global[]']))).values()
-            ];
+            const checksums = [...(await bucketStorage.getChecksums(checkpoint, [request])).values()];
             expect(checksums).toEqual([
                 {
                     bucket: bucketRequest(syncRules, 'global[]').bucket,
@@ -679,18 +676,18 @@ bucket_definitions:
                 }
             ]);
         }
-        catch (e_8) {
-            env_8.error = e_8;
-            env_8.hasError = true;
+        catch (e_10) {
+            env_10.error = e_10;
+            env_10.hasError = true;
         }
         finally {
-            const result_8 = __disposeResources(env_8);
-            if (result_8)
-                await result_8;
+            const result_10 = __disposeResources(env_10);
+            if (result_10)
+                await result_10;
         }
     });
     test('batch with overlapping replica ids', async () => {
-        const env_9 = { stack: [], error: void 0, hasError: false };
+        const env_11 = { stack: [], error: void 0, hasError: false };
         try {
             // This test checks that we get the correct output when processing rows with:
             // 1. changing replica ids
@@ -699,7 +696,7 @@ bucket_definitions:
             // It can break at two places:
             // 1. Not getting the correct "current_data" state for each operation.
             // 2. Output order not being correct.
-            const factory = __addDisposableResource(env_9, await generateStorageFactory(), true);
+            const factory = __addDisposableResource(env_11, await generateStorageFactory(), true);
             const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
@@ -707,105 +704,104 @@ bucket_definitions:
       - SELECT id, description FROM "test"
 `, { storageVersion }));
             const bucketStorage = factory.getInstance(syncRules);
+            const writer = __addDisposableResource(env_11, await bucketStorage.createWriter(test_utils.BATCH_OPTIONS), true);
+            const sourceTable = await test_utils.resolveTestTable(writer, 'test', ['id'], config);
             // Pre-setup
-            const result1 = await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
-                await batch.markAllSnapshotDone('1/1');
-                const sourceTable = TEST_TABLE;
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.INSERT,
-                    after: {
-                        id: 'test1',
-                        description: 'test1a'
-                    },
-                    afterReplicaId: test_utils.rid('test1')
-                });
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.INSERT,
-                    after: {
-                        id: 'test2',
-                        description: 'test2a'
-                    },
-                    afterReplicaId: test_utils.rid('test2')
-                });
+            await writer.markAllSnapshotDone('1/1');
+            await writer.save({
+                sourceTable,
+                tag: storage.SaveOperationTag.INSERT,
+                after: {
+                    id: 'test1',
+                    description: 'test1a'
+                },
+                afterReplicaId: test_utils.rid('test1')
             });
+            await writer.save({
+                sourceTable,
+                tag: storage.SaveOperationTag.INSERT,
+                after: {
+                    id: 'test2',
+                    description: 'test2a'
+                },
+                afterReplicaId: test_utils.rid('test2')
+            });
+            const result1 = await writer.flush();
             const checkpoint1 = result1?.flushed_op ?? 0n;
             // Test batch
-            const result2 = await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
-                const sourceTable = TEST_TABLE;
-                // b
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.INSERT,
-                    after: {
-                        id: 'test1',
-                        description: 'test1b'
-                    },
-                    afterReplicaId: test_utils.rid('test1')
-                });
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.UPDATE,
-                    before: {
-                        id: 'test1'
-                    },
-                    beforeReplicaId: test_utils.rid('test1'),
-                    after: {
-                        id: 'test2',
-                        description: 'test2b'
-                    },
-                    afterReplicaId: test_utils.rid('test2')
-                });
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.UPDATE,
-                    before: {
-                        id: 'test2'
-                    },
-                    beforeReplicaId: test_utils.rid('test2'),
-                    after: {
-                        id: 'test3',
-                        description: 'test3b'
-                    },
-                    afterReplicaId: test_utils.rid('test3')
-                });
-                // c
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.UPDATE,
-                    after: {
-                        id: 'test2',
-                        description: 'test2c'
-                    },
-                    afterReplicaId: test_utils.rid('test2')
-                });
-                // d
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.INSERT,
-                    after: {
-                        id: 'test4',
-                        description: 'test4d'
-                    },
-                    afterReplicaId: test_utils.rid('test4')
-                });
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.UPDATE,
-                    before: {
-                        id: 'test4'
-                    },
-                    beforeReplicaId: test_utils.rid('test4'),
-                    after: {
-                        id: 'test5',
-                        description: 'test5d'
-                    },
-                    afterReplicaId: test_utils.rid('test5')
-                });
+            // b
+            await writer.save({
+                sourceTable,
+                tag: storage.SaveOperationTag.INSERT,
+                after: {
+                    id: 'test1',
+                    description: 'test1b'
+                },
+                afterReplicaId: test_utils.rid('test1')
+            });
+            await writer.save({
+                sourceTable,
+                tag: storage.SaveOperationTag.UPDATE,
+                before: {
+                    id: 'test1'
+                },
+                beforeReplicaId: test_utils.rid('test1'),
+                after: {
+                    id: 'test2',
+                    description: 'test2b'
+                },
+                afterReplicaId: test_utils.rid('test2')
+            });
+            await writer.save({
+                sourceTable,
+                tag: storage.SaveOperationTag.UPDATE,
+                before: {
+                    id: 'test2'
+                },
+                beforeReplicaId: test_utils.rid('test2'),
+                after: {
+                    id: 'test3',
+                    description: 'test3b'
+                },
+                afterReplicaId: test_utils.rid('test3')
+            });
+            // c
+            await writer.save({
+                sourceTable,
+                tag: storage.SaveOperationTag.UPDATE,
+                after: {
+                    id: 'test2',
+                    description: 'test2c'
+                },
+                afterReplicaId: test_utils.rid('test2')
+            });
+            // d
+            await writer.save({
+                sourceTable,
+                tag: storage.SaveOperationTag.INSERT,
+                after: {
+                    id: 'test4',
+                    description: 'test4d'
+                },
+                afterReplicaId: test_utils.rid('test4')
             });
+            await writer.save({
+                sourceTable,
+                tag: storage.SaveOperationTag.UPDATE,
+                before: {
+                    id: 'test4'
+                },
+                beforeReplicaId: test_utils.rid('test4'),
+                after: {
+                    id: 'test5',
+                    description: 'test5d'
+                },
+                afterReplicaId: test_utils.rid('test5')
+            });
+            const result2 = await writer.flush();
             const checkpoint2 = result2.flushed_op;
-            const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint2, bucketRequestMap(syncRules, [['global[]', checkpoint1]])));
+            const request = bucketRequest(syncRules, 'global[]', checkpoint1);
+            const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint2, [request]));
             const data = batch[0].chunkData.data.map((d) => {
                 return {
                     op: d.op,
@@ -829,18 +825,18 @@ bucket_definitions:
                 { op: 'PUT', object_id: 'test5', data: JSON.stringify({ id: 'test5', description: 'test5d' }) }
             ]);
         }
-        catch (e_9) {
-            env_9.error = e_9;
-            env_9.hasError = true;
+        catch (e_11) {
+            env_11.error = e_11;
+            env_11.hasError = true;
         }
         finally {
-            const result_9 = __disposeResources(env_9);
-            if (result_9)
-                await result_9;
+            const result_11 = __disposeResources(env_11);
+            if (result_11)
+                await result_11;
         }
     });
     test('changed data with replica identity full', async () => {
-        const env_10 = { stack: [], error: void 0, hasError: false };
+        const env_12 = { stack: [], error: void 0, hasError: false };
         try {
             function rid2(id, description) {
                 return getUuidReplicaIdentityBson({ id, description }, [
@@ -848,7 +844,7 @@ bucket_definitions:
                     { name: 'description', type: 'VARCHAR', typeId: 25 }
                 ]);
             }
-            const factory = __addDisposableResource(env_10, await generateStorageFactory(), true);
+            const factory = __addDisposableResource(env_12, await generateStorageFactory(), true);
             const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
@@ -858,53 +854,52 @@ bucket_definitions:
                 storageVersion
             }));
             const bucketStorage = factory.getInstance(syncRules);
+            const writer = __addDisposableResource(env_12, await bucketStorage.createWriter(test_utils.BATCH_OPTIONS), true);
             const sourceTable = test_utils.makeTestTable('test', ['id', 'description'], config);
             // Pre-setup
-            const result1 = await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
-                await batch.markAllSnapshotDone('1/1');
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.INSERT,
-                    after: {
-                        id: 'test1',
-                        description: 'test1a'
-                    },
-                    afterReplicaId: rid2('test1', 'test1a')
-                });
+            await writer.markAllSnapshotDone('1/1');
+            await writer.save({
+                sourceTable,
+                tag: storage.SaveOperationTag.INSERT,
+                after: {
+                    id: 'test1',
+                    description: 'test1a'
+                },
+                afterReplicaId: rid2('test1', 'test1a')
             });
+            const result1 = await writer.flush();
             const checkpoint1 = result1?.flushed_op ?? 0n;
-            const result2 = await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
-                // Unchanged, but has a before id
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.UPDATE,
-                    before: {
-                        id: 'test1',
-                        description: 'test1a'
-                    },
-                    beforeReplicaId: rid2('test1', 'test1a'),
-                    after: {
-                        id: 'test1',
-                        description: 'test1b'
-                    },
-                    afterReplicaId: rid2('test1', 'test1b')
-                });
+            // Unchanged, but has a before id
+            await writer.save({
+                sourceTable,
+                tag: storage.SaveOperationTag.UPDATE,
+                before: {
+                    id: 'test1',
+                    description: 'test1a'
+                },
+                beforeReplicaId: rid2('test1', 'test1a'),
+                after: {
+                    id: 'test1',
+                    description: 'test1b'
+                },
+                afterReplicaId: rid2('test1', 'test1b')
             });
-            const result3 = await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
-                // Delete
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.DELETE,
-                    before: {
-                        id: 'test1',
-                        description: 'test1b'
-                    },
-                    beforeReplicaId: rid2('test1', 'test1b'),
-                    after: undefined
-                });
+            const result2 = await writer.flush();
+            // Delete
+            await writer.save({
+                sourceTable,
+                tag: storage.SaveOperationTag.DELETE,
+                before: {
+                    id: 'test1',
+                    description: 'test1b'
+                },
+                beforeReplicaId: rid2('test1', 'test1b'),
+                after: undefined
             });
+            const result3 = await writer.flush();
             const checkpoint3 = result3.flushed_op;
-            const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint3, bucketRequestMap(syncRules, [['global[]', checkpoint1]])));
+            const request = bucketRequest(syncRules, 'global[]');
+            const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint3, [{ ...request, start: checkpoint1 }]));
             const data = batch[0].chunkData.data.map((d) => {
                 return {
                     op: d.op,
@@ -938,18 +933,18 @@ bucket_definitions:
                 }
             ]);
         }
-        catch (e_10) {
-            env_10.error = e_10;
-            env_10.hasError = true;
+        catch (e_12) {
+            env_12.error = e_12;
+            env_12.hasError = true;
         }
         finally {
-            const result_10 = __disposeResources(env_10);
-            if (result_10)
-                await result_10;
+            const result_12 = __disposeResources(env_12);
+            if (result_12)
+                await result_12;
         }
     });
     test('unchanged data with replica identity full', async () => {
-        const env_11 = { stack: [], error: void 0, hasError: false };
+        const env_13 = { stack: [], error: void 0, hasError: false };
         try {
             function rid2(id, description) {
                 return getUuidReplicaIdentityBson({ id, description }, [
@@ -957,7 +952,7 @@ bucket_definitions:
                     { name: 'description', type: 'VARCHAR', typeId: 25 }
                 ]);
             }
-            const factory = __addDisposableResource(env_11, await generateStorageFactory(), true);
+            const factory = __addDisposableResource(env_13, await generateStorageFactory(), true);
             const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
@@ -967,53 +962,52 @@ bucket_definitions:
                 storageVersion
             }));
             const bucketStorage = factory.getInstance(syncRules);
+            const writer = __addDisposableResource(env_13, await bucketStorage.createWriter(test_utils.BATCH_OPTIONS), true);
             const sourceTable = test_utils.makeTestTable('test', ['id', 'description'], config);
             // Pre-setup
-            const result1 = await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
-                await batch.markAllSnapshotDone('1/1');
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.INSERT,
-                    after: {
-                        id: 'test1',
-                        description: 'test1a'
-                    },
-                    afterReplicaId: rid2('test1', 'test1a')
-                });
+            await writer.markAllSnapshotDone('1/1');
+            await writer.save({
+                sourceTable,
+                tag: storage.SaveOperationTag.INSERT,
+                after: {
+                    id: 'test1',
+                    description: 'test1a'
+                },
+                afterReplicaId: rid2('test1', 'test1a')
             });
+            const result1 = await writer.flush();
             const checkpoint1 = result1?.flushed_op ?? 0n;
-            const result2 = await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
-                // Unchanged, but has a before id
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.UPDATE,
-                    before: {
-                        id: 'test1',
-                        description: 'test1a'
-                    },
-                    beforeReplicaId: rid2('test1', 'test1a'),
-                    after: {
-                        id: 'test1',
-                        description: 'test1a'
-                    },
-                    afterReplicaId: rid2('test1', 'test1a')
-                });
-            });
-            const result3 = await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
-                // Delete
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.DELETE,
-                    before: {
-                        id: 'test1',
-                        description: 'test1a'
-                    },
-                    beforeReplicaId: rid2('test1', 'test1a'),
-                    after: undefined
-                });
+            // Unchanged, but has a before id
+            await writer.save({
+                sourceTable,
+                tag: storage.SaveOperationTag.UPDATE,
+                before: {
+                    id: 'test1',
+                    description: 'test1a'
+                },
+                beforeReplicaId: rid2('test1', 'test1a'),
+                after: {
+                    id: 'test1',
+                    description: 'test1a'
+                },
+                afterReplicaId: rid2('test1', 'test1a')
+            });
+            const result2 = await writer.flush();
+            // Delete
+            await writer.save({
+                sourceTable,
+                tag: storage.SaveOperationTag.DELETE,
+                before: {
+                    id: 'test1',
+                    description: 'test1a'
+                },
+                beforeReplicaId: rid2('test1', 'test1a'),
+                after: undefined
             });
+            const result3 = await writer.flush();
             const checkpoint3 = result3.flushed_op;
-            const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint3, bucketRequestMap(syncRules, [['global[]', checkpoint1]])));
+            const request = bucketRequest(syncRules, 'global[]');
+            const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint3, [{ ...request, start: checkpoint1 }]));
             const data = batch[0].chunkData.data.map((d) => {
                 return {
                     op: d.op,
@@ -1040,24 +1034,24 @@ bucket_definitions:
                 }
             ]);
         }
-        catch (e_11) {
-            env_11.error = e_11;
-            env_11.hasError = true;
+        catch (e_13) {
+            env_13.error = e_13;
+            env_13.hasError = true;
         }
         finally {
-            const result_11 = __disposeResources(env_11);
-            if (result_11)
-                await result_11;
+            const result_13 = __disposeResources(env_13);
+            if (result_13)
+                await result_13;
         }
     });
     test('large batch', async () => {
-        const env_12 = { stack: [], error: void 0, hasError: false };
+        const env_14 = { stack: [], error: void 0, hasError: false };
         try {
             // Test syncing a batch of data that is small in count,
             // but large enough in size to be split over multiple returned batches.
             // The specific batch splits is an implementation detail of the storage driver,
             // and the test will have to updated when other implementations are added.
-            const factory = __addDisposableResource(env_12, await generateStorageFactory(), true);
+            const factory = __addDisposableResource(env_14, await generateStorageFactory(), true);
             const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
@@ -1067,54 +1061,54 @@ bucket_definitions:
                 storageVersion
             }));
             const bucketStorage = factory.getInstance(syncRules);
-            await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
-                await batch.markAllSnapshotDone('1/1');
-                const sourceTable = TEST_TABLE;
-                const largeDescription = '0123456789'.repeat(12_000_00);
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.INSERT,
-                    after: {
-                        id: 'test1',
-                        description: 'test1'
-                    },
-                    afterReplicaId: test_utils.rid('test1')
-                });
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.INSERT,
-                    after: {
-                        id: 'large1',
-                        description: largeDescription
-                    },
-                    afterReplicaId: test_utils.rid('large1')
-                });
-                // Large enough to split the returned batch
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.INSERT,
-                    after: {
-                        id: 'large2',
-                        description: largeDescription
-                    },
-                    afterReplicaId: test_utils.rid('large2')
-                });
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.INSERT,
-                    after: {
-                        id: 'test3',
-                        description: 'test3'
-                    },
-                    afterReplicaId: test_utils.rid('test3')
-                });
-                await batch.commit('1/1');
+            const writer = __addDisposableResource(env_14, await bucketStorage.createWriter(test_utils.BATCH_OPTIONS), true);
+            const sourceTable = await test_utils.resolveTestTable(writer, 'test', ['id'], config);
+            await writer.markAllSnapshotDone('1/1');
+            const largeDescription = '0123456789'.repeat(12_000_00);
+            await writer.save({
+                sourceTable,
+                tag: storage.SaveOperationTag.INSERT,
+                after: {
+                    id: 'test1',
+                    description: 'test1'
+                },
+                afterReplicaId: test_utils.rid('test1')
+            });
+            await writer.save({
+                sourceTable,
+                tag: storage.SaveOperationTag.INSERT,
+                after: {
+                    id: 'large1',
+                    description: largeDescription
+                },
+                afterReplicaId: test_utils.rid('large1')
             });
+            // Large enough to split the returned batch
+            await writer.save({
+                sourceTable,
+                tag: storage.SaveOperationTag.INSERT,
+                after: {
+                    id: 'large2',
+                    description: largeDescription
+                },
+                afterReplicaId: test_utils.rid('large2')
+            });
+            await writer.save({
+                sourceTable,
+                tag: storage.SaveOperationTag.INSERT,
+                after: {
+                    id: 'test3',
+                    description: 'test3'
+                },
+                afterReplicaId: test_utils.rid('test3')
+            });
+            await writer.commit('1/1');
             const { checkpoint } = await bucketStorage.getCheckpoint();
             const options = {
                 chunkLimitBytes: 16 * 1024 * 1024
             };
-            const batch1 = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, bucketRequestMap(syncRules, [['global[]', 0n]]), options));
+            const request = bucketRequest(syncRules, 'global[]');
+            const batch1 = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, [request], options));
             expect(test_utils.getBatchData(batch1)).toEqual([
                 { op_id: '1', op: 'PUT', object_id: 'test1', checksum: 2871785649 },
                 { op_id: '2', op: 'PUT', object_id: 'large1', checksum: 454746904 }
@@ -1124,7 +1118,7 @@ bucket_definitions:
                 has_more: true,
                 next_after: '2'
             });
-            const batch2 = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, bucketRequestMap(syncRules, [['global[]', BigInt(batch1[0].chunkData.next_after)]]), options));
+            const batch2 = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, [{ ...request, start: BigInt(batch1[0].chunkData.next_after) }], options));
             expect(test_utils.getBatchData(batch2)).toEqual([
                 { op_id: '3', op: 'PUT', object_id: 'large2', checksum: 1795508474 },
                 { op_id: '4', op: 'PUT', object_id: 'test3', checksum: 1359888332 }
@@ -1134,25 +1128,25 @@ bucket_definitions:
                 has_more: false,
                 next_after: '4'
             });
-            const batch3 = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, bucketRequestMap(syncRules, [['global[]', BigInt(batch2[0].chunkData.next_after)]]), options));
+            const batch3 = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, [{ ...request, start: BigInt(batch2[0].chunkData.next_after) }], options));
             expect(test_utils.getBatchData(batch3)).toEqual([]);
             expect(test_utils.getBatchMeta(batch3)).toEqual(null);
         }
-        catch (e_12) {
-            env_12.error = e_12;
-            env_12.hasError = true;
+        catch (e_14) {
+            env_14.error = e_14;
+            env_14.hasError = true;
         }
         finally {
-            const result_12 = __disposeResources(env_12);
-            if (result_12)
-                await result_12;
+            const result_14 = __disposeResources(env_14);
+            if (result_14)
+                await result_14;
         }
     });
     test('long batch', async () => {
-        const env_13 = { stack: [], error: void 0, hasError: false };
+        const env_15 = { stack: [], error: void 0, hasError: false };
         try {
             // Test syncing a batch of data that is limited by count.
-            const factory = __addDisposableResource(env_13, await generateStorageFactory(), true);
+            const factory = __addDisposableResource(env_15, await generateStorageFactory(), true);
             const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
@@ -1162,24 +1156,24 @@ bucket_definitions:
                 storageVersion
             }));
             const bucketStorage = factory.getInstance(syncRules);
-            await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
-                await batch.markAllSnapshotDone('1/1');
-                const sourceTable = TEST_TABLE;
-                for (let i = 1; i <= 6; i++) {
-                    await batch.save({
-                        sourceTable,
-                        tag: storage.SaveOperationTag.INSERT,
-                        after: {
-                            id: `test${i}`,
-                            description: `test${i}`
-                        },
-                        afterReplicaId: `test${i}`
-                    });
-                }
-                await batch.commit('1/1');
-            });
+            const writer = __addDisposableResource(env_15, await bucketStorage.createWriter(test_utils.BATCH_OPTIONS), true);
+            const sourceTable = await test_utils.resolveTestTable(writer, 'test', ['id'], config);
+            await writer.markAllSnapshotDone('1/1');
+            for (let i = 1; i <= 6; i++) {
+                await writer.save({
+                    sourceTable,
+                    tag: storage.SaveOperationTag.INSERT,
+                    after: {
+                        id: `test${i}`,
+                        description: `test${i}`
+                    },
+                    afterReplicaId: `test${i}`
+                });
+            }
+            await writer.commit('1/1');
             const { checkpoint } = await bucketStorage.getCheckpoint();
-            const batch1 = await test_utils.oneFromAsync(bucketStorage.getBucketDataBatch(checkpoint, bucketRequestMap(syncRules, [['global[]', 0n]]), { limit: 4 }));
+            const request = bucketRequest(syncRules, 'global[]');
+            const batch1 = await test_utils.oneFromAsync(bucketStorage.getBucketDataBatch(checkpoint, [request], { limit: 4 }));
             expect(test_utils.getBatchData(batch1)).toEqual([
                 { op_id: '1', op: 'PUT', object_id: 'test1', checksum: 2871785649 },
                 { op_id: '2', op: 'PUT', object_id: 'test2', checksum: 730027011 },
@@ -1191,7 +1185,7 @@ bucket_definitions:
                 has_more: true,
                 next_after: '4'
             });
-            const batch2 = await test_utils.oneFromAsync(bucketStorage.getBucketDataBatch(checkpoint, bucketRequestMap(syncRules, [['global[]', BigInt(batch1.chunkData.next_after)]]), {
+            const batch2 = await test_utils.oneFromAsync(bucketStorage.getBucketDataBatch(checkpoint, [{ ...request, start: BigInt(batch1.chunkData.next_after) }], {
                 limit: 4
             }));
             expect(test_utils.getBatchData(batch2)).toEqual([
@@ -1203,27 +1197,27 @@ bucket_definitions:
                 has_more: false,
                 next_after: '6'
             });
-            const batch3 = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, bucketRequestMap(syncRules, [['global[]', BigInt(batch2.chunkData.next_after)]]), {
+            const batch3 = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, [{ ...request, start: BigInt(batch2.chunkData.next_after) }], {
                 limit: 4
             }));
             expect(test_utils.getBatchData(batch3)).toEqual([]);
             expect(test_utils.getBatchMeta(batch3)).toEqual(null);
         }
-        catch (e_13) {
-            env_13.error = e_13;
-            env_13.hasError = true;
+        catch (e_15) {
+            env_15.error = e_15;
+            env_15.hasError = true;
         }
         finally {
-            const result_13 = __disposeResources(env_13);
-            if (result_13)
-                await result_13;
+            const result_15 = __disposeResources(env_15);
+            if (result_15)
+                await result_15;
         }
     });
     describe('batch has_more', () => {
         const setup = async (options) => {
-            const env_14 = { stack: [], error: void 0, hasError: false };
+            const env_16 = { stack: [], error: void 0, hasError: false };
             try {
-                const factory = __addDisposableResource(env_14, await generateStorageFactory(), true);
+                const factory = __addDisposableResource(env_16, await generateStorageFactory(), true);
                 const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
   bucket_definitions:
     global1:
@@ -1234,45 +1228,43 @@ bucket_definitions:
         - SELECT id, description FROM test WHERE bucket = 'global2'
   `, { storageVersion }));
                 const bucketStorage = factory.getInstance(syncRules);
-                await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
-                    await batch.markAllSnapshotDone('1/1');
-                    const sourceTable = TEST_TABLE;
-                    for (let i = 1; i <= 10; i++) {
-                        await batch.save({
-                            sourceTable,
-                            tag: storage.SaveOperationTag.INSERT,
-                            after: {
-                                id: `test${i}`,
-                                description: `test${i}`,
-                                bucket: i == 1 ? 'global1' : 'global2'
-                            },
-                            afterReplicaId: `test${i}`
-                        });
-                    }
-                    await batch.commit('1/1');
-                });
+                const writer = __addDisposableResource(env_16, await bucketStorage.createWriter(test_utils.BATCH_OPTIONS), true);
+                const sourceTable = await test_utils.resolveTestTable(writer, 'test', ['id'], config);
+                await writer.markAllSnapshotDone('1/1');
+                for (let i = 1; i <= 10; i++) {
+                    await writer.save({
+                        sourceTable,
+                        tag: storage.SaveOperationTag.INSERT,
+                        after: {
+                            id: `test${i}`,
+                            description: `test${i}`,
+                            bucket: i == 1 ? 'global1' : 'global2'
+                        },
+                        afterReplicaId: `test${i}`
+                    });
+                }
+                await writer.commit('1/1');
                 const { checkpoint } = await bucketStorage.getCheckpoint();
-                const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, bucketRequestMap(syncRules, [
-                    ['global1[]', 0n],
-                    ['global2[]', 0n]
-                ]), options));
-                return { syncRules, batch };
+                const global1Request = bucketRequest(syncRules, 'global1[]', 0n);
+                const global2Request = bucketRequest(syncRules, 'global2[]', 0n);
+                const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(checkpoint, [global1Request, global2Request], options));
+                return { batch, global1Request, global2Request };
             }
-            catch (e_14) {
-                env_14.error = e_14;
-                env_14.hasError = true;
+            catch (e_16) {
+                env_16.error = e_16;
+                env_16.hasError = true;
             }
             finally {
-                const result_14 = __disposeResources(env_14);
-                if (result_14)
-                    await result_14;
+                const result_16 = __disposeResources(env_16);
+                if (result_16)
+                    await result_16;
             }
         };
         test('batch has_more (1)', async () => {
-            const { batch, syncRules } = await setup({ limit: 5 });
+            const { batch, global1Request, global2Request } = await setup({ limit: 5 });
             expect(batch.length).toEqual(2);
-            expect(batch[0].chunkData.bucket).toEqual(bucketRequest(syncRules, 'global1[]').bucket);
-            expect(batch[1].chunkData.bucket).toEqual(bucketRequest(syncRules, 'global2[]').bucket);
+            expect(batch[0].chunkData.bucket).toEqual(global1Request.bucket);
+            expect(batch[1].chunkData.bucket).toEqual(global2Request.bucket);
             expect(test_utils.getBatchData(batch[0])).toEqual([
                 { op_id: '1', op: 'PUT', object_id: 'test1', checksum: 2871785649 }
             ]);
@@ -1294,10 +1286,10 @@ bucket_definitions:
             });
         });
         test('batch has_more (2)', async () => {
-            const { batch, syncRules } = await setup({ limit: 11 });
+            const { batch, global1Request, global2Request } = await setup({ limit: 11 });
             expect(batch.length).toEqual(2);
-            expect(batch[0].chunkData.bucket).toEqual(bucketRequest(syncRules, 'global1[]').bucket);
-            expect(batch[1].chunkData.bucket).toEqual(bucketRequest(syncRules, 'global2[]').bucket);
+            expect(batch[0].chunkData.bucket).toEqual(global1Request.bucket);
+            expect(batch[1].chunkData.bucket).toEqual(global2Request.bucket);
             expect(test_utils.getBatchData(batch[0])).toEqual([
                 { op_id: '1', op: 'PUT', object_id: 'test1', checksum: 2871785649 }
             ]);
@@ -1325,11 +1317,11 @@ bucket_definitions:
         });
         test('batch has_more (3)', async () => {
             // 50 bytes is more than 1 row, less than 2 rows
-            const { batch, syncRules } = await setup({ limit: 3, chunkLimitBytes: 50 });
+            const { batch, global1Request, global2Request } = await setup({ limit: 3, chunkLimitBytes: 50 });
             expect(batch.length).toEqual(3);
-            expect(batch[0].chunkData.bucket).toEqual(bucketRequest(syncRules, 'global1[]').bucket);
-            expect(batch[1].chunkData.bucket).toEqual(bucketRequest(syncRules, 'global2[]').bucket);
-            expect(batch[2].chunkData.bucket).toEqual(bucketRequest(syncRules, 'global2[]').bucket);
+            expect(batch[0].chunkData.bucket).toEqual(global1Request.bucket);
+            expect(batch[1].chunkData.bucket).toEqual(global2Request.bucket);
+            expect(batch[2].chunkData.bucket).toEqual(global2Request.bucket);
             expect(test_utils.getBatchData(batch[0])).toEqual([
                 { op_id: '1', op: 'PUT', object_id: 'test1', checksum: 2871785649 }
             ]);
@@ -1357,9 +1349,9 @@ bucket_definitions:
         });
     });
     test('empty storage metrics', async () => {
-        const env_15 = { stack: [], error: void 0, hasError: false };
+        const env_17 = { stack: [], error: void 0, hasError: false };
         try {
-            const f = __addDisposableResource(env_15, await generateStorageFactory({ dropAll: true }), true);
+            const f = __addDisposableResource(env_17, await generateStorageFactory({ dropAll: true }), true);
             const metrics = await f.getStorageMetrics();
             expect(metrics).toEqual({
                 operations_size_bytes: 0,
@@ -1368,29 +1360,28 @@ bucket_definitions:
             });
             const r = await f.configureSyncRules(updateSyncRulesFromYaml('bucket_definitions: {}'));
             const storage = f.getInstance(r.persisted_sync_rules);
-            await storage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
-                await batch.markAllSnapshotDone('1/0');
-                await batch.keepalive('1/0');
-            });
+            const writer = __addDisposableResource(env_17, await storage.createWriter(test_utils.BATCH_OPTIONS), true);
+            await writer.markAllSnapshotDone('1/0');
+            await writer.keepalive('1/0');
             await f.getStorageMetrics();
         }
-        catch (e_15) {
-            env_15.error = e_15;
-            env_15.hasError = true;
+        catch (e_17) {
+            env_17.error = e_17;
+            env_17.hasError = true;
         }
         finally {
-            const result_15 = __disposeResources(env_15);
-            if (result_15)
-                await result_15;
+            const result_17 = __disposeResources(env_17);
+            if (result_17)
+                await result_17;
         }
     });
     test('op_id initialization edge case', async () => {
-        const env_16 = { stack: [], error: void 0, hasError: false };
+        const env_18 = { stack: [], error: void 0, hasError: false };
         try {
             // Test syncing a batch of data that is small in count,
             // but large enough in size to be split over multiple returned chunks.
             // Similar to the above test, but splits over 1MB chunks.
-            const factory = __addDisposableResource(env_16, await generateStorageFactory(), true);
+            const factory = __addDisposableResource(env_18, await generateStorageFactory(), true);
             const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
   bucket_definitions:
     global:
@@ -1401,50 +1392,49 @@ bucket_definitions:
                 storageVersion
             }));
             const bucketStorage = factory.getInstance(syncRules);
-            const sourceTable = test_utils.makeTestTable('test', ['id'], config);
-            const sourceTableIgnore = test_utils.makeTestTable('test_ignore', ['id'], config);
-            const result1 = await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
-                await batch.markAllSnapshotDone('1/1');
-                // This saves a record to current_data, but not bucket_data.
-                // This causes a checkpoint to be created without increasing the op_id sequence.
-                await batch.save({
-                    sourceTable: sourceTableIgnore,
-                    tag: storage.SaveOperationTag.INSERT,
-                    after: {
-                        id: 'test1'
-                    },
-                    afterReplicaId: test_utils.rid('test1')
-                });
+            const writer = __addDisposableResource(env_18, await bucketStorage.createWriter(test_utils.BATCH_OPTIONS), true);
+            const sourceTable = await test_utils.resolveTestTable(writer, 'test', ['id'], config, 1);
+            const sourceTableIgnore = await test_utils.resolveTestTable(writer, 'test_ignore', ['id'], config, 2);
+            await writer.markAllSnapshotDone('1/1');
+            // This saves a record to current_data, but not bucket_data.
+            // This causes a checkpoint to be created without increasing the op_id sequence.
+            await writer.save({
+                sourceTable: sourceTableIgnore,
+                tag: storage.SaveOperationTag.INSERT,
+                after: {
+                    id: 'test1'
+                },
+                afterReplicaId: test_utils.rid('test1')
             });
+            const result1 = await writer.flush();
             const checkpoint1 = result1.flushed_op;
-            const result2 = await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
-                await batch.save({
-                    sourceTable: sourceTable,
-                    tag: storage.SaveOperationTag.INSERT,
-                    after: {
-                        id: 'test2'
-                    },
-                    afterReplicaId: test_utils.rid('test2')
-                });
+            await writer.save({
+                sourceTable: sourceTable,
+                tag: storage.SaveOperationTag.INSERT,
+                after: {
+                    id: 'test2'
+                },
+                afterReplicaId: test_utils.rid('test2')
             });
+            const result2 = await writer.flush();
             const checkpoint2 = result2.flushed_op;
             // we expect 0n and 1n, or 1n and 2n.
             expect(checkpoint2).toBeGreaterThan(checkpoint1);
         }
-        catch (e_16) {
-            env_16.error = e_16;
-            env_16.hasError = true;
+        catch (e_18) {
+            env_18.error = e_18;
+            env_18.hasError = true;
         }
         finally {
-            const result_16 = __disposeResources(env_16);
-            if (result_16)
-                await result_16;
+            const result_18 = __disposeResources(env_18);
+            if (result_18)
+                await result_18;
         }
     });
     test('unchanged checksums', async () => {
-        const env_17 = { stack: [], error: void 0, hasError: false };
+        const env_19 = { stack: [], error: void 0, hasError: false };
         try {
-            const factory = __addDisposableResource(env_17, await generateStorageFactory(), true);
+            const factory = __addDisposableResource(env_19, await generateStorageFactory(), true);
             const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
@@ -1454,49 +1444,41 @@ bucket_definitions:
                 storageVersion
             }));
             const bucketStorage = factory.getInstance(syncRules);
-            const sourceTable = TEST_TABLE;
-            await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
-                await batch.markAllSnapshotDone('1/1');
-                await batch.save({
-                    sourceTable,
-                    tag: storage.SaveOperationTag.INSERT,
-                    after: {
-                        id: 'test1',
-                        description: 'test1a'
-                    },
-                    afterReplicaId: test_utils.rid('test1')
-                });
-                await batch.commit('1/1');
+            const writer = __addDisposableResource(env_19, await bucketStorage.createWriter(test_utils.BATCH_OPTIONS), true);
+            const sourceTable = await test_utils.resolveTestTable(writer, 'test', ['id'], config);
+            await writer.markAllSnapshotDone('1/1');
+            await writer.save({
+                sourceTable,
+                tag: storage.SaveOperationTag.INSERT,
+                after: {
+                    id: 'test1',
+                    description: 'test1a'
+                },
+                afterReplicaId: test_utils.rid('test1')
             });
+            await writer.commit('1/1');
             const { checkpoint } = await bucketStorage.getCheckpoint();
-            const checksums = [
-                ...(await bucketStorage.getChecksums(checkpoint, bucketRequests(syncRules, ['global[]']))).values()
-            ];
-            expect(checksums).toEqual([
-                { bucket: bucketRequest(syncRules, 'global[]').bucket, checksum: 1917136889, count: 1 }
-            ]);
-            const checksums2 = [
-                ...(await bucketStorage.getChecksums(checkpoint + 1n, bucketRequests(syncRules, ['global[]']))).values()
-            ];
-            expect(checksums2).toEqual([
-                { bucket: bucketRequest(syncRules, 'global[]').bucket, checksum: 1917136889, count: 1 }
-            ]);
+            const request = bucketRequest(syncRules, 'global[]');
+            const checksums = [...(await bucketStorage.getChecksums(checkpoint, [request])).values()];
+            expect(checksums).toEqual([{ bucket: request.bucket, checksum: 1917136889, count: 1 }]);
+            const checksums2 = [...(await bucketStorage.getChecksums(checkpoint + 1n, [request])).values()];
+            expect(checksums2).toEqual([{ bucket: request.bucket, checksum: 1917136889, count: 1 }]);
         }
-        catch (e_17) {
-            env_17.error = e_17;
-            env_17.hasError = true;
+        catch (e_19) {
+            env_19.error = e_19;
+            env_19.hasError = true;
         }
         finally {
-            const result_17 = __disposeResources(env_17);
-            if (result_17)
-                await result_17;
+            const result_19 = __disposeResources(env_19);
+            if (result_19)
+                await result_19;
         }
     });
     testChecksumBatching(config);
     test('empty checkpoints (1)', async () => {
-        const env_18 = { stack: [], error: void 0, hasError: false };
+        const env_20 = { stack: [], error: void 0, hasError: false };
         try {
-            const factory = __addDisposableResource(env_18, await generateStorageFactory(), true);
+            const factory = __addDisposableResource(env_20, await generateStorageFactory(), true);
             const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
@@ -1504,38 +1486,37 @@ bucket_definitions:
       - SELECT id, description FROM "%"
 `, { storageVersion }));
             const bucketStorage = factory.getInstance(syncRules);
-            await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
-                await batch.markAllSnapshotDone('1/1');
-                await batch.commit('1/1');
-                const cp1 = await bucketStorage.getCheckpoint();
-                expect(cp1.lsn).toEqual('1/1');
-                await batch.commit('2/1', { createEmptyCheckpoints: true });
-                const cp2 = await bucketStorage.getCheckpoint();
-                expect(cp2.lsn).toEqual('2/1');
-                await batch.keepalive('3/1');
-                const cp3 = await bucketStorage.getCheckpoint();
-                expect(cp3.lsn).toEqual('3/1');
-                // For the last one, we skip creating empty checkpoints
-                // This means the LSN stays at 3/1.
-                await batch.commit('4/1', { createEmptyCheckpoints: false });
-                const cp4 = await bucketStorage.getCheckpoint();
-                expect(cp4.lsn).toEqual('3/1');
-            });
+            const writer = __addDisposableResource(env_20, await bucketStorage.createWriter(test_utils.BATCH_OPTIONS), true);
+            await writer.markAllSnapshotDone('1/1');
+            await writer.commit('1/1');
+            const cp1 = await bucketStorage.getCheckpoint();
+            expect(cp1.lsn).toEqual('1/1');
+            await writer.commit('2/1', { createEmptyCheckpoints: true });
+            const cp2 = await bucketStorage.getCheckpoint();
+            expect(cp2.lsn).toEqual('2/1');
+            await writer.keepalive('3/1');
+            const cp3 = await bucketStorage.getCheckpoint();
+            expect(cp3.lsn).toEqual('3/1');
+            // For the last one, we skip creating empty checkpoints
+            // This means the LSN stays at 3/1.
+            await writer.commit('4/1', { createEmptyCheckpoints: false });
+            const cp4 = await bucketStorage.getCheckpoint();
+            expect(cp4.lsn).toEqual('3/1');
         }
-        catch (e_18) {
-            env_18.error = e_18;
-            env_18.hasError = true;
+        catch (e_20) {
+            env_20.error = e_20;
+            env_20.hasError = true;
         }
         finally {
-            const result_18 = __disposeResources(env_18);
-            if (result_18)
-                await result_18;
+            const result_20 = __disposeResources(env_20);
+            if (result_20)
+                await result_20;
         }
     });
     test('empty checkpoints (2)', async () => {
-        const env_19 = { stack: [], error: void 0, hasError: false };
+        const env_21 = { stack: [], error: void 0, hasError: false };
         try {
-            const factory = __addDisposableResource(env_19, await generateStorageFactory(), true);
+            const factory = __addDisposableResource(env_21, await generateStorageFactory(), true);
             const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
@@ -1545,50 +1526,48 @@ bucket_definitions:
                 storageVersion
             }));
             const bucketStorage = factory.getInstance(syncRules);
-            const sourceTable = TEST_TABLE;
-            // We simulate two concurrent batches, but nesting is the easiest way to do this.
-            await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch1) => {
-                await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch2) => {
-                    await batch1.markAllSnapshotDone('1/1');
-                    await batch1.commit('1/1');
-                    await batch1.commit('2/1', { createEmptyCheckpoints: false });
-                    const cp2 = await bucketStorage.getCheckpoint();
-                    expect(cp2.lsn).toEqual('1/1'); // checkpoint 2/1 skipped
-                    await batch2.save({
-                        sourceTable,
-                        tag: storage.SaveOperationTag.INSERT,
-                        after: {
-                            id: 'test1',
-                            description: 'test1a'
-                        },
-                        afterReplicaId: test_utils.rid('test1')
-                    });
-                    // This simulates what happens on a snapshot processor.
-                    // This may later change to a flush() rather than commit().
-                    await batch2.commit(test_utils.BATCH_OPTIONS.zeroLSN);
-                    const cp3 = await bucketStorage.getCheckpoint();
-                    expect(cp3.lsn).toEqual('1/1'); // Still unchanged
-                    // This now needs to advance the LSN, despite {createEmptyCheckpoints: false}
-                    await batch1.commit('4/1', { createEmptyCheckpoints: false });
-                    const cp4 = await bucketStorage.getCheckpoint();
-                    expect(cp4.lsn).toEqual('4/1');
-                });
+            const writer1 = __addDisposableResource(env_21, await bucketStorage.createWriter(test_utils.BATCH_OPTIONS), true);
+            const writer2 = __addDisposableResource(env_21, await bucketStorage.createWriter(test_utils.BATCH_OPTIONS), true);
+            const sourceTable = await test_utils.resolveTestTable(writer2, 'test', ['id'], config);
+            // We simulate two concurrent batches, but sequential calls are enough for this test.
+            await writer1.markAllSnapshotDone('1/1');
+            await writer1.commit('1/1');
+            await writer1.commit('2/1', { createEmptyCheckpoints: false });
+            const cp2 = await bucketStorage.getCheckpoint();
+            expect(cp2.lsn).toEqual('1/1'); // checkpoint 2/1 skipped
+            await writer2.save({
+                sourceTable,
+                tag: storage.SaveOperationTag.INSERT,
+                after: {
+                    id: 'test1',
+                    description: 'test1a'
+                },
+                afterReplicaId: test_utils.rid('test1')
             });
+            // This simulates what happens on a snapshot processor.
+            // This may later change to a flush() rather than commit().
+            await writer2.commit(test_utils.BATCH_OPTIONS.zeroLSN);
+            const cp3 = await bucketStorage.getCheckpoint();
+            expect(cp3.lsn).toEqual('1/1'); // Still unchanged
+            // This now needs to advance the LSN, despite {createEmptyCheckpoints: false}
+            await writer1.commit('4/1', { createEmptyCheckpoints: false });
+            const cp4 = await bucketStorage.getCheckpoint();
+            expect(cp4.lsn).toEqual('4/1');
         }
-        catch (e_19) {
-            env_19.error = e_19;
-            env_19.hasError = true;
+        catch (e_21) {
+            env_21.error = e_21;
+            env_21.hasError = true;
         }
         finally {
-            const result_19 = __disposeResources(env_19);
-            if (result_19)
-                await result_19;
+            const result_21 = __disposeResources(env_21);
+            if (result_21)
+                await result_21;
         }
     });
     test('empty checkpoints (sync rule activation)', async () => {
-        const env_20 = { stack: [], error: void 0, hasError: false };
+        const env_22 = { stack: [], error: void 0, hasError: false };
         try {
-            const factory = __addDisposableResource(env_20, await generateStorageFactory(), true);
+            const factory = __addDisposableResource(env_22, await generateStorageFactory(), true);
             const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
@@ -1598,54 +1577,47 @@ bucket_definitions:
                 storageVersion
             }));
             const bucketStorage = factory.getInstance(syncRules);
-            await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
-                const result = await batch.commit('1/1', { createEmptyCheckpoints: false });
-                expect(result).toEqual({ checkpointBlocked: true, checkpointCreated: false });
-                // Snapshot is only valid once we reach 3/1
-                await batch.markAllSnapshotDone('3/1');
-            });
-            await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
-                // 2/1 < 3/1 - snapshot not valid yet, block checkpoint
-                const result = await batch.commit('2/1', { createEmptyCheckpoints: false });
-                expect(result).toEqual({ checkpointBlocked: true, checkpointCreated: false });
-            });
+            const writer = __addDisposableResource(env_22, await bucketStorage.createWriter(test_utils.BATCH_OPTIONS), true);
+            const result1 = await writer.commit('1/1', { createEmptyCheckpoints: false });
+            expect(result1).toEqual({ checkpointBlocked: true, checkpointCreated: false });
+            // Snapshot is only valid once we reach 3/1
+            await writer.markAllSnapshotDone('3/1');
+            // 2/1 < 3/1 - snapshot not valid yet, block checkpoint
+            const result2 = await writer.commit('2/1', { createEmptyCheckpoints: false });
+            expect(result2).toEqual({ checkpointBlocked: true, checkpointCreated: false });
             // No empty checkpoint should be created by the commit above.
             const cp1 = await bucketStorage.getCheckpoint();
             expect(cp1.lsn).toEqual(null);
-            await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
-                // After this commit, the snapshot should be valid.
-                // We specifically check that this is done even if createEmptyCheckpoints: false.
-                const result = await batch.commit('3/1', { createEmptyCheckpoints: false });
-                expect(result).toEqual({ checkpointBlocked: false, checkpointCreated: true });
-            });
+            // After this commit, the snapshot should be valid.
+            // We specifically check that this is done even if createEmptyCheckpoints: false.
+            const result3 = await writer.commit('3/1', { createEmptyCheckpoints: false });
+            expect(result3).toEqual({ checkpointBlocked: false, checkpointCreated: true });
             // Now, the checkpoint should advance the sync rules active.
             const cp2 = await bucketStorage.getCheckpoint();
             expect(cp2.lsn).toEqual('3/1');
             const activeSyncRules = await factory.getActiveSyncRulesContent();
             expect(activeSyncRules?.id).toEqual(syncRules.id);
-            await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
-                // At this point, it should be a truely empty checkpoint
-                const result = await batch.commit('4/1', { createEmptyCheckpoints: false });
-                expect(result).toEqual({ checkpointBlocked: false, checkpointCreated: false });
-            });
+            // At this point, it should be a truely empty checkpoint
+            const result4 = await writer.commit('4/1', { createEmptyCheckpoints: false });
+            expect(result4).toEqual({ checkpointBlocked: false, checkpointCreated: false });
             // Unchanged
             const cp3 = await bucketStorage.getCheckpoint();
             expect(cp3.lsn).toEqual('3/1');
         }
-        catch (e_20) {
-            env_20.error = e_20;
-            env_20.hasError = true;
+        catch (e_22) {
+            env_22.error = e_22;
+            env_22.hasError = true;
         }
         finally {
-            const result_20 = __disposeResources(env_20);
-            if (result_20)
-                await result_20;
+            const result_22 = __disposeResources(env_22);
+            if (result_22)
+                await result_22;
         }
     });
     test.runIf(storageVersion >= 3)('deleting while streaming', async () => {
-        const env_21 = { stack: [], error: void 0, hasError: false };
+        const env_23 = { stack: [], error: void 0, hasError: false };
         try {
-            const factory = __addDisposableResource(env_21, await generateStorageFactory(), true);
+            const factory = __addDisposableResource(env_23, await generateStorageFactory(), true);
             const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
@@ -1655,49 +1627,51 @@ bucket_definitions:
                 storageVersion
             }));
             const bucketStorage = factory.getInstance(syncRules);
-            const sourceTable = TEST_TABLE;
-            // We simulate two concurrent batches, and nesting is the easiest way to do this.
+            const snapshotWriter = __addDisposableResource(env_23, await bucketStorage.createWriter({
+                ...test_utils.BATCH_OPTIONS,
+                skipExistingRows: true
+            }), true);
+            const streamingWriter = __addDisposableResource(env_23, await bucketStorage.createWriter(test_utils.BATCH_OPTIONS), true);
+            const snapshotTable = await test_utils.resolveTestTable(snapshotWriter, 'test', ['id'], config, 1);
+            const streamingTable = await test_utils.resolveTestTable(streamingWriter, 'test', ['id'], config, 1);
+            // We simulate two concurrent batches; separate writers are enough for this test.
             // For this test, we assume that we start with a row "test1", which is picked up by a snapshot
             // query, right before the delete is streamed. But the snapshot query is only persisted _after_
             // the delete is streamed, and we need to ensure that the streamed delete takes precedence.
-            await bucketStorage.startBatch({ ...test_utils.BATCH_OPTIONS, skipExistingRows: true }, async (snapshotBatch) => {
-                await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (streamingBatch) => {
-                    streamingBatch.save({
-                        sourceTable,
-                        tag: storage.SaveOperationTag.DELETE,
-                        before: {
-                            id: 'test1'
-                        },
-                        beforeReplicaId: test_utils.rid('test1')
-                    });
-                    await streamingBatch.commit('2/1');
-                    await snapshotBatch.save({
-                        sourceTable,
-                        tag: storage.SaveOperationTag.INSERT,
-                        after: {
-                            id: 'test1',
-                            description: 'test1a'
-                        },
-                        afterReplicaId: test_utils.rid('test1')
-                    });
-                    await snapshotBatch.markAllSnapshotDone('3/1');
-                    await snapshotBatch.commit('1/1');
-                    await streamingBatch.keepalive('3/1');
-                });
+            await streamingWriter.save({
+                sourceTable: streamingTable,
+                tag: storage.SaveOperationTag.DELETE,
+                before: {
+                    id: 'test1'
+                },
+                beforeReplicaId: test_utils.rid('test1')
+            });
+            await streamingWriter.commit('2/1');
+            await snapshotWriter.save({
+                sourceTable: snapshotTable,
+                tag: storage.SaveOperationTag.INSERT,
+                after: {
+                    id: 'test1',
+                    description: 'test1a'
+                },
+                afterReplicaId: test_utils.rid('test1')
             });
+            await snapshotWriter.markAllSnapshotDone('3/1');
+            await snapshotWriter.commit('1/1');
+            await streamingWriter.keepalive('3/1');
             const cp = await bucketStorage.getCheckpoint();
             expect(cp.lsn).toEqual('3/1');
-            const data = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(cp.checkpoint, bucketRequestMap(syncRules, [['global[]', 0n]])));
+            const data = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(cp.checkpoint, [bucketRequest(syncRules, 'global[]')]));
             expect(data).toEqual([]);
         }
-        catch (e_21) {
-            env_21.error = e_21;
-            env_21.hasError = true;
+        catch (e_23) {
+            env_23.error = e_23;
+            env_23.hasError = true;
         }
         finally {
-            const result_21 = __disposeResources(env_21);
-            if (result_21)
-                await result_21;
+            const result_23 = __disposeResources(env_23);
+            if (result_23)
+                await result_23;
         }
     });
 }
@@ -1709,9 +1683,9 @@ bucket_definitions:
 export function testChecksumBatching(config) {
     const storageVersion = config.storageVersion ?? CURRENT_STORAGE_VERSION;
     test('checksums for multiple buckets', async () => {
-        const env_22 = { stack: [], error: void 0, hasError: false };
+        const env_24 = { stack: [], error: void 0, hasError: false };
         try {
-            const factory = __addDisposableResource(env_22, await config.factory(), true);
+            const factory = __addDisposableResource(env_24, await config.factory(), true);
             const syncRules = await factory.updateSyncRules(updateSyncRulesFromYaml(`
 bucket_definitions:
   user:
@@ -1722,46 +1696,48 @@ bucket_definitions:
                 storageVersion
             }));
             const bucketStorage = factory.getInstance(syncRules);
-            const sourceTable = test_utils.makeTestTable('test', ['id'], config);
-            await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
-                await batch.markAllSnapshotDone('1/1');
-                for (let u of ['u1', 'u2', 'u3', 'u4']) {
-                    for (let t of ['t1', 't2', 't3', 't4']) {
-                        const id = `${t}_${u}`;
-                        await batch.save({
-                            sourceTable,
-                            tag: storage.SaveOperationTag.INSERT,
-                            after: {
-                                id,
-                                description: `${t} description`,
-                                user_id: u
-                            },
-                            afterReplicaId: test_utils.rid(id)
-                        });
-                    }
+            const writer = __addDisposableResource(env_24, await bucketStorage.createWriter(test_utils.BATCH_OPTIONS), true);
+            const sourceTable = await test_utils.resolveTestTable(writer, 'test', ['id'], config);
+            await writer.markAllSnapshotDone('1/1');
+            for (let u of ['u1', 'u2', 'u3', 'u4']) {
+                for (let t of ['t1', 't2', 't3', 't4']) {
+                    const id = `${t}_${u}`;
+                    await writer.save({
+                        sourceTable,
+                        tag: storage.SaveOperationTag.INSERT,
+                        after: {
+                            id,
+                            description: `${t} description`,
+                            user_id: u
+                        },
+                        afterReplicaId: test_utils.rid(id)
+                    });
                 }
-                await batch.commit('1/1');
-            });
+            }
+            await writer.commit('1/1');
             const { checkpoint } = await bucketStorage.getCheckpoint();
             bucketStorage.clearChecksumCache();
-            const buckets = bucketRequests(syncRules, ['user["u1"]', 'user["u2"]', 'user["u3"]', 'user["u4"]']);
-            const checksums = [...(await bucketStorage.getChecksums(checkpoint, buckets)).values()];
+            const users = ['u1', 'u2', 'u3', 'u4'];
+            const expectedChecksums = [346204588, 5261081, 134760718, -302639724];
+            const bucketRequests = users.map((user) => bucketRequest(syncRules, `user["${user}"]`));
+            const checksums = [...(await bucketStorage.getChecksums(checkpoint, bucketRequests)).values()];
             checksums.sort((a, b) => a.bucket.localeCompare(b.bucket));
-            expect(checksums).toEqual([
-                { bucket: bucketRequest(syncRules, 'user["u1"]').bucket, count: 4, checksum: 346204588 },
-                { bucket: bucketRequest(syncRules, 'user["u2"]').bucket, count: 4, checksum: 5261081 },
-                { bucket: bucketRequest(syncRules, 'user["u3"]').bucket, count: 4, checksum: 134760718 },
-                { bucket: bucketRequest(syncRules, 'user["u4"]').bucket, count: 4, checksum: -302639724 }
-            ]);
+            const expected = bucketRequests.map((request, index) => ({
+                bucket: request.bucket,
+                count: 4,
+                checksum: expectedChecksums[index]
+            }));
+            expected.sort((a, b) => a.bucket.localeCompare(b.bucket));
+            expect(checksums).toEqual(expected);
         }
-        catch (e_22) {
-            env_22.error = e_22;
-            env_22.hasError = true;
+        catch (e_24) {
+            env_24.error = e_24;
+            env_24.hasError = true;
         }
         finally {
-            const result_22 = __disposeResources(env_22);
-            if (result_22)
-                await result_22;
+            const result_24 = __disposeResources(env_24);
+            if (result_24)
+                await result_24;
         }
     });
 }