am 1322df8: Fix extreme slowness in FTS search

* commit '1322df8f90d80587748ad10539516635326c01e8': Fix extreme slowness in FTS search
Evervolv · Nov 1, 2011 · 437d183 · 437d183
2 parents a2535f3 + 1322df8
commit 437d183
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java
@@ -5149,8 +5149,6 @@ protected Cursor queryLocal(Uri uri, String[] projection, String selection,
                         deferredSnipRequested);
                 snippetDeferred = isSingleWordQuery(filterParam) &&
                         deferredSnipRequested && snippetNeeded(projection);
-                // Omit results in "Other Contacts".
-                qb.appendWhere(Contacts._ID + " IN " + Tables.DEFAULT_DIRECTORY);
                 break;
             }
 
@@ -6573,7 +6571,9 @@ public void appendSearchIndexJoin(StringBuilder sb, String filter,
             sb.append(SearchIndexManager.getFtsMatchQuery(filter,
                     FtsQueryBuilder.SCOPED_NAME_NORMALIZING));
         }
-        sb.append("') ON (" + Contacts._ID + "=" + SNIPPET_CONTACT_ID + ")");
+        // Omit results in "Other Contacts".
+        sb.append("' AND " + SNIPPET_CONTACT_ID + " IN " + Tables.DEFAULT_DIRECTORY + ")");
+        sb.append(" ON (" + Contacts._ID + "=" + SNIPPET_CONTACT_ID + ")");
     }
 
     private static String sanitizeMatch(String filter) {