chore: fix tantivy dependency due to upstream rev missing

TabbyML · May 29, 2024 · de68fbe · de68fbe
1 parent e7af21a
commit de68fbe
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 25 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -36,7 +36,7 @@ tracing = "0.1"
 tokio-cron-scheduler = "0.9.4"
 tracing-subscriber = "0.3"
 anyhow = "1.0.71"
-tantivy = { git = "https://github.com/quickwit-oss/tantivy", rev = "b806122" }
+tantivy = { git = "https://github.com/wsxiaoys/tantivy", rev = "442a7b3" }
 async-trait = "0.1.72"
 reqwest = { version = "0.12" }
 derive_builder = "0.12.0"

diff --git a/crates/tabby/src/services/code.rs b/crates/tabby/src/services/code.rs
@@ -14,7 +14,7 @@ use tabby_common::{
 };
 use tantivy::{
     collector::{Count, TopDocs},
-    schema::{self, document::ReferenceValue, Value},
+    schema::{self, Value},
     IndexReader, TantivyDocument,
 };
 use tokio::sync::Mutex;
@@ -125,10 +125,10 @@ fn get_text(doc: &TantivyDocument, field: schema::Field) -> &str {
 }
 
 fn get_json_number_field(doc: &TantivyDocument, field: schema::Field, name: &str) -> i64 {
-    let ReferenceValue::Object(obj) = doc.get_first(field).unwrap() else {
-        panic!("Field {} is not an object", name);
-    };
-    obj.into_iter()
+    doc.get_first(field)
+        .unwrap()
+        .as_object()
+        .unwrap()
         .find(|(k, _)| *k == name)
         .unwrap()
         .1
@@ -137,10 +137,10 @@ fn get_json_number_field(doc: &TantivyDocument, field: schema::Field, name: &str
 }
 
 fn get_json_text_field<'a>(doc: &'a TantivyDocument, field: schema::Field, name: &str) -> &'a str {
-    let ReferenceValue::Object(obj) = doc.get_first(field).unwrap() else {
-        panic!("Field {} is not an object", name);
-    };
-    obj.into_iter()
+    doc.get_first(field)
+        .unwrap()
+        .as_object()
+        .unwrap()
         .find(|(k, _)| *k == name)
         .unwrap()
         .1

diff --git a/crates/tabby/src/services/doc/tantivy.rs b/crates/tabby/src/services/doc/tantivy.rs
@@ -9,7 +9,7 @@ use tabby_common::{
 use tabby_inference::Embedding;
 use tantivy::{
     collector::TopDocs,
-    schema::{self, document::ReferenceValue, Value},
+    schema::{self, Value},
     IndexReader, TantivyDocument,
 };
 use tracing::warn;
@@ -87,10 +87,10 @@ fn get_text(doc: &TantivyDocument, field: schema::Field) -> &str {
 }
 
 fn get_json_text_field<'a>(doc: &'a TantivyDocument, field: schema::Field, name: &str) -> &'a str {
-    let ReferenceValue::Object(obj) = doc.get_first(field).unwrap() else {
-        panic!("Field {} is not an object", name);
-    };
-    obj.into_iter()
+    doc.get_first(field)
+        .unwrap()
+        .as_object()
+        .unwrap()
         .find(|(k, _)| *k == name)
         .unwrap()
         .1