cargo fmt

This commit is contained in:
Paul Masurel
2019-01-23 10:21:39 +09:00
parent 4dfd091e67
commit 1acfb2ebb5
4 changed files with 17 additions and 25 deletions

View File

@@ -150,7 +150,7 @@ impl Index {
///
/// This will overwrite existing meta.json
fn from_directory(mut directory: ManagedDirectory, schema: Schema) -> Result<Index> {
save_new_metas(schema.clone(), directory.borrow_mut())?;
save_new_metas(schema.clone(), directory.borrow_mut())?;
let metas = IndexMeta::with_schema(schema);
Index::create_from_metas(directory, &metas)
}

View File

@@ -557,8 +557,7 @@ impl IndexWriter {
// and recreate a new one channels.
self.recreate_document_channel();
let former_workers_join_handle =
mem::replace(&mut self.workers_join_handle, Vec::new());
let former_workers_join_handle = mem::replace(&mut self.workers_join_handle, Vec::new());
for worker_handle in former_workers_join_handle {
let indexing_worker_result = worker_handle

View File

@@ -50,9 +50,10 @@ pub fn save_new_metas(schema: Schema, directory: &mut Directory) -> Result<()> {
segments: Vec::new(),
schema,
opstamp: 0u64,
payload: None
payload: None,
},
directory)
directory,
)
}
/// Save the index meta file.
@@ -64,16 +65,13 @@ pub fn save_new_metas(schema: Schema, directory: &mut Directory) -> Result<()> {
/// and flushed.
///
/// This method is not part of tantivy's public API
fn save_metas(
metas: &IndexMeta,
directory: &mut Directory,
) -> Result<()> {
// let metas = IndexMeta {
// segments: segment_metas,
// schema,
// opstamp,
// payload,
// };
fn save_metas(metas: &IndexMeta, directory: &mut Directory) -> Result<()> {
// let metas = IndexMeta {
// segments: segment_metas,
// schema,
// opstamp,
// payload,
// };
let mut buffer = serde_json::to_vec_pretty(metas)?;
writeln!(&mut buffer)?;
directory.atomic_write(&META_FILEPATH, &buffer[..])?;
@@ -265,13 +263,10 @@ impl SegmentUpdater {
segments: commited_segment_metas,
schema: index.schema(),
opstamp,
payload: commit_message
payload: commit_message,
};
save_metas(
&index_meta,
directory.box_clone().borrow_mut(),
)
.expect("Could not save metas.");
save_metas(&index_meta, directory.box_clone().borrow_mut())
.expect("Could not save metas.");
self.store_meta(&index_meta);
}
}

View File

@@ -1,6 +1,5 @@
use std::sync::Arc;
use std::sync::atomic::Ordering;
use std::sync::Arc;
// AtomicU64 have not landed in stable.
// For the moment let's just use AtomicUsize on
@@ -27,9 +26,9 @@ mod archicture_impl {
#[cfg(not(target_arch = "x86_64"))]
mod archicture_impl {
use std::sync::atomic::Ordering;
/// Under other architecture, we rely on a mutex.
use std::sync::Mutex;
use std::sync::atomic::Ordering;
#[derive(Default)]
pub struct AtomicU64Ersatz(Mutex<u64>);
@@ -63,7 +62,6 @@ impl Stamper {
}
}
#[cfg(test)]
mod test {