Skip to content

Commit 64e2abc

Browse files
rkistnerrkistner
committed
Fix data storage tests - markSnapshotComplete is required.
1 parent 531e887 commit 64e2abc

File tree

3 files changed

+45
-0
lines changed

3 files changed

+45
-0
lines changed

‎packages/service-core-tests/src/tests/register-data-storage-checkpoint-tests.ts‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ bucket_definitions:
3131
.watchCheckpointChanges({ user_id: 'user1', signal: abortController.signal })
3232
[Symbol.asyncIterator]();
3333

34+
await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
35+
await batch.markAllSnapshotDone('1/1');
36+
});
37+
3438
const writeCheckpoint = await bucketStorage.createManagedWriteCheckpoint({
3539
heads: { '1': '5/0' },
3640
user_id: 'user1'
@@ -65,6 +69,10 @@ bucket_definitions:
6569
});
6670
const bucketStorage = factory.getInstance(r.persisted_sync_rules!);
6771

72+
await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
73+
await batch.markAllSnapshotDone('1/1');
74+
});
75+
6876
const abortController = new AbortController();
6977
context.onTestFinished(() => abortController.abort());
7078
const iter = bucketStorage
@@ -128,6 +136,10 @@ bucket_definitions:
128136
const bucketStorage = factory.getInstance(r.persisted_sync_rules!);
129137
bucketStorage.setWriteCheckpointMode(storage.WriteCheckpointMode.CUSTOM);
130138

139+
await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
140+
await batch.markAllSnapshotDone('1/1');
141+
});
142+
131143
const abortController = new AbortController();
132144
context.onTestFinished(() => abortController.abort());
133145
const iter = bucketStorage
@@ -168,6 +180,10 @@ bucket_definitions:
168180
const bucketStorage = factory.getInstance(r.persisted_sync_rules!);
169181
bucketStorage.setWriteCheckpointMode(storage.WriteCheckpointMode.CUSTOM);
170182

183+
await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
184+
await batch.markAllSnapshotDone('1/1');
185+
});
186+
171187
const abortController = new AbortController();
172188
context.onTestFinished(() => abortController.abort());
173189
const iter = bucketStorage
@@ -211,6 +227,10 @@ bucket_definitions:
211227
const bucketStorage = factory.getInstance(r.persisted_sync_rules!);
212228
bucketStorage.setWriteCheckpointMode(storage.WriteCheckpointMode.CUSTOM);
213229

230+
await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
231+
await batch.markAllSnapshotDone('1/1');
232+
});
233+
214234
const abortController = new AbortController();
215235
context.onTestFinished(() => abortController.abort());
216236
const iter = bucketStorage

‎packages/service-core-tests/src/tests/register-data-storage-data-tests.ts‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ bucket_definitions:
3939

4040
await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
4141
const sourceTable = TEST_TABLE;
42+
await batch.markAllSnapshotDone('1/1');
4243

