improve search.db

src-core/src/db/yomitan.rs

@@ -50,7 +50,16 @@ impl YomitanDatabase {
         limit: u32,
         offset: u32,
     ) -> Result<Vec<YomitanRow>, CJDicError> {
-        let _timer = Timer::new(format!("search_yomitan: {} {}", q_term, q_reading));
+        let q_label = if q_term == q_reading {
+            q_term
+        } else {
+            &format!("{} ({})", q_term, q_reading)
+        };
+
+        let _timer = Timer::new(format!(
+            "search_yomitan: {} offset={} limit={}",
+            q_label, offset, limit
+        ));
 
         // must be run before self.db.conn.lock()
         let mut decompressor = self.decompressor()?;
@@ -80,53 +89,15 @@ impl YomitanDatabase {
         let eq2 = if q_reading.len() > 0 { "GLOB" } else { "=" };
 
         let conn = self.db.conn.lock()?;
-        conn.execute_batch(
-            "
-            CREATE TEMP TABLE IF NOT EXISTS yomitan_lookup_keys (
-                term,
-                reading,
-                score,
-                title,
-                glossary_id,
-                def_tags_id,
-                rules_id,
-                term_tags_id,
-                sequence
-            );
-            DELETE FROM yomitan_lookup_keys;
-        ",
-        )?;
 
-        // let _timer = Timer::new(format!("search_yomitan: {} {}", q_term, q_reading));
-        let sql_string = format!(
-            "
-            INSERT INTO yomitan_lookup_keys
-            SELECT
-                t.term,
-                t.reading,
-                t.score,
-                d.title,
-                t.glossary_id,
-                t.def_tags_id,
-                rules_id,
-                term_tags_id,
-                sequence
-            FROM search.terms                 s
-            JOIN yomitan.terms                t  ON t.id = s.id
-            JOIN yomitan.view_terms_term_rank tr ON tr.term = t.term AND tr.reading = t.reading
-            JOIN yomitan.dictionaries         d  ON d.id  = t.dict_id
-            WHERE s.term {eq1} ?1 {and_or} s.reading {eq2} ?2
-            ORDER BY tr.max_score DESC, d.sort_order DESC
-            LIMIT ?3 OFFSET ?4
-        "
-        );
-        // println!("{}", sql_string);
-        // still the most time bottleneck step, several seconds
-        conn.execute(&sql_string, params![q_term_norm, q_reading, limit, offset])?;
-
-        let _timer = Timer::new(format!("search_yomitan: {} {}", q_term, q_reading));
-        let mut stmt = conn.prepare(
+        let mut stmt = conn.prepare(&format!(
             "
+            WITH s AS (
+                SELECT * FROM search.terms
+                WHERE term {eq1} ?1 {and_or} reading {eq2} ?2
+                ORDER BY max_score DESC
+                LIMIT ?3 OFFSET ?4
+            )
             SELECT
                 t.term,
                 t.reading,
@@ -136,15 +107,17 @@ impl YomitanDatabase {
                 COALESCE(g.b, '[]')     AS glossary,
                 t.sequence,
                 COALESCE(tt.tags,  '')  AS term_tags,
-                t.title                 AS dict_title
-            FROM yomitan_lookup_keys t
-            LEFT JOIN glossary.glossaries    g  ON g.id  = t.glossary_id
+                d.title                 AS dict_title
+            FROM s
+            JOIN yomitan.terms              t  ON t.id  = s.id
+            LEFT JOIN yomitan.dictionaries  d  ON d.id  = t.dict_id
             LEFT JOIN yomitan.def_tag_sets  dt ON dt.id = t.def_tags_id
             LEFT JOIN yomitan.rule_sets     r  ON r.id  = t.rules_id
             LEFT JOIN yomitan.term_tag_sets tt ON tt.id = t.term_tags_id
-        ",
-        )?;
-        let rows = stmt.query_map(params![], |r| {
+            LEFT JOIN glossary.glossaries   g  ON g.id  = t.glossary_id
+        "
+        ))?;
+        let rows = stmt.query_map(params![q_term_norm, q_reading, limit, offset], |r| {
             Ok(YomitanRow {
                 term: r.get(0)?,
                 reading: r.get(1)?,