add CTE with fallback for rows with null origin_id

Author: skhamis

components/places/src/storage/history.rs

@@ -1355,18 +1355,43 @@ pub fn get_top_frecent_site_infos(
     .complement();
 
     let infos = db.query_rows_and_then_cached(
-        "SELECT h.frecency, h.title, h.url
-        FROM moz_places h
-        JOIN moz_origins o ON o.id = h.origin_id
-        WHERE o.prefix IN ('http', 'https')
+        "
+        WITH fast AS (
+            SELECT h.frecency, h.title, h.url
+            FROM moz_places h
+            JOIN moz_origins o ON o.id = h.origin_id
+            WHERE o.prefix IN ('http', 'https')
+            AND h.hidden = 0
+            AND h.frecency >= :frecency_threshold
+            AND EXISTS (
+                SELECT 1 FROM moz_historyvisits v
+                WHERE v.place_id = h.id
+                AND ((1 << v.visit_type) & :allowed_types) != 0
+                LIMIT 1
+            )
+            ORDER BY h.frecency DESC
+            LIMIT :limit
+        ),
+        fallback AS (
+            SELECT h.frecency, h.title, h.url
+            FROM moz_places h
+            WHERE h.origin_id IS NULL
             AND h.hidden = 0
             AND h.frecency >= :frecency_threshold
-            AND (h.last_visit_date_local + h.last_visit_date_remote) != 0
-            AND EXISTS (SELECT 1 FROM moz_historyvisits v
-                        WHERE v.place_id = h.id
-                            AND ((1 << v.visit_type) & :allowed_types) != 0
-                    LIMIT 1)
-        ORDER BY h.frecency DESC
+            AND (h.url LIKE 'https:%' OR h.url LIKE 'http:%')
+            AND EXISTS (
+                SELECT 1 FROM moz_historyvisits v
+                WHERE v.place_id = h.id
+                AND ((1 << v.visit_type) & :allowed_types) != 0
+                LIMIT 1
+            )
+            ORDER BY h.frecency DESC
+            LIMIT :limit
+        )
+        SELECT * FROM fast
+        UNION ALL
+        SELECT * FROM fallback
+        ORDER BY frecency DESC
         LIMIT :limit",
         rusqlite::named_params! {
             ":limit": num_items,

testing/separated/places-bench/src/database.rs

@@ -333,20 +333,44 @@ const TOP_FRECENT_ORIGINAL: &str = r#"
 "#;
 
 const TOP_FRECENT_INDEX_FRIENDLY: &str = r#"
-    SELECT h.frecency, h.title, h.url
-    FROM moz_places h
-    JOIN moz_origins o ON o.id = h.origin_id
-    WHERE o.prefix IN ('http', 'https')
-      AND h.hidden = 0
-      AND h.frecency >= {FRECENCY}
-      AND (h.last_visit_date_local + h.last_visit_date_remote) != 0
-      AND EXISTS (
-        SELECT 1 FROM moz_historyvisits v
-        WHERE v.place_id = h.id
-          AND ((1 << v.visit_type) & {ALLOWED_TYPES}) != 0
-        LIMIT 1
-      )
-    ORDER BY h.frecency DESC
+    /* Fast path: rows where origin_id is set, quick join on moz_origins */
+    WITH fast AS (
+            SELECT h.frecency, h.title, h.url
+            FROM moz_places h
+            JOIN moz_origins o ON o.id = h.origin_id
+            WHERE o.prefix IN ('http', 'https')
+            AND h.hidden = 0
+            AND h.frecency >= {FRECENCY}
+            AND EXISTS (
+                SELECT 1 FROM moz_historyvisits v
+                WHERE v.place_id = h.id
+                AND ((1 << v.visit_type) & {ALLOWED_TYPES}) != 0
+                LIMIT 1
+            )
+            ORDER BY h.frecency DESC
+            LIMIT {LIMIT}
+        ),
+    /* Fallback: rows not yet assigned an origin_id (yet) */
+        fallback AS (
+            SELECT h.frecency, h.title, h.url
+            FROM moz_places h
+            WHERE h.origin_id IS NULL
+            AND h.hidden = 0
+            AND h.frecency >= {FRECENCY}
+            AND (h.url LIKE 'https:%' OR h.url LIKE 'http:%')
+            AND EXISTS (
+                SELECT 1 FROM moz_historyvisits v
+                WHERE v.place_id = h.id
+                AND ((1 << v.visit_type) & {ALLOWED_TYPES}) != 0
+                LIMIT 1
+            )
+            ORDER BY h.frecency DESC
+            LIMIT {LIMIT}
+        )
+        SELECT * FROM fast
+        UNION ALL
+        SELECT * FROM fallback
+        ORDER BY frecency DESC
     LIMIT {LIMIT}
 "#;