jketreno/ketr.photos
1
0
Fork 0
Code Issues 1 Activity

Restrucutre transactions to try and debug HASH conflict issue

Browse Source 
Signed-off-by: James Ketrenos <james_git@ketrenos.com>
This commit is contained in:
James Ketr 2023-01-12 16:55:35 -08:00
parent be92b7db53
commit fba22f9909
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
server/scanner.js
View File

@ -347,6 +347,7 @@ const processBlock = async (items) => {
asset.duplicate = duplicate.photoId; asset.duplicate = duplicate.photoId;
duplicates.push(asset); duplicates.push(asset);
} }
return; /* Done processing this asset (DUPLICATE) */ return; /* Done processing this asset (DUPLICATE) */
} }
@ -381,13 +382,8 @@ const processBlock = async (items) => {
transaction: t transaction: t
}); });
}); });
await Promise.mapSeries(insertHash, async (item) => { });
await photoDB.sequelize.query( await photoDB.sequelize.transaction(async (t) => {
"INSERT INTO photohashes (hash,photoId) VALUES(:hash,:id)", {
replacements: item,
transaction: t
});
});
/* Update the DB with the image information */ /* Update the DB with the image information */
await Promise.mapSeries(updateAsset, async (item) => { await Promise.mapSeries(updateAsset, async (item) => {
await photoDB.sequelize.query("UPDATE photos SET " + await photoDB.sequelize.query("UPDATE photos SET " +
@ -398,6 +394,15 @@ const processBlock = async (items) => {
}); });
}); });
}); });
await photoDB.sequelize.transaction(async (t) => {
await Promise.mapSeries(insertHash, async (item) => {
await photoDB.sequelize.query(
"INSERT INTO photohashes (hash,photoId) VALUES(:hash,:id)", {
replacements: item,
transaction: t
});
});
});
} catch (error) { } catch (error) {
console.error(error); console.error(error);
process.exit(-1); process.exit(-1);