mirror of
https://github.com/quickwit-oss/tantivy.git
synced 2026-05-20 10:10:42 +00:00
bug/4 not compiling
This commit is contained in:
@@ -171,8 +171,7 @@ impl Index {
|
||||
// TODO find a rusty way to hide that, while keeping
|
||||
// it visible for IndexWriters.
|
||||
pub fn commit(&mut self,
|
||||
segment_metas: &[SegmentMeta],
|
||||
docstamp: u64) -> Result<()> {
|
||||
docstamp: u64) -> Result<()> {
|
||||
self.docstamp = docstamp;
|
||||
for segment_meta in segment_metas {
|
||||
self.uncommitted_segments.remove_segment(&segment_meta.segment_id);
|
||||
|
||||
@@ -50,7 +50,7 @@ pub struct IndexWriter {
|
||||
heap_size_in_bytes_per_thread: usize,
|
||||
workers_join_handle: Vec<JoinHandle<()>>,
|
||||
segment_ready_sender: NewSegmentSender,
|
||||
segment_ready_consumer: JoinHandle<Result<Vec<SegmentMeta>>>,
|
||||
segment_ready_consumer: JoinHandle<Result<()>>,
|
||||
document_receiver: DocumentReceiver,
|
||||
document_sender: DocumentSender,
|
||||
num_threads: usize,
|
||||
@@ -59,7 +59,7 @@ pub struct IndexWriter {
|
||||
|
||||
fn create_segment_consumer(
|
||||
segment_queue: chan::Receiver<Result<SegmentMeta>>,
|
||||
segment_register: Arc<SegmentRegister>) -> JoinHandle<Result<Vec<SegmentMeta>>> {
|
||||
segment_register: Arc<SegmentRegister>) -> JoinHandle<Result<()>> {
|
||||
thread::spawn(move || {
|
||||
let mut segment_metas = Vec::new();
|
||||
for segment_meta_res in segment_queue {
|
||||
@@ -281,17 +281,14 @@ impl IndexWriter {
|
||||
// add a new worker for the next generation.
|
||||
try!(self.add_indexing_worker());
|
||||
}
|
||||
|
||||
|
||||
let segment_metas_result = try!(
|
||||
segment_ready_receiver
|
||||
.join()
|
||||
.map_err(|e| super::super::error::Error::ErrorInThread(String::from("Joining receiver thread failed while committing.")))
|
||||
);
|
||||
|
||||
let segment_metas: Vec<SegmentMeta> = try!(segment_metas_result);
|
||||
|
||||
try!(self.index.commit(&segment_metas, commit_docstamp));
|
||||
|
||||
try!(segment_metas_result);
|
||||
try!(self.index.commit(commit_docstamp));
|
||||
Ok(commit_docstamp)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user