diff --git a/src/core/index.rs b/src/core/index.rs index 4099da33d..add42448e 100644 --- a/src/core/index.rs +++ b/src/core/index.rs @@ -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); diff --git a/src/indexer/index_writer.rs b/src/indexer/index_writer.rs index 163ab641f..fa8eaac26 100644 --- a/src/indexer/index_writer.rs +++ b/src/indexer/index_writer.rs @@ -50,7 +50,7 @@ pub struct IndexWriter { heap_size_in_bytes_per_thread: usize, workers_join_handle: Vec>, segment_ready_sender: NewSegmentSender, - segment_ready_consumer: JoinHandle>>, + segment_ready_consumer: JoinHandle>, document_receiver: DocumentReceiver, document_sender: DocumentSender, num_threads: usize, @@ -59,7 +59,7 @@ pub struct IndexWriter { fn create_segment_consumer( segment_queue: chan::Receiver>, - segment_register: Arc) -> JoinHandle>> { + segment_register: Arc) -> JoinHandle> { 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 = 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) }