beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

[mob][photos] Delete instead of drop table

Browse source
This commit is contained in:
laurenspriem 2024-05-27 17:09:33 +05:30
parent 8f474a4500
commit 9cf5691e42
2 changed files with 17 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
mobile/lib/face/db.dart
View file

@ -229,10 +229,10 @@ class FaceMLDataDB {
final db = await instance.asyncDB; final db = await instance.asyncDB;
await db.execute(deleteFacesTable); await db.execute(deleteFacesTable);
await db.execute(dropClusterPersonTable); await db.execute(deleteFaceClustersTable);
await db.execute(dropClusterSummaryTable); await db.execute(deleteClusterPersonTable);
await db.execute(deletePersonTable); await db.execute(deleteClusterSummaryTable);
await db.execute(dropNotPersonFeedbackTable); await db.execute(deleteNotPersonFeedbackTable);
} }
Future<Iterable<Uint8List>> getFaceEmbeddingsForCluster( Future<Iterable<Uint8List>> getFaceEmbeddingsForCluster(
@ -768,7 +768,7 @@ class FaceMLDataDB {
try { try {
final db = await instance.asyncDB; final db = await instance.asyncDB;
await db.execute(dropFaceClustersTable); await db.execute(deleteFaceClustersTable);
await db.execute(createFaceClustersTable); await db.execute(createFaceClustersTable);
await db.execute(fcClusterIDIndex); await db.execute(fcClusterIDIndex);
} catch (e, s) { } catch (e, s) {
@ -979,16 +979,15 @@ class FaceMLDataDB {
if (faces) { if (faces) {
await db.execute(deleteFacesTable); await db.execute(deleteFacesTable);
await db.execute(createFacesTable); await db.execute(createFacesTable);
await db.execute(dropFaceClustersTable); await db.execute(deleteFaceClustersTable);
await db.execute(createFaceClustersTable); await db.execute(createFaceClustersTable);
await db.execute(fcClusterIDIndex); await db.execute(fcClusterIDIndex);
} }
await db.execute(deletePersonTable); await db.execute(deleteClusterPersonTable);
await db.execute(dropClusterPersonTable); await db.execute(deleteNotPersonFeedbackTable);
await db.execute(dropNotPersonFeedbackTable); await db.execute(deleteClusterSummaryTable);
await db.execute(dropClusterSummaryTable); await db.execute(deleteFaceClustersTable);
await db.execute(dropFaceClustersTable);
await db.execute(createClusterPersonTable); await db.execute(createClusterPersonTable);
await db.execute(createNotPersonFeedbackTable); await db.execute(createNotPersonFeedbackTable);
@ -1006,9 +1005,8 @@ class FaceMLDataDB {
final db = await instance.asyncDB; final db = await instance.asyncDB;
// Drop the tables // Drop the tables
await db.execute(deletePersonTable); await db.execute(deleteClusterPersonTable);
await db.execute(dropClusterPersonTable); await db.execute(deleteNotPersonFeedbackTable);
await db.execute(dropNotPersonFeedbackTable);
// Recreate the tables // Recreate the tables
await db.execute(createClusterPersonTable); await db.execute(createClusterPersonTable);

16
mobile/lib/face/db_fields.dart
View file

@ -29,7 +29,7 @@ const createFacesTable = '''CREATE TABLE IF NOT EXISTS $facesTable (
); );
'''; ''';
const deleteFacesTable = 'DROP TABLE IF EXISTS $facesTable'; const deleteFacesTable = 'DELETE FROM $facesTable';
// End of Faces Table Fields & Schema Queries // End of Faces Table Fields & Schema Queries
//##region Face Clusters Table Fields & Schema Queries //##region Face Clusters Table Fields & Schema Queries
@ -48,15 +48,9 @@ CREATE TABLE IF NOT EXISTS $faceClustersTable (
// -- Creating a non-unique index on clusterID for query optimization // -- Creating a non-unique index on clusterID for query optimization
const fcClusterIDIndex = const fcClusterIDIndex =
'''CREATE INDEX IF NOT EXISTS idx_fcClusterID ON $faceClustersTable($fcClusterID);'''; '''CREATE INDEX IF NOT EXISTS idx_fcClusterID ON $faceClustersTable($fcClusterID);''';
const dropFaceClustersTable = 'DROP TABLE IF EXISTS $faceClustersTable'; const deleteFaceClustersTable = 'DELETE FROM $faceClustersTable';
//##endregion //##endregion
// People Table Fields & Schema Queries
const personTable = 'person';
const deletePersonTable = 'DROP TABLE IF EXISTS $personTable';
//End People Table Fields & Schema Queries
// Clusters Table Fields & Schema Queries // Clusters Table Fields & Schema Queries
const clusterPersonTable = 'cluster_person'; const clusterPersonTable = 'cluster_person';
const personIdColumn = 'person_id'; const personIdColumn = 'person_id';
@ -69,7 +63,7 @@ CREATE TABLE IF NOT EXISTS $clusterPersonTable (
PRIMARY KEY($personIdColumn, $clusterIDColumn) PRIMARY KEY($personIdColumn, $clusterIDColumn)
); );
'''; ''';
const dropClusterPersonTable = 'DROP TABLE IF EXISTS $clusterPersonTable'; const deleteClusterPersonTable = 'DELETE FROM $clusterPersonTable';
// End Clusters Table Fields & Schema Queries // End Clusters Table Fields & Schema Queries
/// Cluster Summary Table Fields & Schema Queries /// Cluster Summary Table Fields & Schema Queries
@ -85,7 +79,7 @@ CREATE TABLE IF NOT EXISTS $clusterSummaryTable (
); );
'''; ''';
const dropClusterSummaryTable = 'DROP TABLE IF EXISTS $clusterSummaryTable'; const deleteClusterSummaryTable = 'DELETE FROM $clusterSummaryTable';
/// End Cluster Summary Table Fields & Schema Queries /// End Cluster Summary Table Fields & Schema Queries
@ -99,5 +93,5 @@ CREATE TABLE IF NOT EXISTS $notPersonFeedback (
PRIMARY KEY($personIdColumn, $clusterIDColumn) PRIMARY KEY($personIdColumn, $clusterIDColumn)
); );
'''; ''';
const dropNotPersonFeedbackTable = 'DROP TABLE IF EXISTS $notPersonFeedback'; const deleteNotPersonFeedbackTable = 'DELETE FROM $notPersonFeedback';
// End Clusters Table Fields & Schema Queries // End Clusters Table Fields & Schema Queries