summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDongwon Kang <dwkang@google.com>2015-04-14 15:26:28 +0900
committerDongwon Kang <dwkang@google.com>2015-04-14 15:29:18 +0900
commitc988ce484ba066e47629346ea1fdb1290930d0c1 (patch)
tree6510aa3d0a9ac83624de84a9eaf3ee88c9c92831
parent7b3f8e9eec35ada8ea1da0757e1049ec511ec337 (diff)
downloadTvProvider-c988ce484ba066e47629346ea1fdb1290930d0c1.tar.gz
Drop the default sort order for Channels table.
TvProviderPerfTest on fugu: Channels table query performance (base, ToT) : 1776.51ms Channels table query performance (No sortOrder) : 1506.33ms Bug: 19357901 Change-Id: I4c4262668795e4ca46f7ea07d534d643c119cb93
-rw-r--r--src/com/android/providers/tv/TvProvider.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/com/android/providers/tv/TvProvider.java b/src/com/android/providers/tv/TvProvider.java
index f0c039d..3f928d9 100644
--- a/src/com/android/providers/tv/TvProvider.java
+++ b/src/com/android/providers/tv/TvProvider.java
@@ -94,8 +94,6 @@ public class TvProvider extends ContentProvider {
private static final String PROGRAMS_TABLE_END_TIME_INDEX = "programs_end_time_index";
private static final String WATCHED_PROGRAMS_TABLE_CHANNEL_ID_INDEX =
"watched_programs_channel_id_index";
- private static final String DEFAULT_CHANNELS_SORT_ORDER = Channels.COLUMN_DISPLAY_NUMBER
- + " ASC";
private static final String DEFAULT_PROGRAMS_SORT_ORDER = Programs.COLUMN_START_TIME_UTC_MILLIS
+ " ASC";
private static final String DEFAULT_WATCHED_PROGRAMS_SORT_ORDER =
@@ -496,7 +494,7 @@ public class TvProvider extends ContentProvider {
SQLiteQueryBuilder queryBuilder = new SQLiteQueryBuilder();
queryBuilder.setTables(params.getTables());
- String orderBy;
+ String orderBy = null;
if (params.getTables().equals(PROGRAMS_TABLE)) {
queryBuilder.setProjectionMap(sProgramProjectionMap);
orderBy = DEFAULT_PROGRAMS_SORT_ORDER;
@@ -505,7 +503,6 @@ public class TvProvider extends ContentProvider {
orderBy = DEFAULT_WATCHED_PROGRAMS_SORT_ORDER;
} else {
queryBuilder.setProjectionMap(sChannelProjectionMap);
- orderBy = DEFAULT_CHANNELS_SORT_ORDER;
}
// Use the default sort order only if no sort order is specified.