From f027836c0cf2f3d3a565effd9013f01f2f1996eb Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Sun, 24 Nov 2019 09:52:01 -0600 Subject: [PATCH] Time queries --- app/src/main/java/com/todoroo/astrid/dao/TaskDao.java | 6 +++++- app/src/main/java/org/tasks/ui/TaskListViewModel.java | 2 -- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/todoroo/astrid/dao/TaskDao.java b/app/src/main/java/com/todoroo/astrid/dao/TaskDao.java index c6647792d..6f7ab10b6 100644 --- a/app/src/main/java/com/todoroo/astrid/dao/TaskDao.java +++ b/app/src/main/java/com/todoroo/astrid/dao/TaskDao.java @@ -17,6 +17,7 @@ import androidx.room.Transaction; import androidx.room.Update; import androidx.sqlite.db.SimpleSQLiteQuery; import androidx.sqlite.db.SupportSQLiteDatabase; +import com.google.common.base.Joiner; import com.todoroo.andlib.sql.Criterion; import com.todoroo.andlib.sql.Functions; import com.todoroo.astrid.api.Filter; @@ -130,12 +131,15 @@ public abstract class TaskDao { @Transaction public List fetchTasks(List queries) { + long start = BuildConfig.DEBUG ? now() : 0; SupportSQLiteDatabase db = database.getOpenHelper().getWritableDatabase(); int last = queries.size() - 1; for (int i = 0 ; i < last ; i++) { db.execSQL(queries.get(i)); } - return fetchTasks(new SimpleSQLiteQuery(queries.get(last))); + List result = fetchTasks(new SimpleSQLiteQuery(queries.get(last))); + Timber.v("%sms: %s", now() - start, Joiner.on(";").join(queries)); + return result; } @RawQuery diff --git a/app/src/main/java/org/tasks/ui/TaskListViewModel.java b/app/src/main/java/org/tasks/ui/TaskListViewModel.java index 9f4fd056a..8d16eca8d 100644 --- a/app/src/main/java/org/tasks/ui/TaskListViewModel.java +++ b/app/src/main/java/org/tasks/ui/TaskListViewModel.java @@ -13,7 +13,6 @@ import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModel; -import com.google.common.base.Joiner; import com.todoroo.andlib.data.Property.StringProperty; import com.todoroo.andlib.data.Table; import com.todoroo.andlib.sql.Criterion; @@ -257,7 +256,6 @@ public class TaskListViewModel extends ViewModel { assertMainThread(); List queries = getQuery(preferences, filter); - Timber.v(Joiner.on(";").join(queries)); disposable.add( Single.fromCallable(() -> taskDao.fetchTasks(queries)) .subscribeOn(Schedulers.io())