Batch mark FTS indexed

pull/172/head
M66B 6 years ago
parent 04716fc06f
commit 25179787be

@ -32,6 +32,8 @@ import androidx.work.Worker;
import androidx.work.WorkerParameters; import androidx.work.WorkerParameters;
import java.io.File; import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import io.requery.android.database.sqlite.SQLiteDatabase; import io.requery.android.database.sqlite.SQLiteDatabase;
@ -40,6 +42,7 @@ import static android.os.Process.THREAD_PRIORITY_BACKGROUND;
public class WorkerFts extends Worker { public class WorkerFts extends Worker {
private static final int INDEX_DELAY = 30; // seconds private static final int INDEX_DELAY = 30; // seconds
private static final int INDEX_BATCH_SIZE = 500;
public WorkerFts(@NonNull Context context, @NonNull WorkerParameters workerParams) { public WorkerFts(@NonNull Context context, @NonNull WorkerParameters workerParams) {
super(context, workerParams); super(context, workerParams);
@ -55,24 +58,32 @@ public class WorkerFts extends Worker {
Log.i("FTS index"); Log.i("FTS index");
int indexed = 0; int indexed = 0;
List<Long> ids = new ArrayList<>(INDEX_BATCH_SIZE);
DB db = DB.getInstance(getApplicationContext()); DB db = DB.getInstance(getApplicationContext());
SQLiteDatabase sdb = FtsDbHelper.getInstance(getApplicationContext()); SQLiteDatabase sdb = FtsDbHelper.getInstance(getApplicationContext());
try (Cursor cursor = db.message().getMessageFts()) { try (Cursor cursor = db.message().getMessageFts()) {
while (cursor.moveToNext()) { while (cursor.moveToNext()) {
EntityMessage message = db.message().getMessage(cursor.getLong(0)); long id = cursor.getLong(0);
EntityMessage message = db.message().getMessage(id);
if (message != null) if (message != null)
try { try {
Log.i("FTS index=" + message.id); Log.i("FTS index=" + message.id);
File file = message.getFile(getApplicationContext()); File file = message.getFile(getApplicationContext());
String html = Helper.readText(file); String html = Helper.readText(file);
String text = HtmlHelper.getText(html); String text = HtmlHelper.getText(html);
FtsDbHelper.insert(sdb, message, text); FtsDbHelper.insert(sdb, message, text);
db.message().setMessageFts(message.id, true);
indexed++; indexed++;
ids.add(id);
if (ids.size() > INDEX_BATCH_SIZE)
markIndexed(db, ids);
} catch (Throwable ex) { } catch (Throwable ex) {
Log.e(ex); Log.e(ex);
} }
} }
markIndexed(db, ids);
} }
Log.i("FTS indexed=" + indexed); Log.i("FTS indexed=" + indexed);
@ -83,6 +94,18 @@ public class WorkerFts extends Worker {
} }
} }
private void markIndexed(DB db, List<Long> ids) {
try {
db.beginTransaction();
for (Long id : ids)
db.message().setMessageFts(id, true);
db.setTransactionSuccessful();
} finally {
db.endTransaction();
}
ids.clear();
}
static void init(Context context, boolean immediately) { static void init(Context context, boolean immediately) {
try { try {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);

Loading…
Cancel
Save