Cargo.lock

@@ -2509,7 +2509,7 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "letterbox"
-version = "0.0.65"
+version = "0.0.64"
 dependencies = [
  "build-info",
  "build-info-build",
@@ -3024,7 +3024,7 @@ dependencies = [
 
 [[package]]
 name = "notmuch"
-version = "0.0.65"
+version = "0.0.64"
 dependencies = [
  "itertools 0.10.5",
  "log",
@@ -3810,7 +3810,7 @@ dependencies = [
 
 [[package]]
 name = "procmail2notmuch"
-version = "0.0.65"
+version = "0.0.64"
 dependencies = [
  "anyhow",
 ]
@@ -4782,7 +4782,7 @@ dependencies = [
 
 [[package]]
 name = "server"
-version = "0.0.65"
+version = "0.0.64"
 dependencies = [
  "ammonia",
  "anyhow",
@@ -4882,7 +4882,7 @@ dependencies = [
 
 [[package]]
 name = "shared"
-version = "0.0.65"
+version = "0.0.64"
 dependencies = [
  "build-info",
  "notmuch",

notmuch/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "notmuch"
-version = "0.0.65"
+version = "0.0.64"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

procmail2notmuch/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "procmail2notmuch"
-version = "0.0.65"
+version = "0.0.64"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "server"
-version = "0.0.65"
+version = "0.0.64"
 edition = "2021"
 default-run = "server"
 

server/src/tantivy.rs

@@ -9,7 +9,7 @@ use tantivy::{
     schema::{Facet, IndexRecordOption, Value},
     DocAddress, Index, IndexReader, Searcher, TantivyDocument, TantivyError, Term,
 };
-use tracing::{info_span, instrument};
+use tracing::instrument;
 
 use crate::{
     compute_offset_limit,
@@ -110,13 +110,13 @@ impl TantivyConnection {
             .collect();
         self.reindex_uids(pool, &uids).await
     }
-    #[instrument(skip(self, pool))]
     async fn reindex_uids(&self, pool: &PgPool, uids: &[String]) -> Result<(), ServerError> {
         if uids.is_empty() {
             return Ok(());
         }
         // TODO: add SlurpContents and convert HTML to text
 
+        let start_time = std::time::Instant::now();
         let pool: &PgPool = pool;
 
         let mut index_writer = self.index.writer(50_000_000)?;
@@ -145,6 +145,13 @@ impl TantivyConnection {
         }
         let total = rows.len();
         for (i, r) in rows.into_iter().enumerate() {
+            if i % 10_000 == 0 {
+                info!(
+                    "{i}/{total} processed, elapsed {:.2}s",
+                    start_time.elapsed().as_secs_f32()
+                );
+            }
+
             let id_term = Term::from_field_text(uid, &r.uid);
             index_writer.delete_term(id_term);
             let slug = r.site;
@@ -163,8 +170,9 @@ impl TantivyConnection {
             ))?;
         }
 
-        info_span!("IndexWriter.commit").in_scope(|| index_writer.commit())?;
-        info_span!("IndexReader.reload").in_scope(|| self.reader.reload())?;
+        info!("took {:.2}s to reindex", start_time.elapsed().as_secs_f32());
+
+        index_writer.commit()?;
         Ok(())
     }
     #[instrument(name = "tantivy::reindex_thread", skip_all, fields(query=%query))]

shared/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "shared"
-version = "0.0.65"
+version = "0.0.64"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

web/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-version = "0.0.65"
+version = "0.0.64"
 name = "letterbox"
 repository = "https://github.com/seed-rs/seed-quickstart"
 authors = ["Bill Thiede <git@xinu.tv>"]