From d85dbe429dbb375cb2e666a25660dd79b832c63a Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Wed, 9 Apr 2025 13:51:43 +0100 Subject: [PATCH] Merge pull request #24745 from overleaf/bg-history-use-consistent-import-for-chunk-store use consistent import for chunk_store GitOrigin-RevId: 427b148c53c9d0913b2cdfdc634273a1d8ece060 --- .../history-v1/storage/lib/backupGenerator.mjs | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/services/history-v1/storage/lib/backupGenerator.mjs b/services/history-v1/storage/lib/backupGenerator.mjs index f6b1b01a31..4c18929d54 100644 --- a/services/history-v1/storage/lib/backupGenerator.mjs +++ b/services/history-v1/storage/lib/backupGenerator.mjs @@ -2,11 +2,7 @@ * Provides a generator function to back up project chunks and blobs. */ -import { - getProjectChunksFromVersion, - loadAtVersion, - loadByChunkRecord, -} from './chunk_store/index.js' +import chunkStore from './chunk_store/index.js' import { GLOBAL_BLOBS, // NOTE: must call loadGlobalBlobs() before using this @@ -33,7 +29,10 @@ async function lookBehindForSeenBlobs( ) { // the snapshot in this chunk has not been backed up // so we find the set of backed up blobs from the previous chunk - const previousChunk = await loadAtVersion(projectId, lastBackedUpVersion) + const previousChunk = await chunkStore.loadAtVersion( + projectId, + lastBackedUpVersion + ) const previousChunkHistory = previousChunk.getHistory() previousChunkHistory.findBlobHashes(seenBlobs) } @@ -115,13 +114,13 @@ export async function* backupGenerator(projectId, lastBackedUpVersion) { lastBackedUpVersion >= 0 ? lastBackedUpVersion + 1 : 0 let isStartingChunk = true let currentBackedUpVersion = lastBackedUpVersion - const chunkRecordIterator = getProjectChunksFromVersion( + const chunkRecordIterator = chunkStore.getProjectChunksFromVersion( projectId, firstPendingVersion ) for await (const chunkRecord of chunkRecordIterator) { - const { chunk, chunkBuffer } = await loadByChunkRecord( + const { chunk, chunkBuffer } = await chunkStore.loadByChunkRecord( projectId, chunkRecord )