index: print a milder "Reindexing..." message on version mismatch

Closes #3323.

lib/src/default_index/readonly.rs

@@ -37,13 +37,20 @@ use crate::store::Store;
 
 /// Error while loading index segment file.
 #[derive(Debug, Error)]
-#[error("Failed to load commit index file '{name}'")]
+pub enum ReadonlyIndexLoadError {
-pub struct ReadonlyIndexLoadError {
+    #[error("Unexpected index version")]
-    /// Index file name.
+    UnexpectedVersion {
-    pub name: String,
+        found_version: u32,
-    /// Underlying error.
+        expected_version: u32,
-    #[source]
+    },
-    pub error: io::Error,
+    #[error("Failed to load commit index file '{name}'")]
+    Other {
+        /// Index file name.
+        name: String,
+        /// Underlying error.
+        #[source]
+        error: io::Error,
+    },
 }
 
 impl ReadonlyIndexLoadError {
@@ -55,7 +62,7 @@ impl ReadonlyIndexLoadError {
     }
 
     fn from_io_err(name: impl Into<String>, error: io::Error) -> Self {
-        ReadonlyIndexLoadError {
+        ReadonlyIndexLoadError::Other {
             name: name.into(),
             error,
         }
@@ -63,12 +70,19 @@ impl ReadonlyIndexLoadError {
 
     /// Returns true if the underlying error suggests data corruption.
     pub(super) fn is_corrupt_or_not_found(&self) -> bool {
-        // If the parent file name field is corrupt, the file wouldn't be found.
+        match self {
-        // And there's no need to distinguish it from an empty file.
+            ReadonlyIndexLoadError::UnexpectedVersion { .. } => true,
-        matches!(
+            ReadonlyIndexLoadError::Other { name: _, error } => {
-            self.error.kind(),
+                // If the parent file name field is corrupt, the file wouldn't be found.
-            io::ErrorKind::NotFound | io::ErrorKind::InvalidData | io::ErrorKind::UnexpectedEof
+                // And there's no need to distinguish it from an empty file.
-        )
+                matches!(
+                    error.kind(),
+                    io::ErrorKind::NotFound
+                        | io::ErrorKind::InvalidData
+                        | io::ErrorKind::UnexpectedEof
+                )
+            }
+        }
     }
 }
 
@@ -244,10 +258,10 @@ impl ReadonlyIndexSegment {
         };
         let format_version = read_u32(file)?;
         if format_version != INDEX_SEGMENT_FILE_FORMAT_VERSION {
-            return Err(ReadonlyIndexLoadError::invalid_data(
+            return Err(ReadonlyIndexLoadError::UnexpectedVersion {
-                &name,
+                found_version: format_version,
-                format!("unsupported file format version: {format_version}"),
+                expected_version: INDEX_SEGMENT_FILE_FORMAT_VERSION,
-            ));
+            });
         }
         let parent_filename_len = read_u32(file)?;
         let maybe_parent_file = if parent_filename_len > 0 {

lib/src/default_index/store.rs

@@ -330,11 +330,23 @@ impl IndexStore for DefaultIndexStore {
             Err(DefaultIndexStoreError::LoadIndex(err)) if err.is_corrupt_or_not_found() => {
                 // If the index was corrupt (maybe it was written in a different format),
                 // we just reindex.
-                // TODO: Move this message to a callback or something.
+                match &err {
-                eprintln!(
+                    ReadonlyIndexLoadError::UnexpectedVersion {
-                    "{err} (maybe the format has changed): {source}. Reindexing...",
+                        found_version,
-                    source = err.error
+                        expected_version,
-                );
+                    } => {
+                        eprintln!(
+                            "Found index format version {found_version}, expected version \
+                             {expected_version}. Reindexing..."
+                        );
+                    }
+                    ReadonlyIndexLoadError::Other { name: _, error } => {
+                        eprintln!(
+                            "{err} (maybe the format has changed): {source}. Reindexing...",
+                            source = error
+                        );
+                    }
+                }
                 self.reinit().map_err(|err| IndexReadError(err.into()))?;
                 self.build_index_segments_at_operation(op, store)
             }