github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-14 20:40:17 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #21506 from overleaf/jpa-fix-batched-update-edge

Browse source 
[web] fix edge behavior of batchedUpdate

GitOrigin-RevId: 5d1c0b884aa02c52682d114fa66b2d9b201e724e
This commit is contained in:
Jakob Ackermann 2024-11-01 13:16:23 +01:00 committed by Copybot
parent 2402f9ea99
commit bf2ad1952c
2 changed files with 71 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
services/web/scripts/helpers/batchedUpdate.mjs
View file

@ -91,12 +91,12 @@ async function getNextBatch(
if (BATCH_DESCENDING) {
query._id = {
$gt: end,
$lt: start,
$lte: start,
}
} else {
query._id = {
$gt: start,
$lt: end,
$lte: end,
}
}
return await collection

69
services/web/test/acceptance/src/BatchedUpdateTests.mjs
View file

@ -36,4 +36,73 @@ describe('BatchedUpdateTests', function () {
{ content: '42' },
])
})
it('can handle ids sitting on the edge', async function () {
const edge = '3028de800000000000000000'
await db.systemmessages.insertOne({
content: '1',
_id: new ObjectId('300000000000000000000000'),
})
await db.systemmessages.insertOne({
content: '2',
_id: new ObjectId(),
})
await db.systemmessages.insertOne({
content: '3',
_id: new ObjectId('400000000000000000000000'),
})
const { stderr } = spawnSync(
process.argv0,
[
'--input-type=module',
'-e',
'import BatchedUpdateModule from "./scripts/helpers/batchedUpdate.mjs"; BatchedUpdateModule.batchedUpdateWithResultHandling("systemmessages", { content: { $ne: "42" }}, { $set: { content: "42" } })',
],
{ encoding: 'utf-8' }
)
expect(
await db.systemmessages.find({}).project({ content: 1, _id: 0 }).toArray()
).to.deep.equal([{ content: '42' }, { content: '42' }, { content: '42' }])
expect(stderr).to.include('Completed batch ending 300000000000000000000000')
expect(stderr).to.include(`Completed batch ending ${edge}`) // hit the edge
expect(stderr).to.include('Completed batch ending 400000000000000000000000')
})
it('can handle ids sitting on the edge descending', async function () {
const edge = '3fd721800000000000000000'
await db.systemmessages.insertOne({
content: '1',
_id: new ObjectId('300000000000000000000000'),
})
await db.systemmessages.insertOne({
content: '2',
_id: new ObjectId(edge),
})
await db.systemmessages.insertOne({
content: '3',
_id: new ObjectId('400000000000000000000000'),
})
const { stderr } = spawnSync(
process.argv0,
[
'--input-type=module',
'-e',
'import BatchedUpdateModule from "./scripts/helpers/batchedUpdate.mjs"; BatchedUpdateModule.batchedUpdateWithResultHandling("systemmessages", { content: { $ne: "42" }}, { $set: { content: "42" } })',
],
{
encoding: 'utf-8',
env: {
...process.env,
BATCH_DESCENDING: 'true',
BATCH_RANGE_START: '400000000000000000000001',
},
}
)
expect(
await db.systemmessages.find({}).project({ content: 1, _id: 0 }).toArray()
).to.deep.equal([{ content: '42' }, { content: '42' }, { content: '42' }])
expect(stderr).to.include('Completed batch ending 400000000000000000000000')
expect(stderr).to.include(`Completed batch ending ${edge}`) // hit the edge
expect(stderr).to.include('Completed batch ending 300000000000000000000000')
})
})