4344
await batch.save({
4445
sourceTable,
@@ -100,6 +101,7 @@ bucket_definitions:
100101

101102
const sourceTable = TEST_TABLE;
102103
await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
104+
await batch.markAllSnapshotDone('1/1');
103105
await batch.save({
104106
sourceTable,
105107
tag: storage.SaveOperationTag.INSERT,
@@ -165,6 +167,7 @@ bucket_definitions:
165167

166168
await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
167169
const sourceTable = TEST_TABLE;
170+
await batch.markAllSnapshotDone('1/1');
168171

169172
await batch.save({
170173
sourceTable,
@@ -241,6 +244,7 @@ bucket_definitions:
241244
const bucketStorage = factory.getInstance(syncRules);
242245

243246
await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
247+
await batch.markAllSnapshotDone('1/1');
244248
const sourceTable = TEST_TABLE;
245249

246250
await batch.save({
@@ -255,6 +259,7 @@ bucket_definitions:
255259
});
256260

257261
await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
262+
await batch.markAllSnapshotDone('1/1');
258263
const sourceTable = TEST_TABLE;
259264

260265
await batch.save({
@@ -287,6 +292,7 @@ bucket_definitions:
287292
});
288293

289294
await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
295+
await batch.markAllSnapshotDone('1/1');
290296
const sourceTable = TEST_TABLE;
291297

292298
await batch.save({
@@ -372,6 +378,7 @@ bucket_definitions:
372378

373379
// Pre-setup
374380
const result1 = await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
381+
await batch.markAllSnapshotDone('1/1');
375382
const sourceTable = TEST_TABLE;
376383

377384
await batch.save({
@@ -532,6 +539,7 @@ bucket_definitions:
532539

533540
// Pre-setup
534541
const result1 = await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
542+
await batch.markAllSnapshotDone('1/1');
535543
await batch.save({
536544
sourceTable,
537545
tag: storage.SaveOperationTag.INSERT,
@@ -640,6 +648,7 @@ bucket_definitions:
640648

641649
// Pre-setup
642650
const result1 = await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
651+
await batch.markAllSnapshotDone('1/1');
643652
await batch.save({
644653
sourceTable,
645654
tag: storage.SaveOperationTag.INSERT,
@@ -735,6 +744,7 @@ bucket_definitions:
735744
const bucketStorage = factory.getInstance(syncRules);
736745

737746
await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
747+
await batch.markAllSnapshotDone('1/1');
738748
const sourceTable = TEST_TABLE;
739749

740750
const largeDescription = '0123456789'.repeat(12_000_00);
@@ -844,6 +854,7 @@ bucket_definitions:
844854
const bucketStorage = factory.getInstance(syncRules);
845855

846856
await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
857+
await batch.markAllSnapshotDone('1/1');
847858
const sourceTable = TEST_TABLE;
848859

849860
for (let i = 1; i <= 6; i++) {
@@ -923,6 +934,7 @@ bucket_definitions:
923934
const bucketStorage = factory.getInstance(syncRules);
924935

925936
await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
937+
await batch.markAllSnapshotDone('1/1');
926938
const sourceTable = TEST_TABLE;
927939

928940
for (let i = 1; i <= 10; i++) {
@@ -1100,6 +1112,7 @@ bucket_definitions:
11001112
const sourceTableIgnore = test_utils.makeTestTable('test_ignore', ['id']);
11011113

11021114
const result1 = await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
1115+
await batch.markAllSnapshotDone('1/1');
11031116
// This saves a record to current_data, but not bucket_data.
11041117
// This causes a checkpoint to be created without increasing the op_id sequence.
11051118
await batch.save({
@@ -1144,6 +1157,7 @@ bucket_definitions:
11441157

11451158
const sourceTable = TEST_TABLE;
11461159
await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
1160+
await batch.markAllSnapshotDone('1/1');
11471161
await batch.save({
11481162
sourceTable,
11491163
tag: storage.SaveOperationTag.INSERT,
@@ -1187,6 +1201,7 @@ bucket_definitions:
11871201

11881202
const sourceTable = TEST_TABLE;
11891203
await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
1204+
await batch.markAllSnapshotDone('1/1');
11901205
for (let u of ['u1', 'u2', 'u3', 'u4']) {
11911206
for (let t of ['t1', 't2', 't3', 't4']) {
11921207
const id = `${t}_${u}`;

‎packages/service-core-tests/src/tests/register-data-storage-parameter-tests.ts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ bucket_definitions:
3030
const bucketStorage = factory.getInstance(syncRules);
3131

3232
await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
33+
await batch.markAllSnapshotDone('1/1');
34+
3335
await batch.save({
3436
sourceTable: TEST_TABLE,
3537
tag: storage.SaveOperationTag.INSERT,
@@ -80,6 +82,7 @@ bucket_definitions:
8082
const bucketStorage = factory.getInstance(syncRules);
8183

8284
await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
85+
await batch.markAllSnapshotDone('1/1');
8386
await batch.save({
8487
sourceTable: TEST_TABLE,
8588
tag: storage.SaveOperationTag.INSERT,
@@ -140,6 +143,7 @@ bucket_definitions:
140143
const table = test_utils.makeTestTable('todos', ['id', 'list_id']);
141144

142145
await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
146+
await batch.markAllSnapshotDone('1/1');
143147
// Create two todos which initially belong to different lists
144148
await batch.save({
145149
sourceTable: table,
@@ -211,6 +215,7 @@ bucket_definitions:
211215
const bucketStorage = factory.getInstance(syncRules);
212216

213217
await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
218+
await batch.markAllSnapshotDone('1/1');
214219
await batch.save({
215220
sourceTable: TEST_TABLE,
216221
tag: storage.SaveOperationTag.INSERT,
@@ -263,6 +268,7 @@ bucket_definitions:
263268
const bucketStorage = factory.getInstance(syncRules);
264269

265270
await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
271+
await batch.markAllSnapshotDone('1/1');
266272
await batch.save({
267273
sourceTable: TEST_TABLE,
268274
tag: storage.SaveOperationTag.INSERT,
@@ -318,6 +324,7 @@ bucket_definitions:
318324
const bucketStorage = factory.getInstance(syncRules);
319325

320326
await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
327+
await batch.markAllSnapshotDone('1/1');
321328
await batch.save({
322329
sourceTable: WORKSPACE_TABLE,
323330
tag: storage.SaveOperationTag.INSERT,
@@ -371,6 +378,7 @@ bucket_definitions:
371378
const bucketStorage = factory.getInstance(syncRules);
372379

373380
await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
381+
await batch.markAllSnapshotDone('1/1');
374382
await batch.save({
375383
sourceTable: WORKSPACE_TABLE,
376384
tag: storage.SaveOperationTag.INSERT,
@@ -461,6 +469,7 @@ bucket_definitions:
461469
const bucketStorage = factory.getInstance(syncRules);
462470

463471
await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
472+
await batch.markAllSnapshotDone('1/1');
464473
await batch.save({
465474
sourceTable: WORKSPACE_TABLE,
466475
tag: storage.SaveOperationTag.INSERT,
@@ -555,6 +564,7 @@ bucket_definitions:
555564
const bucketStorage = factory.getInstance(syncRules);
556565

557566
await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
567+
await batch.markAllSnapshotDone('1/1');
558568
await batch.save({
559569
sourceTable: TEST_TABLE,
560570
tag: storage.SaveOperationTag.INSERT,

0 commit comments

Comments
 (0)