Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Drop redundant 400-row chunking from batch writes

laurenspriembd27d188e3ba
diff --git a/mobile/apps/photos/lib/db/collections_db.dart b/mobile/apps/photos/lib/db/collections_db.dart
index c7af19972e..17fef82bdf 100644
--- a/mobile/apps/photos/lib/db/collections_db.dart
+++ b/mobile/apps/photos/lib/db/collections_db.dart
@@ -188,15 +188,10 @@ class CollectionsDB with SqlDbBase {
Future<void> insert(List<Collection> collections) async {
final db = await instance.database;
- final parameterSets = <List<Object?>>[];
- for (final collection in collections) {
- parameterSets.add(_getParametersForCollection(collection));
- if (parameterSets.length == 400) {
- await _insertBatch(db, parameterSets);
- parameterSets.clear();
- }
- }
- await _insertBatch(db, parameterSets);
+ await _insertBatch(db, [
+ for (final collection in collections)
+ _getParametersForCollection(collection),
+ ]);
}
Future<List<Collection>> getAllCollections() async {
diff --git a/mobile/apps/photos/lib/db/file_updation_db.dart b/mobile/apps/photos/lib/db/file_updation_db.dart
index cc9aa4a114..c80b519ab5 100644
--- a/mobile/apps/photos/lib/db/file_updation_db.dart
+++ b/mobile/apps/photos/lib/db/file_updation_db.dart
@@ -57,15 +57,9 @@ class FileUpdationDB with SqlDbBase {
Future<void> insertMultiple(List<String> fileLocalIDs, String reason) async {
final startTime = DateTime.now();
final db = await instance.database;
- final parameterSets = <List<Object?>>[];
- for (final localID in fileLocalIDs) {
- parameterSets.add([localID, reason]);
- if (parameterSets.length == 400) {
- await _insertBatch(db, parameterSets);
- parameterSets.clear();
- }
- }
- await _insertBatch(db, parameterSets);
+ await _insertBatch(db, [
+ for (final localID in fileLocalIDs) [localID, reason],
+ ]);
final endTime = DateTime.now();
final duration = Duration(
microseconds:
diff --git a/mobile/apps/photos/lib/db/ignored_files_db.dart b/mobile/apps/photos/lib/db/ignored_files_db.dart
index 90b35909af..7238df82fa 100644
--- a/mobile/apps/photos/lib/db/ignored_files_db.dart
+++ b/mobile/apps/photos/lib/db/ignored_files_db.dart
@@ -46,20 +46,10 @@ class IgnoredFilesDB with SqlDbBase {
Future<void> insertMultiple(List<IgnoredFile> ignoredFiles) async {
final startTime = DateTime.now();
final db = await instance.database;
- final parameterSets = <List<Object?>>[];
- for (final file in ignoredFiles) {
- parameterSets.add([
- file.localID,
- file.title,
- file.deviceFolder,
- file.reason,
- ]);
- if (parameterSets.length == 400) {
- await _insertBatch(db, parameterSets);
- parameterSets.clear();
- }
- }
- await _insertBatch(db, parameterSets);
+ await _insertBatch(db, [
+ for (final file in ignoredFiles)
+ [file.localID, file.title, file.deviceFolder, file.reason],
+ ]);
final endTime = DateTime.now();
final duration = Duration(
microseconds:
@@ -84,17 +74,10 @@ class IgnoredFilesDB with SqlDbBase {
Future<void> removeIgnoredEntries(List<IgnoredFile> ignoredFiles) async {
final startTime = DateTime.now();
final db = await instance.database;
- final parameterSets = <List<Object?>>[];
- for (final file in ignoredFiles) {
- parameterSets.add(
+ await _deleteBatch(db, [
+ for (final file in ignoredFiles)
Platform.isAndroid ? [file.deviceFolder, file.title] : [file.localID],
- );
- if (parameterSets.length == 400) {
- await _deleteBatch(db, parameterSets);
- parameterSets.clear();
- }
- }
- await _deleteBatch(db, parameterSets);
+ ]);
final endTime = DateTime.now();
final duration = Duration(
microseconds:
diff --git a/mobile/apps/photos/lib/db/trash_db.dart b/mobile/apps/photos/lib/db/trash_db.dart
index 724cc23768..adb06d80b4 100644
--- a/mobile/apps/photos/lib/db/trash_db.dart
+++ b/mobile/apps/photos/lib/db/trash_db.dart
@@ -89,15 +89,9 @@ class TrashDB with SqlDbBase {
Future<void> insertMultiple(List<EnteTrashFile> trashFiles) async {
final startTime = DateTime.now();
final db = await instance.database;
- final parameterSets = <List<Object?>>[];
- for (final trash in trashFiles) {
- parameterSets.add(_getParametersForTrash(trash));
- if (parameterSets.length == 400) {
- await _insertBatch(db, parameterSets);
- parameterSets.clear();
- }
- }
- await _insertBatch(db, parameterSets);
+ await _insertBatch(db, [
+ for (final trash in trashFiles) _getParametersForTrash(trash),
+ ]);
final endTime = DateTime.now();
final duration = Duration(
microseconds: