fix: records update bugs and inefficiency #2941
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
TBonnin
force-pushed
the
tbonnin/fix-batch-update-nov4
branch
3 times, most recently
from
39fa78c to
3e83b26
Compare
TBonnin
changed the title
TBonnin
commented
Nov 5, 2024
| @@ -322,24 +313,27 @@ export async function update({ | |||
| for (let i = 0; i < recordsWithoutDuplicates.length; i += BATCH_SIZE) { | |||
| const chunk = recordsWithoutDuplicates.slice(i, i + BATCH_SIZE); | |||
|
|
|||
| updatedKeys.push(...(await getUpdatedKeys({ records: chunk, connectionId, model, trx }))); | |||
| const oldRecords = await getRecordsToUpdate({ records: chunk, connectionId, model, trx }); | |||
There was a problem hiding this comment.
we used to make 2 queries to get the existing records to update. :(
|
|
||
| const newRecord: FormattedRecord = { | ||
| ...oldRecordRest, | ||
| ...newRecordRest, |
There was a problem hiding this comment.
that was a bug. The only attributes that is different is the sync_job_id but was not updated
| @@ -14,7 +14,7 @@ function isEncrypted(data: UnencryptedRecordData | EncryptedRecordData): data is | |||
| return 'encryptedValue' in data; | |||
| } | |||
|
|
|||
| export function decryptRecord(record: FormattedRecord): UnencryptedRecordData { | |||
| export function decryptRecordData(record: FormattedRecord): UnencryptedRecordData { | |||
There was a problem hiding this comment.
renaming to make it clearer that the function only return the unencrypted data not the entire record
| @@ -69,7 +69,7 @@ export const sendSync = async ({ | |||
| responseResults?.added === 0 && responseResults?.updated === 0 && (responseResults.deleted === 0 || responseResults.deleted === undefined); | |||
|
|
|||
| if (!webhookSettings.on_sync_completion_always && noChanges) { | |||
| await logCtx?.info('There were no added, updated, or deleted results. No webhook sent, as per your environment settings'); | |||
| await logCtx?.info(`There were no added, updated, or deleted results for model ${model}. No webhook sent, as per your environment settings`); | |||
There was a problem hiding this comment.
unrelated but it is confusing in the logs to see multiple times the same message when sync is multi model
bodinsamuel
approved these changes
Nov 5, 2024
| updatedKeys.push(...(await getUpdatedKeys({ records: chunk, connectionId, model, trx }))); | ||
| const chunkUpdatedKeys = await getUpdatedKeys({ records: chunk, connectionId, model, trx }); | ||
| if (chunkUpdatedKeys.length === 0) { | ||
| logger.warn(`Did not find records to update: ${{ connectionId, model }}`); |
There was a problem hiding this comment.
logger.warn does not exists (types are wrong), it's logger.warning
TBonnin
force-pushed
the
tbonnin/fix-batch-update-nov4
branch
from
3e83b26 to
33c5aa0
Compare
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Describe your changes
Found a few small issues in the records update function as well as some inefficiency.
Checklist before requesting a review (skip if just adding/editing APIs & templates)